Merge pull request rails#5963 from kennyj/fix_build_20120425

Fix build. It seems that the Mocha's behavior was changed.

activerecord/test/cases/autosave_association_test.rb

@@ -627,7 +627,9 @@ def test_should_skip_validation_on_a_child_association_if_marked_for_destruction
   def test_a_child_marked_for_destruction_should_not_be_destroyed_twice
     @pirate.ship.mark_for_destruction
     assert @pirate.save
-    @pirate.ship.expects(:destroy).never
+    class << @pirate.ship
+      def destroy; raise "Should not be called" end
+    end
     assert @pirate.save
   end
 
@@ -672,7 +674,9 @@ def test_should_skip_validation_on_a_parent_association_if_marked_for_destructio
   def test_a_parent_marked_for_destruction_should_not_be_destroyed_twice
     @ship.pirate.mark_for_destruction
     assert @ship.save
-    @ship.pirate.expects(:destroy).never
+    class << @ship.pirate
+      def destroy; raise "Should not be called" end
+    end
     assert @ship.save
   end
 

activerecord/test/cases/explain_test.rb

@@ -28,7 +28,9 @@ def test_logging_query_plan_without_logger
       original = base.logger
       base.logger = nil
 
-      base.logger.expects(:warn).never
+      class << base.logger
+        def warn; raise "Should not be called" end
+      end
 
       with_threshold(0) do
         car = Car.where(:name => 'honda').first