Download as
Browse Code »

Commit 8502ce1effd6b03a030ac535e13d46960b74ea44

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 6a5b202d
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

ActionItem862: not display add friend button if user already friend

Showing 4 changed files with 28 additions and 1 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @8502ce1
... ... @@ -215,4 +215,8 @@ class Person < Profile
215 215 organization.tasks.pending.select{|task| self.has_permission?(task.permission, organization)}
216 216 end
217 217  
  218 + def is_a_friend?(person)
  219 + self.friends.include?(person)
  220 + end
  221 +
218 222 end
... ...
app/views/blocks/profile_info_actions/person.rhtml
  Diff comments   View file @8502ce1
1 1 <ul>
2 2 <%if logged_in? && (user != profile) %>
3   - <% if !user.already_request_friendship?(profile) %>
  3 + <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
4 4 <li><%= link_to content_tag('span', __('Add friend')), { :profile => user.identifier, :controller => 'friends', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add' %></li>
5 5 <% end %>
6 6 <% end %>
... ...
test/functional/profile_controller_test.rb
  Diff comments   View file @8502ce1
... ... @@ -223,12 +223,22 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
223 223 end
224 224  
225 225 should 'not display add friend button if user already request friendship' do
  226 + login_as(@profile.identifier)
226 227 friend = create_user('friendtestuser').person
227 228 AddFriend.create!(:person => @profile, :friend => friend)
228 229 get :index, :profile => friend.identifier
229 230 assert_no_tag :tag => 'a', :content => 'Add friend'
230 231 end
231 232  
  233 + should 'not display add friend button if user already friend' do
  234 + login_as(@profile.identifier)
  235 + friend = create_user('friendtestuser').person
  236 + @profile.add_friend(friend)
  237 + assert @profile.is_a_friend?(friend)
  238 + get :index, :profile => friend.identifier
  239 + assert_no_tag :tag => 'a', :content => 'Add friend'
  240 + end
  241 +
232 242 should 'show message for disabled enterprise' do
233 243 login_as(@profile.identifier)
234 244 ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
... ...
test/unit/person_test.rb
  Diff comments   View file @8502ce1
... ... @@ -465,4 +465,17 @@ class PersonTest &lt; Test::Unit::TestCase
465 465 assert ! person.errors.invalid?(:custom_formation)
466 466 end
467 467  
  468 + should 'identify when person is a friend' do
  469 + p1 = create_user('testuser1').person
  470 + p2 = create_user('testuser2').person
  471 + p1.add_friend(p2)
  472 + assert p1.is_a_friend?(p2)
  473 + end
  474 +
  475 + should 'identify when person isnt a friend' do
  476 + p1 = create_user('testuser1').person
  477 + p2 = create_user('testuser2').person
  478 + assert !p1.is_a_friend?(p2)
  479 + end
  480 +
468 481 end
... ...