diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-02-25 16:48:36 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-25 17:53:29 -0800 |
commit | fc4582fb6684ce72f5628629ea7d061659b790f8 (patch) | |
tree | 7d49d64d8ad3e7c91009e2b9804db9f7ed652177 /actionpack/lib/action_dispatch/testing | |
parent | 36fd9efb5e4bfc9ac3acd4189d4dc457dea8102a (diff) | |
download | rails-fc4582fb6684ce72f5628629ea7d061659b790f8.tar.gz rails-fc4582fb6684ce72f5628629ea7d061659b790f8.tar.bz2 rails-fc4582fb6684ce72f5628629ea7d061659b790f8.zip |
Final pass at removing the router from a global constant
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index f281febbc5..17caa2e030 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -125,7 +125,7 @@ module ActionDispatch end # A helper to make it easier to test different route configurations. - # This method temporarily replaces ActionDispatch::Routing::Routes + # This method temporarily replaces @router # with a new RouteSet instance. # # The new instance is yielded to the passed block. Typically the block diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 3b9d8b0318..3bd9502e91 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -188,11 +188,9 @@ module ActionDispatch unless defined? @named_routes_configured # install the named routes in this session instance. klass = singleton_class - # ActionDispatch::Routing::Routes.install_helpers(klass) # the helpers are made protected by default--we make them public for # easier access during testing and troubleshooting. - # klass.module_eval { public *ActionDispatch::Routing::Routes.named_routes.helpers } @named_routes_configured = true end end |