diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
| commit | 824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8 (patch) | |
| tree | 1967c2a945d6e131d467fb4f0178a0f60e01ae8a /railties/test/rails_info_controller_test.rb | |
| parent | 1ed1652bef981d9402797b6cb9f0920a40eea21a (diff) | |
| parent | db28d407f76a790a31e27bf51560e23425dd6944 (diff) | |
| download | rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.gz rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.bz2 rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'railties/test/rails_info_controller_test.rb')
| -rw-r--r-- | railties/test/rails_info_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 05ec359f61..aa76979c27 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -15,9 +15,9 @@ class InfoControllerTest < ActionController::TestCase 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 |