Download as
Browse Code »

Commit 4bd91b76a69042a6303ece4bb7776caadc6171a0

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

ActionItem36: giving a default list of groups 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1499 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 10 additions and 5 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @4bd91b7
@@ -6,7 +6,7 @@ class Person < Profile @@ -6,7 +6,7 @@ class Person < Profile
6 has_many :friends, :class_name => 'Person', :through => :friendships 6 has_many :friends, :class_name => 'Person', :through => :friendships
7 7
8 def friend_groups 8 def friend_groups
9 - friendships.map {|item| item.group}.uniq 9 + ([_('friends'), _('work'), _('school'), _('family')] + friendships.map {|item| item.group}).uniq
10 end 10 end
11 11
12 # has_many :person_friendships 12 # has_many :person_friendships
test/unit/person_test.rb
  Diff comments   View file @4bd91b7
@@ -158,17 +158,22 @@ class PersonTest < Test::Unit::TestCase @@ -158,17 +158,22 @@ class PersonTest < Test::Unit::TestCase
158 158
159 end 159 end
160 160
  161 + should 'provide default friend groups list' do
  162 + assert_equivalent [ 'friends', 'work', 'school', 'family' ], Person.new.friend_groups
  163 + end
  164 +
161 should 'list friend groups' do 165 should 'list friend groups' do
162 p1 = create_user('testuser1').person 166 p1 = create_user('testuser1').person
163 p2 = create_user('testuser2').person 167 p2 = create_user('testuser2').person
164 p3 = create_user('testuser3').person 168 p3 = create_user('testuser3').person
165 p4 = create_user('testuser4').person 169 p4 = create_user('testuser4').person
166 170
167 - Friendship.create!(:person => p1, :friend => p2, :group => 'family')  
168 - Friendship.create!(:person => p1, :friend => p3, :group => 'school')  
169 - Friendship.create!(:person => p1, :friend => p4, :group => 'school') 171 + Friendship.create!(:person => p1, :friend => p2, :group => 'group1')
  172 + Friendship.create!(:person => p1, :friend => p3, :group => 'group2')
  173 + Friendship.create!(:person => p1, :friend => p4, :group => 'group1')
170 174
171 - assert_equivalent ['family', 'school'], p1.friend_groups 175 + assert_includes p1.friend_groups, 'group1'
  176 + assert_includes p1.friend_groups, 'group2'
172 end 177 end
173 178
174 end 179 end