aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-03-30 14:18:08 -0500
committerJoshua Peek <josh@joshpeek.com>2010-03-30 14:18:08 -0500
commit53e16d8011fa2b356595775fbd93c9e3210b4b8a (patch)
treedb940d83ad2e19944ae1b85d3e835b024cab3316
parentcdf8c35ffdfb39f4de4b030576b1abb06c482668 (diff)
downloadrails-53e16d8011fa2b356595775fbd93c9e3210b4b8a.tar.gz
rails-53e16d8011fa2b356595775fbd93c9e3210b4b8a.tar.bz2
rails-53e16d8011fa2b356595775fbd93c9e3210b4b8a.zip
Missed a few spots in railties
-rw-r--r--railties/lib/rails/test_help.rb2
-rw-r--r--railties/test/rails_info_controller_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 6522c94ad6..3ce4e2c780 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -30,7 +30,7 @@ end
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 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