Merged r2116, r2117 and r2187 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2217 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/wiki_controller_test.rb

@@ -252,13 +252,6 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_template 'edit'    
   end
   
-  def test_destroy_attachment
-    @request.session[:user_id] = 2
-    assert_difference 'Attachment.count', -1 do
-      post :destroy_attachment, :id => 1, :page => 'Page_with_an_inline_image', :attachment_id => 3
-    end
-  end
-  
   def test_history_of_non_existing_page_should_return_404
     get :history, :id => 1, :page => 'Unknown_page'
     assert_response 404