Merge branch 'master' of git://github.com/rails/rails

2 files changed, 3 insertions, 6 deletions

diff --git a/railties/test/application/notifications_test.rb b/railties/test/application/notifications_test.rb
index 62ed4f4ad4..28dfdfcd83 100644
--- a/railties/test/application/notifications_test.rb
+++ b/railties/test/application/notifications_test.rb
@@ -10,13 +10,15 @@ module ApplicationTests
       def initialize
         @events = []
         @subscribers = []
+        @listeners = []
       end
 
       def publish(name, *args)
         @events << name
       end
 
-      def subscribe(pattern=nil, &block)
+      def subscribe(listener, pattern=nil, &block)
+        @listeners << listener
         @subscribers << pattern
       end
     end
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index a0484c0868..39f23fa0be 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -14,17 +14,12 @@ class InfoControllerTest < ActionController::TestCase
   tests Rails::InfoController
 
   def setup
-    ActionController::Routing.use_controllers!(['rails/info'])
     ActionController::Routing::Routes.draw do |map|
       map.connect ':controller/:action/:id'
     end
     @controller.stubs(:consider_all_requests_local => false, :local_request? => true)
   end
 
-  def teardown
-    ActionController::Routing.use_controllers! nil
-  end
-
   test "info controller does not allow remote requests" do
     @controller.stubs(:consider_all_requests_local => false, :local_request? => false)
     get :properties