Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/queries_controller_test.rb

@@ -140,7 +140,7 @@ class QueriesControllerTest < ActionController::TestCase
 
   def test_create_with_failure
     @request.session[:user_id] = 2
-    assert_no_difference 'Query.count' do
+    assert_no_difference '::Query.count' do
       post :create, :project_id => 'ecookbook', :query => {:name => ''}
     end
     assert_response :success