From e5d3d8c323872cb5dee33c5388b3157294c30343 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 25 Oct 2021 12:10:19 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/mailers/emails/in_product_marketing_spec.rb | 42 +++++++++++++------ spec/mailers/notify_spec.rb | 52 ++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 17 deletions(-) (limited to 'spec/mailers') diff --git a/spec/mailers/emails/in_product_marketing_spec.rb b/spec/mailers/emails/in_product_marketing_spec.rb index 99beef92dea..c4ec4c84ff4 100644 --- a/spec/mailers/emails/in_product_marketing_spec.rb +++ b/spec/mailers/emails/in_product_marketing_spec.rb @@ -47,22 +47,30 @@ RSpec.describe Emails::InProductMarketing do end where(:track, :series) do - :create | 0 - :create | 1 - :create | 2 - :verify | 0 - :verify | 1 - :verify | 2 - :trial | 0 - :trial | 1 - :trial | 2 - :team | 0 - :team | 1 - :team | 2 - :experience | 0 + :create | 0 + :create | 1 + :create | 2 + :verify | 0 + :verify | 1 + :verify | 2 + :trial | 0 + :trial | 1 + :trial | 2 + :team | 0 + :team | 1 + :team | 2 + :experience | 0 + :team_short | 0 + :trial_short | 0 + :admin_verify | 0 end with_them do + before do + stub_experiments(invite_members_for_task: :candidate) + group.add_owner(user) + end + it 'has the correct subject and content' do message = Gitlab::Email::Message::InProductMarketing.for(track).new(group: group, user: user, series: series) @@ -76,6 +84,14 @@ RSpec.describe Emails::InProductMarketing do else is_expected.to have_body_text(CGI.unescapeHTML(message.cta_link)) end + + if track =~ /(create|verify)/ + is_expected.to have_body_text(message.invite_text) + is_expected.to have_body_text(CGI.unescapeHTML(message.invite_link)) + else + is_expected.not_to have_body_text(message.invite_text) + is_expected.not_to have_body_text(CGI.unescapeHTML(message.invite_link)) + end end end end diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index f39037cf744..151f7473c5f 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -8,6 +8,7 @@ RSpec.describe Notify do include EmailSpec::Matchers include EmailHelpers include RepoHelpers + include MembersHelper include_context 'gitlab email notification' @@ -761,10 +762,21 @@ RSpec.describe Notify do is_expected.to have_body_text project_member.human_access is_expected.to have_body_text 'leave the project' is_expected.to have_body_text project_url(project, leave: 1) + is_expected.not_to have_body_text 'You were assigned the following tasks:' + end + + context 'with tasks to be done present' do + let(:project_member) { create(:project_member, project: project, user: user, tasks_to_be_done: [:ci, :code]) } + + it 'contains the assigned tasks to be done' do + is_expected.to have_body_text 'You were assigned the following tasks:' + is_expected.to have_body_text localized_tasks_to_be_done_choices[:ci] + is_expected.to have_body_text localized_tasks_to_be_done_choices[:code] + end end end - def invite_to_project(project, inviter:, user: nil) + def invite_to_project(project, inviter:, user: nil, tasks_to_be_done: []) create( :project_member, :developer, @@ -772,7 +784,8 @@ RSpec.describe Notify do invite_token: '1234', invite_email: 'toto@example.com', user: user, - created_by: inviter + created_by: inviter, + tasks_to_be_done: tasks_to_be_done ) end @@ -804,6 +817,7 @@ RSpec.describe Notify do is_expected.to have_content("#{inviter.name} invited you to join the") is_expected.to have_content('Project details') is_expected.to have_content("What's it about?") + is_expected.not_to have_body_text 'and has assigned you the following tasks:' end end @@ -890,6 +904,16 @@ RSpec.describe Notify do end end end + + context 'with tasks to be done present', :aggregate_failures do + let(:project_member) { invite_to_project(project, inviter: inviter, tasks_to_be_done: [:ci, :code]) } + + it 'contains the assigned tasks to be done' do + is_expected.to have_body_text 'and has assigned you the following tasks:' + is_expected.to have_body_text localized_tasks_to_be_done_choices[:ci] + is_expected.to have_body_text localized_tasks_to_be_done_choices[:code] + end + end end describe 'project invitation accepted' do @@ -1398,7 +1422,7 @@ RSpec.describe Notify do end end - def invite_to_group(group, inviter:, user: nil) + def invite_to_group(group, inviter:, user: nil, tasks_to_be_done: []) create( :group_member, :developer, @@ -1406,7 +1430,8 @@ RSpec.describe Notify do invite_token: '1234', invite_email: 'toto@example.com', user: user, - created_by: inviter + created_by: inviter, + tasks_to_be_done: tasks_to_be_done ) end @@ -1431,6 +1456,7 @@ RSpec.describe Notify do is_expected.to have_body_text group.name is_expected.to have_body_text group_member.human_access.downcase is_expected.to have_body_text group_member.invite_token + is_expected.not_to have_body_text 'and has assigned you the following tasks:' end end @@ -1444,6 +1470,24 @@ RSpec.describe Notify do is_expected.to have_body_text group_member.invite_token end end + + context 'with tasks to be done present', :aggregate_failures do + let(:group_member) { invite_to_group(group, inviter: inviter, tasks_to_be_done: [:ci, :code]) } + + it 'contains the assigned tasks to be done' do + is_expected.to have_body_text 'and has assigned you the following tasks:' + is_expected.to have_body_text localized_tasks_to_be_done_choices[:ci] + is_expected.to have_body_text localized_tasks_to_be_done_choices[:code] + end + + context 'when there is no inviter' do + let(:inviter) { nil } + + it 'does not contain the assigned tasks to be done' do + is_expected.not_to have_body_text 'and has assigned you the following tasks:' + end + end + end end describe 'group invitation reminders' do -- cgit v1.2.3