diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 6522c94ad6bd25917cfb9fc0fac9b075cfd6f9b1..3ce4e2c780671777d8b32c826f17d44db805a91b 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -30,7 +30,7 @@ def create_fixtures(*table_names, &block) class ActionController::TestCase setup do - @router = Rails.application.routes + @routes = Rails.application.routes end end diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 05ec359f6130b90cc47e27680c9daa16af945df6..aa76979c27225d18c8a0225483cbc5ac70c493bb 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -15,9 +15,9 @@ def setup match '/rails/info/properties' => "rails/info#properties" end @controller.stubs(:consider_all_requests_local? => false, :local_request? => true) - @router = Rails.application.routes + @routes = Rails.application.routes - Rails::InfoController.send(:include, @router.url_helpers) + Rails::InfoController.send(:include, @routes.url_helpers) end test "info controller does not allow remote requests" do