aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-02-26 15:56:38 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-02-26 15:56:38 -0800
commitab0cc7286fdaed96ff03bf8a160ccc75c3a2916d (patch)
tree3d8d5459b2eca8f192e29c58f392a71114da42b0
parentdae109a4632af702b8556ecf029a27d91476848b (diff)
downloadrails-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
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/routing.rb3
-rw-r--r--actionpack/test/controller/url_for_test.rb9
2 files changed, 5 insertions, 7 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)
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 43e2f91693..a7b77edc6e 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -132,7 +132,8 @@ module AbstractController
end
# We need to create a new class in order to install the new named route.
- kls = Class.new { include ActionController::UrlFor }
+ kls = Class.new { include set.url_helpers }
+
controller = kls.new
assert controller.respond_to?(:home_url)
assert_equal 'http://www.basecamphq.com/home/sweet/home/again',
@@ -153,7 +154,7 @@ module AbstractController
match '/home/sweet/home/:user', :to => 'home#index', :as => :home
end
- kls = Class.new { include ActionController::UrlFor }
+ kls = Class.new { include set.url_helpers }
controller = kls.new
assert_equal 'http://www.basecamphq.com/subdir/home/sweet/home/again',
@@ -171,7 +172,7 @@ module AbstractController
end
# We need to create a new class in order to install the new named route.
- kls = Class.new { include ActionController::UrlFor }
+ kls = Class.new { include set.url_helpers }
controller = kls.new
assert controller.respond_to?(:home_url)
assert_equal '/brave/new/world',
@@ -239,7 +240,7 @@ module AbstractController
end
# We need to create a new class in order to install the new named route.
- kls = Class.new { include ActionController::UrlFor }
+ kls = Class.new { include set.url_helpers }
kls.default_url_options[:host] = 'www.basecamphq.com'
controller = kls.new