Download as
Browse Code »

Commit c8236d24a84f33dc39967b6a9c8c0c90d728fd21

Authored by Larissa Reis
1 parent 216fb6a4
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

Send notification message to invited user

Showing 4 changed files with 36 additions and 7 deletions   Show diff stats
app/controllers/public/invite_controller.rb
  Diff comments   View file @c8236d2
... ... @@ -58,9 +58,8 @@ class InviteController < PublicController
58 58  
59 59 def invite_registered_friend
60 60 contacts_to_invite = params['q'].split(',')
61   - mail_template = params[:mail_template] || environment.invitation_mail_template(profile)
62 61 if !contacts_to_invite.empty?
63   - Delayed::Job.enqueue InvitationJob.new(current_user.person.id, contacts_to_invite, mail_template, profile.id, nil, locale)
  62 + Delayed::Job.enqueue InvitationJob.new(current_user.person.id, contacts_to_invite, '', profile.id, nil, locale)
64 63 session[:notice] = _('Your invitations are being sent.')
65 64 if profile.person?
66 65 redirect_to :controller => 'profile', :action => 'friends'
... ...
app/models/invite_member.rb
  Diff comments   View file @c8236d2
... ... @@ -39,6 +39,14 @@ class InviteMember < Invitation
39 39 _('%{requestor} invited you to join %{community}.') % {:requestor => requestor.name, :community => community.name}
40 40 end
41 41  
  42 + def target_notification_message
  43 + if friend
  44 + _('%{requestor} is inviting you to join "%{community}" on %{system}.') % { :system => target.environment.name, :requestor => requestor.name, :community => community.name }
  45 + else
  46 + super
  47 + end
  48 + end
  49 +
42 50 def expanded_message
43 51 super.gsub /<community>/, community.name
44 52 end
... ...
app/views/invite/invite_friends.rhtml
  Diff comments   View file @c8236d2
... ... @@ -13,8 +13,6 @@
13 13 { :hint_text => _('Type in your friend\'s ') + search_friend_fields,
14 14 :focus => false }) %>
15 15  
16   - <%= render :partial => 'invite/personalize_invitation_mail', :locals => {:mail_template => @mail_template } %>
17   -
18 16 <% button_bar do %>
19 17 <%= submit_button('save', _('Invite'))%>
20 18 <%= button('cancel', _('Cancel'), profile.url)%>
... ...
test/unit/invite_member_test.rb
  Diff comments   View file @c8236d2
... ... @@ -76,11 +76,11 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
76 76 task = InviteMember.create!(:person => p1, :friend_email => 'test@test.com', :message => '<url>', :community_id => fast_create(Community).id)
77 77 end
78 78  
79   - should 'not send e-mails to friend if target given (person being invited)' do
  79 + should 'send e-mails notification to friend if target given (person being invited)' do
80 80 p1 = create_user('testuser1').person
81 81 p2 = create_user('testuser2').person
82 82  
83   - TaskMailer.expects(:deliver_invitation_notification).never
  83 + TaskMailer.expects(:deliver_target_notification).once
84 84  
85 85 task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
86 86 end
... ... @@ -115,5 +115,29 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
115 115 assert_match(/#{task.requestor.name} invited you to join #{community.name}/, email.subject)
116 116 end
117 117  
118   -end
  118 + should 'have target notification message only if target given (person being invited)' do
  119 + p1 = create_user('testuser1').person
  120 + p2 = create_user('testuser2').person
  121 +
  122 + task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
  123 + assert_nothing_raised NotImplementedError do
  124 + task.target_notification_message
  125 + end
  126 +
  127 + task = InviteMember.create!(:person => p1, :friend_email => 'test@test.com', :message => '<url>', :community_id => fast_create(Community).id)
  128 + assert_raise NotImplementedError do
  129 + task.target_notification_message
  130 + end
  131 + end
119 132  
  133 + should 'deliver target notification message if target given (person being invited)' do
  134 + p1 = create_user('testuser1').person
  135 + p2 = create_user('testuser2').person
  136 +
  137 + task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
  138 +
  139 + email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
  140 + assert_match(/#{task.requestor.name} invited you to join #{task.community.name}/, email.subject)
  141 + end
  142 +
  143 +end
... ...