github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3981 from choonkeat/master

Browse Source 
Fix url_for options[:subdomain] to allow objects as values
This commit is contained in:
Jeremy Kemper
2011-12-14 07:07:05 -08:00
parent bb44e5a80a 5f67cfeda1
commit 384a60a16c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_dispatch/http/url.rb
View File

@@ -70,7 +70,7 @@ module ActionDispatch
host = ""
unless options[:subdomain] == false
host << (options[:subdomain] || extract_subdomain(options[:host], tld_length))
host << (options[:subdomain] || extract_subdomain(options[:host], tld_length)).to_param
host << "."
end
host << (options[:domain] || extract_domain(options[:host], tld_length))

8
actionpack/test/controller/url_for_test.rb
View File

@@ -71,6 +71,14 @@ module AbstractController
)
end
def test_subdomain_may_be_object
model = mock(:to_param => 'api')
add_host!
assert_equal('http://api.basecamphq.com/c/a/i',
W.new.url_for(:subdomain => model, :controller => 'c', :action => 'a', :id => 'i')
)
end
def test_subdomain_may_be_removed
add_host!
assert_equal('http://basecamphq.com/c/a/i',