Download as
Browse Code »

Commit 1d34206ad32eb153b8ac5a153fb50c4be78907e7

Authored by AntonioTerceiro
1 parent f37d4b1e
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

ActionItem507: making location method more robust in profile 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2163 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 19 additions and 1 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @1d34206
... ... @@ -106,7 +106,12 @@ class Profile < ActiveRecord::Base
106 106 belongs_to :region
107 107  
108 108 def location
109   - self.region.name
  109 + myregion = self.region
  110 + if myregion
  111 + myregion.name
  112 + else
  113 + ''
  114 + end
110 115 end
111 116  
112 117 def pending_categorizations
... ...
test/unit/profile_test.rb
  Diff comments   View file @1d34206
... ... @@ -646,6 +646,19 @@ class ProfileTest < Test::Unit::TestCase
646 646 assert !Profile.new.accept_category?(Region.new)
647 647 end
648 648  
  649 + should 'query region for location' do
  650 + p = Profile.new
  651 + region = mock; region.expects(:name).returns('Some ackwrad region name')
  652 + p.expects(:region).returns(region)
  653 + assert_equal 'Some ackwrad region name', p.location
  654 + end
  655 +
  656 + should 'fallback graciously when no region' do
  657 + p = Profile.new
  658 + p.expects(:region).returns(nil)
  659 + assert_equal '', p.location
  660 + end
  661 +
649 662 private
650 663  
651 664 def assert_invalid_identifier(id)
... ...