aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-07-01 09:04:30 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:05 +0200
commit28016d33b0f2e668ca59a912c7fb2d777e3cf0a3 (patch)
treec5b20887fe18aef91b560d8c1d7bf11863867380 /actionpack/test/controller
parent32a5b49911b88e8e410583d382e8253004abce50 (diff)
downloadrails-28016d33b0f2e668ca59a912c7fb2d777e3cf0a3.tar.gz
rails-28016d33b0f2e668ca59a912c7fb2d777e3cf0a3.tar.bz2
rails-28016d33b0f2e668ca59a912c7fb2d777e3cf0a3.zip
Use env['action_dispatch.routes'] to determine if we should generate prefix or not.
This technique is here to allow using routes from Engine in Application and vice versa. When using Engine routes inside Application it should generate prefix based on mount point. When using Engine routes inside Engine it should use env['SCRIPT_NAME']. In any other case it should generate prefix as env should not be even available.
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/routing_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index a8c74a6064..1f14607c31 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -251,7 +251,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
map.pages 'pages', :controller => 'content', :action => 'show_page', :host => 'foo.com'
end
x = setup_for_named_route
- x.expects(:url_for).with(:host => 'foo.com', :only_path => false, :controller => 'content', :action => 'show_page', :use_route => :pages).once
+ x.expects(:url_for).with(:host => 'foo.com', :only_path => false, :controller => 'content', :action => 'show_page', :use_route => :pages, :router => rs).once
x.send(:pages_url)
end