Download as
Browse Code »

Commit 6d5e63f5a647bf67b126eed49303470684d71771

Authored by Larissa Reis
1 parent 49568a03
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Sends invitation to join community when user is already a friend 

  Invitations to join a community weren't creating a task when the user
  being invited was already a friend of the user inviting them, this
  fixes this issue.
Showing 2 changed files with 24 additions and 1 deletions   Show diff stats
app/models/invitation.rb
  Diff comments   View file @6d5e63f
@@ -64,7 +64,7 @@ class Invitation < Task @@ -64,7 +64,7 @@ class Invitation < Task
64 64
65 task_args = if user.nil? 65 task_args = if user.nil?
66 {:person => person, :friend_name => friend_name, :friend_email => friend_email, :message => message} 66 {:person => person, :friend_name => friend_name, :friend_email => friend_email, :message => message}
67 - elsif !user.person.is_a_friend?(person) 67 + elsif !(user.person.is_a_friend?(person) && profile.person?)
68 {:person => person, :target => user.person} 68 {:person => person, :target => user.person}
69 end 69 end
70 70
test/unit/invitation_test.rb
  Diff comments   View file @6d5e63f
@@ -72,6 +72,29 @@ class InvitationTest < ActiveSupport::TestCase @@ -72,6 +72,29 @@ class InvitationTest < ActiveSupport::TestCase
72 end 72 end
73 end 73 end
74 74
  75 + should 'do nothing if the invited friend is already your friend' do
  76 + person = create_user('person').person
  77 + invited_friend = create_user('invited_friend').person
  78 +
  79 + invited_friend.add_friend(person)
  80 +
  81 + assert_no_difference InviteFriend, :count do
  82 + Invitation.invite( person, [invited_friend.user.email], "", person )
  83 + end
  84 + end
  85 +
  86 + should 'and yet be able to invite friends to community' do
  87 + person = create_user('person').person
  88 + invited_friend = create_user('invited_friend').person
  89 +
  90 + invited_friend.add_friend(person)
  91 + community = fast_create(Community)
  92 +
  93 + assert_difference InviteMember, :count do
  94 + Invitation.invite( person, [invited_friend.user.email], "", community )
  95 + end
  96 + end
  97 +
75 should 'add url on message if user removed it' do 98 should 'add url on message if user removed it' do
76 person = create_user('testuser1').person 99 person = create_user('testuser1').person
77 friend = create_user('testuser2').person 100 friend = create_user('testuser2').person