From 24869e38afe81771e4388f21181dedad77cc006b Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Thu, 25 Jul 2013 22:36:37 +0900 Subject: Fix order dependent AP test any_instance.stubs + unstub with Mocha doesn't restore the original status in the following case, so we need to undef Customer#to_json before every test require 'test/unit' require 'mocha/setup' module M def foo() :foo; end end class C include M undef_method :foo end C.any_instance.stubs(:foo).returns(:mocha) C.any_instance.unstub(:foo) --- actionpack/test/controller/mime_responds_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index a9c62899b5..2d89969fd3 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -646,6 +646,7 @@ class RespondWithControllerTest < ActionController::TestCase Mime::Type.register_alias('text/html', :iphone) Mime::Type.register_alias('text/html', :touch) Mime::Type.register('text/x-mobile', :mobile) + Customer.send(:undef_method, :to_json) if Customer.method_defined?(:to_json) end def teardown -- cgit v1.2.3