aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-04 17:43:46 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-04 17:43:46 -0800
commit900a2d304a83bad7a3958464b8dfa6fb49670686 (patch)
tree0890d17f239ac85509ed74a93b76c6409a7b1f38 /actionpack/test/controller
parent3438373f038cefda664b879f49eec8aec6a15a76 (diff)
downloadrails-900a2d304a83bad7a3958464b8dfa6fb49670686.tar.gz
rails-900a2d304a83bad7a3958464b8dfa6fb49670686.tar.bz2
rails-900a2d304a83bad7a3958464b8dfa6fb49670686.zip
Get rid of relative_url_path in favor of respecting SCRIPT_NAME. Also added a way to specify a default SCRIPT_NAME when generating URLs out of the context of a request.
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/url_for_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 07809aa480..fc7773dffe 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -118,7 +118,7 @@ module AbstractController
add_host!
assert_equal('https://www.basecamphq.com/subdir/c/a/i',
- W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https', :relative_url_root => '/subdir')
+ W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https', :script_name => '/subdir')
)
end
@@ -153,7 +153,7 @@ module AbstractController
controller = kls.new
assert_equal 'http://www.basecamphq.com/subdir/home/sweet/home/again',
- controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again', :relative_url_root => "/subdir")
+ controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again', :script_name => "/subdir")
end
end