aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/test_help.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-04-28 13:41:21 -0700
committerXavier Noria <fxn@hashref.com>2010-04-28 13:41:21 -0700
commitb9ab4c780af82c1c60d63c50f040a55da5bfa8db (patch)
tree4df8981047957fce17c10ea5c6aac7955aef2a4d /railties/lib/rails/test_help.rb
parent8f1a5bfee1305f193bb659c010ca7e2272c12051 (diff)
parent22184930ea323872c73542767d447bbbd7878c96 (diff)
downloadrails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.tar.gz
rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.tar.bz2
rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.zip
Merge commit 'rails/master'
Diffstat (limited to 'railties/lib/rails/test_help.rb')
-rw-r--r--railties/lib/rails/test_help.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 3ce4e2c780..ec5e4a357c 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -35,7 +35,9 @@ class ActionController::TestCase
end
class ActionDispatch::IntegrationTest
- include Rails.application.routes.url_helpers
+ setup do
+ @routes = Rails.application.routes
+ end
end
begin