1 files changed, 12 insertions, 6 deletions
diff --git a/actionpack/test/abstract/collector_test.rb b/actionpack/test/abstract/collector_test.rb
index 5709ad0378..fc59bf19c4 100644
--- a/actionpack/test/abstract/collector_test.rb
+++ b/actionpack/test/abstract/collector_test.rb
@@ -24,20 +24,26 @@ module AbstractController
 
       test "does not respond to unknown mime types" do
         collector = MyCollector.new
-        assert !collector.respond_to?(:unknown)
+        assert_not_respond_to collector, :unknown
       end
 
       test "register mime types on method missing" do
         AbstractController::Collector.send(:remove_method, :js)
-        collector = MyCollector.new
-        assert !collector.respond_to?(:js)
-        collector.js
-        assert_respond_to collector, :js
+        begin
+          collector = MyCollector.new
+          assert_not_respond_to collector, :js
+          collector.js
+          assert_respond_to collector, :js
+        ensure
+          unless AbstractController::Collector.method_defined? :js
+            AbstractController::Collector.generate_method_for_mime :js
+          end
+        end
       end
 
       test "does not register unknown mime types" do
         collector = MyCollector.new
-        assert_raise NameError do
+        assert_raise NoMethodError do
           collector.unknown
         end
       end