From dd777a433cf08d442605391ff7ae251bf2fff001 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 3 Feb 2009 17:02:01 -0300 Subject: [PATCH] ActionItem918: being tollerant to uncategorized friendship --- app/models/person.rb | 2 +- test/unit/person_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/person.rb b/app/models/person.rb index bfc8cba..7c59291 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -22,7 +22,7 @@ class Person < Profile end def suggested_friend_groups - (friend_groups + [ _('friends'), _('work'), _('school'), _('family') ]).map {|i| i if !i.empty?}.compact.uniq + (friend_groups.compact + [ _('friends'), _('work'), _('school'), _('family') ]).map {|i| i if !i.empty?}.compact.uniq end def friend_groups diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb index 6c434f6..487c84c 100644 --- a/test/unit/person_test.rb +++ b/test/unit/person_test.rb @@ -214,6 +214,12 @@ class PersonTest < Test::Unit::TestCase assert_equivalent [ 'friends', 'work', 'school', 'family', 'group1', 'group2' ], p.suggested_friend_groups end + should 'accept nil friend groups when suggesting friend groups' do + p = Person.new(:environment => Environment.default) + p.expects(:friend_groups).returns([nil]) + assert_equivalent [ 'friends', 'work', 'school', 'family' ], p.suggested_friend_groups + end + should 'list friend groups' do p1 = create_user('testuser1').person p2 = create_user('testuser2').person -- libgit2 0.21.2