提交 5f67cfed 编写于 作者: C choonkeat

Fix url_for options[:subdomain] to allow objects as values

* e.g. blog_url(subdomain: current_user) instead of blog_url(subdomain: current_user.to_param)
上级 a5589db0
......@@ -70,7 +70,7 @@ def host_or_subdomain_and_domain(options)
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))
......
......@@ -71,6 +71,14 @@ def test_subdomain_may_be_changed
)
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',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册