diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:56:38 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:56:38 -0800 |
commit | ab0cc7286fdaed96ff03bf8a160ccc75c3a2916d (patch) | |
tree | 3d8d5459b2eca8f192e29c58f392a71114da42b0 /actionpack/lib/action_dispatch/testing | |
parent | dae109a4632af702b8556ecf029a27d91476848b (diff) | |
download | rails-ab0cc7286fdaed96ff03bf8a160ccc75c3a2916d.tar.gz rails-ab0cc7286fdaed96ff03bf8a160ccc75c3a2916d.tar.bz2 rails-ab0cc7286fdaed96ff03bf8a160ccc75c3a2916d.zip |
Setting UrlFor in with_routing is no longer needed now that it's not global
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index 5a9a20cc5b..726da2ee07 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -144,15 +144,12 @@ module ActionDispatch def with_routing old_routes, @router = @router, ActionDispatch::Routing::RouteSet.new old_controller, @controller = @controller, @controller.clone if @controller - # ROUTES TODO: Figure out this insanity - silence_warnings { ::ActionController.const_set(:UrlFor, @router.url_helpers) } _router = @router @controller.singleton_class.send(:send, :include, @router.url_helpers) if @controller yield @router ensure @router = old_routes @controller = old_controller if @controller - silence_warnings { ::ActionController.const_set(:UrlFor, @router.url_helpers) } if @router end def method_missing(selector, *args, &block) |