From c102db9367690af992786d2a62bbf8caeec88742 Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Mon, 23 Nov 2009 17:04:32 -0800 Subject: Updates notifications tests in railties to reflect changes to the notifications API --- railties/test/application/notifications_test.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'railties/test') 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 -- cgit v1.2.3 From 15ab3a98a1b6f9b829060ba974048b33466f6814 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 23 Nov 2009 20:20:50 -0600 Subject: Find all controllers in memory to use for routing --- railties/test/rails_info_controller_test.rb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'railties/test') 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 -- cgit v1.2.3