Download as
Browse Code »

Commit b05c01e908e7606cc5d5303c8d755f2493fce7ea

Authored by AntonioTerceiro
1 parent 803c9d4c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem96: removing .localdomain from default hostname 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@689 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @b05c01e
@@ -151,7 +151,7 @@ class Environment < ActiveRecord::Base @@ -151,7 +151,7 @@ class Environment < ActiveRecord::Base
151 151
152 def default_hostname 152 def default_hostname
153 if self.domains(true).empty? 153 if self.domains(true).empty?
154 - 'localhost.localdomain' 154 + 'localhost'
155 else 155 else
156 self.domains.find(:first, :order => 'id').name 156 self.domains.find(:first, :order => 'id').name
157 end 157 end
test/unit/environment_test.rb
  Diff comments   View file @b05c01e
@@ -151,9 +151,9 @@ class EnvironmentTest < Test::Unit::TestCase @@ -151,9 +151,9 @@ class EnvironmentTest < Test::Unit::TestCase
151 assert_equal 'example.com', env.default_hostname 151 assert_equal 'example.com', env.default_hostname
152 end 152 end
153 153
154 - should 'default to localhost.localdomain as hostname' do 154 + should 'default to localhost as hostname' do
155 env = Environment.create!(:name => 'test environment') 155 env = Environment.create!(:name => 'test environment')
156 - assert_equal 'localhost.localdomain', env.default_hostname 156 + assert_equal 'localhost', env.default_hostname
157 end 157 end
158 158
159 should 'provide an approval_method setting' do 159 should 'provide an approval_method setting' do