Download as
Browse Code »

Commit dd777a433cf08d442605391ff7ae251bf2fff001

Authored by Antonio Terceiro
1 parent 9fe79d6f
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

ActionItem918: being tollerant to uncategorized friendship

Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @dd777a4
@@ -22,7 +22,7 @@ class Person < Profile @@ -22,7 +22,7 @@ class Person < Profile
22 end 22 end
23 23
24 def suggested_friend_groups 24 def suggested_friend_groups
25 - (friend_groups + [ _('friends'), _('work'), _('school'), _('family') ]).map {|i| i if !i.empty?}.compact.uniq 25 + (friend_groups.compact + [ _('friends'), _('work'), _('school'), _('family') ]).map {|i| i if !i.empty?}.compact.uniq
26 end 26 end
27 27
28 def friend_groups 28 def friend_groups
test/unit/person_test.rb
  Diff comments   View file @dd777a4
@@ -214,6 +214,12 @@ class PersonTest < Test::Unit::TestCase @@ -214,6 +214,12 @@ class PersonTest < Test::Unit::TestCase
214 assert_equivalent [ 'friends', 'work', 'school', 'family', 'group1', 'group2' ], p.suggested_friend_groups 214 assert_equivalent [ 'friends', 'work', 'school', 'family', 'group1', 'group2' ], p.suggested_friend_groups
215 end 215 end
216 216
  217 + should 'accept nil friend groups when suggesting friend groups' do
  218 + p = Person.new(:environment => Environment.default)
  219 + p.expects(:friend_groups).returns([nil])
  220 + assert_equivalent [ 'friends', 'work', 'school', 'family' ], p.suggested_friend_groups
  221 + end
  222 +
217 should 'list friend groups' do 223 should 'list friend groups' do
218 p1 = create_user('testuser1').person 224 p1 = create_user('testuser1').person
219 p2 = create_user('testuser2').person 225 p2 = create_user('testuser2').person