diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:00:33 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:04:50 -0800 |
commit | 98f77e08278658ec47c9eb2e8f819d781c1eaebf (patch) | |
tree | 90fa876eb1f103ab9ca70602512c35ecc281a433 /actionpack/lib/action_dispatch/testing | |
parent | f10a019452d6864420dd15830073d93dd90de0f1 (diff) | |
download | rails-98f77e08278658ec47c9eb2e8f819d781c1eaebf.tar.gz rails-98f77e08278658ec47c9eb2e8f819d781c1eaebf.tar.bz2 rails-98f77e08278658ec47c9eb2e8f819d781c1eaebf.zip |
Rename named_url_helpers to url_helpers and url_helpers to url_for
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index 5a3ff5a04c..5a9a20cc5b 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -145,14 +145,14 @@ module ActionDispatch 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.named_url_helpers) } + silence_warnings { ::ActionController.const_set(:UrlFor, @router.url_helpers) } _router = @router - @controller.singleton_class.send(:send, :include, @router.named_url_helpers) if @controller + @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.named_url_helpers) } if @router + silence_warnings { ::ActionController.const_set(:UrlFor, @router.url_helpers) } if @router end def method_missing(selector, *args, &block) |