From ea211396e9b34b6e7557423bd7c5bb8439dc085b Mon Sep 17 00:00:00 2001 From: Larissa Reis Date: Sun, 15 May 2016 14:30:30 -0300 Subject: [PATCH] Adds more tests for ExternalPerson --- app/models/person.rb | 2 +- test/unit/external_person_test.rb | 29 ++++++++++++++++++++--------- test/unit/external_user_test.rb | 10 ---------- 3 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 test/unit/external_user_test.rb diff --git a/app/models/person.rb b/app/models/person.rb index dcf9059..dc35b70 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -173,7 +173,7 @@ class Person < Profile end def add_friend(friend, group = nil) - unless self.is_a_friend?(friend) + unless self.is_a_friend?(friend) || friend.is_a?(ExternalPerson) friendship = self.friendships.build friendship.friend = friend friendship.group = group diff --git a/test/unit/external_person_test.rb b/test/unit/external_person_test.rb index a88a578..b181b59 100644 --- a/test/unit/external_person_test.rb +++ b/test/unit/external_person_test.rb @@ -69,39 +69,50 @@ class ExternalPersonTest < ActiveSupport::TestCase end should 'generate a custom profile icon based on its avatar' do - skip + assert_match(/http:\/\/#{@external_person.source}\/.*/, @external_person.profile_custom_icon) end should 'have an url to its profile on its original environment' do - skip + assert_match(/http:\/\/#{@external_person.source}\/profile\/.*/, @external_person.url) end should 'have a public profile url' do - skip + assert_match(/http:\/\/#{@external_person.source}\/profile\/.*/, @external_person.public_profile_url) end should 'have an admin url to its profile on its original environment' do - skip + assert_match(/http:\/\/#{@external_person.source}\/myprofile\/.*/, @external_person.admin_url) end should 'never be a friend of another person' do - skip + friend = fast_create(Person) + friend.add_friend @external_person + refute @external_person.is_a_friend?(friend) + refute friend.is_a_friend?(@external_person) end should 'never send a friend request to another person' do - skip + friend = fast_create(Person) + friend.add_friend @external_person + refute friend.already_request_friendship?(@external_person) + @external_person.add_friend(friend) + refute @external_person.already_request_friendship?(friend) end should 'not follow another profile' do - skip + friend = fast_create(Person) + friend.add_friend @external_person + refute @external_person.follows?(friend) + refute friend.follows?(@external_person) end should 'have an image' do - skip + assert_not_nil @external_person.image end should 'profile image has public filename and mimetype' do - skip + assert_not_nil @external_person.image.public_filename + assert_not_nil @external_person.image.content_type end should 'respond to all instance methods in Profile' do diff --git a/test/unit/external_user_test.rb b/test/unit/external_user_test.rb deleted file mode 100644 index 3604637..0000000 --- a/test/unit/external_user_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -# encoding: UTF-8 -require_relative "../test_helper" - -class ExternalUserTest < ActiveSupport::TestCase - # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead. - # Then, you can remove it from this and the functional test. - include AuthenticatedTestHelper - fixtures :users, :environments - -end -- libgit2 0.21.2