diff --git a/app/models/person.rb b/app/models/person.rb index 4927789..bbb03b0 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -6,7 +6,7 @@ class Person < Profile has_many :friends, :class_name => 'Person', :through => :friendships def friend_groups - friendships.map {|item| item.group}.uniq + ([_('friends'), _('work'), _('school'), _('family')] + friendships.map {|item| item.group}).uniq end # has_many :person_friendships diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb index 30d25b6..1493c45 100644 --- a/test/unit/person_test.rb +++ b/test/unit/person_test.rb @@ -158,17 +158,22 @@ class PersonTest < Test::Unit::TestCase end + should 'provide default friend groups list' do + assert_equivalent [ 'friends', 'work', 'school', 'family' ], Person.new.friend_groups + end + should 'list friend groups' do p1 = create_user('testuser1').person p2 = create_user('testuser2').person p3 = create_user('testuser3').person p4 = create_user('testuser4').person - Friendship.create!(:person => p1, :friend => p2, :group => 'family') - Friendship.create!(:person => p1, :friend => p3, :group => 'school') - Friendship.create!(:person => p1, :friend => p4, :group => 'school') + Friendship.create!(:person => p1, :friend => p2, :group => 'group1') + Friendship.create!(:person => p1, :friend => p3, :group => 'group2') + Friendship.create!(:person => p1, :friend => p4, :group => 'group1') - assert_equivalent ['family', 'school'], p1.friend_groups + assert_includes p1.friend_groups, 'group1' + assert_includes p1.friend_groups, 'group2' end end -- libgit2 0.21.2