Download as
Browse Code »

Commit dd37857043e02bf4fb85fae744a095803aabf1e8

Authored by AntonioTerceiro
1 parent 4bd91b76
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem36: reformulating the friends groups listing 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1500 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 15 additions and 5 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @dd37857
@@ -5,8 +5,12 @@ class Person < Profile @@ -5,8 +5,12 @@ class Person < Profile
5 has_many :friendships 5 has_many :friendships
6 has_many :friends, :class_name => 'Person', :through => :friendships 6 has_many :friends, :class_name => 'Person', :through => :friendships
7 7
  8 + def suggested_friend_groups
  9 + friend_groups + [ _('friends'), _('work'), _('school'), _('family') ]
  10 + end
  11 +
8 def friend_groups 12 def friend_groups
9 - ([_('friends'), _('work'), _('school'), _('family')] + friendships.map {|item| item.group}).uniq 13 + friendships.map {|item| item.group}.uniq
10 end 14 end
11 15
12 # has_many :person_friendships 16 # has_many :person_friendships
test/unit/person_test.rb
  Diff comments   View file @dd37857
@@ -158,8 +158,15 @@ class PersonTest < Test::Unit::TestCase @@ -158,8 +158,15 @@ 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 161 + should 'suggest default friend groups list' do
  162 + p = Person.new
  163 + assert_equivalent [ 'friends', 'work', 'school', 'family' ], p.suggested_friend_groups
  164 + end
  165 +
  166 + should 'suggest current groups as well' do
  167 + p = Person.new
  168 + p.expects(:friend_groups).returns(['group1', 'group2'])
  169 + assert_equivalent [ 'friends', 'work', 'school', 'family', 'group1', 'group2' ], p.suggested_friend_groups
163 end 170 end
164 171
165 should 'list friend groups' do 172 should 'list friend groups' do
@@ -172,8 +179,7 @@ class PersonTest < Test::Unit::TestCase @@ -172,8 +179,7 @@ class PersonTest < Test::Unit::TestCase
172 Friendship.create!(:person => p1, :friend => p3, :group => 'group2') 179 Friendship.create!(:person => p1, :friend => p3, :group => 'group2')
173 Friendship.create!(:person => p1, :friend => p4, :group => 'group1') 180 Friendship.create!(:person => p1, :friend => p4, :group => 'group1')
174 181
175 - assert_includes p1.friend_groups, 'group1'  
176 - assert_includes p1.friend_groups, 'group2' 182 + assert_equivalent ['group1', 'group2'], p1.friend_groups
177 end 183 end
178 184
179 end 185 end