ActionItem1032: small fix in url generation scheme

Antonio Terceiro
1 parent ec99374e
Showing 2 changed files with 9 additions and 4 deletions Show diff stats
app/models/profile.rb
test/unit/profile_test.rb
@@ -344,7 +344,7 @@ class Profile &lt; ActiveRecord::Base
   end
   def url_options
-    options = { :host => default_hostname, :profile => (hostname ? nil : self.identifier) }
+    options = { :host => default_hostname, :profile => (own_hostname ? nil : self.identifier) }
     Noosfero.url_options.merge(options)
   end
@@ -356,11 +356,15 @@ class Profile &lt; ActiveRecord::Base
     if preferred_domain
       return preferred_domain.name
     else
-      domain = self.domains.first
-      domain ? domain.name : nil
+      own_hostname
     end
   end
+  def own_hostname
+    domain = self.domains.first
+    domain ? domain.name : nil
+  end
+
   def possible_domains
     environment.domains + domains
   end
@@ -1282,9 +1282,10 @@ class ProfileTest &lt; Test::Unit::TestCase
   end
   should 'use preferred domain for hostname' do
-    profile = Profile.new
+    profile = Profile.new(:identifier => 'myself')
     profile.stubs(:preferred_domain).returns(Domain.new(:name => 'preferred.net'))
     assert_equal 'preferred.net', profile.url[:host]
+    assert_equal 'myself', profile.url[:profile]
   end
   should 'provide a list of possible preferred domain names' do