2014-09-02 18:07:02 +05:30
|
|
|
require 'spec_helper'
|
2015-09-11 14:41:01 +05:30
|
|
|
require 'email_spec'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
describe Notify do
|
|
|
|
include EmailSpec::Helpers
|
|
|
|
include EmailSpec::Matchers
|
|
|
|
include RepoHelpers
|
|
|
|
|
2016-04-02 18:10:28 +05:30
|
|
|
include_context 'gitlab email notification'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
set(:user) { create(:user) }
|
|
|
|
set(:current_user) { create(:user, email: "current@email.com") }
|
|
|
|
set(:assignee) { create(:user, email: 'assignee@example.com', name: 'John Doe') }
|
|
|
|
|
|
|
|
set(:merge_request) do
|
|
|
|
create(:merge_request, source_project: project,
|
|
|
|
target_project: project,
|
|
|
|
author: current_user,
|
|
|
|
assignee: assignee,
|
|
|
|
description: 'Awesome description')
|
|
|
|
end
|
|
|
|
|
|
|
|
set(:issue) do
|
|
|
|
create(:issue, author: current_user,
|
|
|
|
assignees: [assignee],
|
|
|
|
project: project,
|
|
|
|
description: 'My awesome description!')
|
|
|
|
end
|
|
|
|
|
2019-01-03 12:48:30 +05:30
|
|
|
def have_referable_subject(referable, reply: false)
|
|
|
|
prefix = referable.project ? "#{referable.project.name} | " : ''
|
|
|
|
prefix.prepend('Re: ') if reply
|
|
|
|
|
|
|
|
suffix = "#{referable.title} (#{referable.to_reference})"
|
|
|
|
|
|
|
|
have_subject [prefix, suffix].compact.join
|
|
|
|
end
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
context 'for a project' do
|
2018-03-17 18:26:18 +05:30
|
|
|
shared_examples 'an assignee email' do
|
|
|
|
it 'is sent to the assignee as the author' do
|
|
|
|
sender = subject.header[:from].addrs.first
|
|
|
|
|
|
|
|
aggregate_failures do
|
|
|
|
expect(sender.display_name).to eq(current_user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
expect(subject).to deliver_to(assignee.email)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'for issues' do
|
|
|
|
describe 'that are new' do
|
|
|
|
subject { described_class.new_issue_email(issue.assignees.first.id, issue.id) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'an assignee email'
|
|
|
|
it_behaves_like 'an email starting a new thread with reply-by-email enabled' do
|
|
|
|
let(:model) { issue }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Issue link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'has the correct subject and body' do
|
2017-08-17 22:00:37 +05:30
|
|
|
aggregate_failures do
|
2018-03-17 18:26:18 +05:30
|
|
|
is_expected.to have_referable_subject(issue)
|
|
|
|
is_expected.to have_body_text(project_issue_path(project, issue))
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'contains the description' do
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text issue.description
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not add a reason header' do
|
|
|
|
is_expected.not_to have_header('X-GitLab-NotificationReason', /.+/)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
context 'when sent with a reason' do
|
|
|
|
subject { described_class.new_issue_email(issue.assignees.first.id, issue.id, NotificationReason::ASSIGNED) }
|
|
|
|
|
|
|
|
it 'includes the reason in a header' do
|
|
|
|
is_expected.to have_header('X-GitLab-NotificationReason', NotificationReason::ASSIGNED)
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
context 'when enabled email_author_in_body' do
|
|
|
|
before do
|
|
|
|
stub_application_setting(email_author_in_body: true)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'contains a link to note author' do
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text(issue.author_name)
|
2018-03-17 18:26:18 +05:30
|
|
|
is_expected.to have_body_text 'created an issue:'
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'that are reassigned' do
|
|
|
|
let(:previous_assignee) { create(:user, name: 'Previous Assignee') }
|
|
|
|
subject { described_class.reassigned_issue_email(recipient.id, issue.id, [previous_assignee.id], current_user.id) }
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'a multiple recipients email'
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { issue }
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'it should show Gmail Actions View Issue link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(current_user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(issue, reply: true)
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text(previous_assignee.name)
|
|
|
|
is_expected.to have_body_text(assignee.name)
|
2018-03-17 18:26:18 +05:30
|
|
|
is_expected.to have_body_text(project_issue_path(project, issue))
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
context 'when sent with a reason' do
|
|
|
|
subject { described_class.reassigned_issue_email(recipient.id, issue.id, [previous_assignee.id], current_user.id, NotificationReason::ASSIGNED) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'includes the reason in a header' do
|
|
|
|
is_expected.to have_header('X-GitLab-NotificationReason', NotificationReason::ASSIGNED)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe 'that have been relabeled' do
|
|
|
|
subject { described_class.relabeled_issue_email(recipient.id, issue.id, %w[foo bar baz], current_user.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'a multiple recipients email'
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { issue }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Issue link'
|
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
|
|
|
it_behaves_like 'an email with a labels subscriptions link in its footer'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(current_user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(issue, reply: true)
|
|
|
|
is_expected.to have_body_text('foo, bar, and baz')
|
|
|
|
is_expected.to have_body_text(project_issue_path(project, issue))
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
context 'with a preferred language' do
|
|
|
|
before do
|
|
|
|
Gitlab::I18n.locale = :es
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
after do
|
|
|
|
Gitlab::I18n.use_default_locale
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'always generates the email using the default language' do
|
|
|
|
is_expected.to have_body_text('foo, bar, and baz')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'status changed' do
|
|
|
|
let(:status) { 'closed' }
|
|
|
|
subject { described_class.issue_status_changed_email(recipient.id, issue.id, status, current_user.id) }
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { issue }
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'it should show Gmail Actions View Issue link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(current_user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(issue, reply: true)
|
|
|
|
is_expected.to have_body_text(status)
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text(current_user.name)
|
2018-03-17 18:26:18 +05:30
|
|
|
is_expected.to have_body_text(project_issue_path project, issue)
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'moved to another project' do
|
|
|
|
let(:new_issue) { create(:issue) }
|
|
|
|
subject { described_class.issue_moved_email(recipient, issue, new_issue, current_user) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { issue }
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'it should show Gmail Actions View Issue link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'contains description about action taken' do
|
|
|
|
is_expected.to have_body_text 'Issue was moved to another project'
|
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
new_issue_url = project_issue_path(new_issue.project, new_issue)
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(issue, reply: true)
|
|
|
|
is_expected.to have_body_text(new_issue_url)
|
|
|
|
is_expected.to have_body_text(project_issue_path(project, issue))
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
context 'for merge requests' do
|
|
|
|
describe 'that are new' do
|
|
|
|
subject { described_class.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'an assignee email'
|
|
|
|
it_behaves_like 'an email starting a new thread with reply-by-email enabled' do
|
|
|
|
let(:model) { merge_request }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
|
|
|
|
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(merge_request)
|
|
|
|
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
|
|
|
|
is_expected.to have_body_text(merge_request.source_branch)
|
|
|
|
is_expected.to have_body_text(merge_request.target_branch)
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'contains the description' do
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text merge_request.description
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
context 'when sent with a reason' do
|
|
|
|
subject { described_class.new_merge_request_email(merge_request.assignee_id, merge_request.id, NotificationReason::ASSIGNED) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'includes the reason in a header' do
|
|
|
|
is_expected.to have_header('X-GitLab-NotificationReason', NotificationReason::ASSIGNED)
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
context 'when enabled email_author_in_body' do
|
|
|
|
before do
|
|
|
|
stub_application_setting(email_author_in_body: true)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'contains a link to note author' do
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text merge_request.author_name
|
2018-03-17 18:26:18 +05:30
|
|
|
is_expected.to have_body_text 'created a merge request:'
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'that are reassigned' do
|
|
|
|
let(:previous_assignee) { create(:user, name: 'Previous Assignee') }
|
|
|
|
subject { described_class.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id) }
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'a multiple recipients email'
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { merge_request }
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like "an unsubscribeable thread"
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(current_user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(merge_request, reply: true)
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text(previous_assignee.name)
|
2018-03-17 18:26:18 +05:30
|
|
|
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text(assignee.name)
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
context 'when sent with a reason' do
|
|
|
|
subject { described_class.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id, NotificationReason::ASSIGNED) }
|
|
|
|
|
|
|
|
it 'includes the reason in a header' do
|
|
|
|
is_expected.to have_header('X-GitLab-NotificationReason', NotificationReason::ASSIGNED)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'includes the reason in the footer' do
|
|
|
|
text = EmailsHelper.instance_method(:notification_reason_text).bind(self).call(NotificationReason::ASSIGNED)
|
|
|
|
is_expected.to have_body_text(text)
|
|
|
|
|
|
|
|
new_subject = described_class.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id, NotificationReason::MENTIONED)
|
|
|
|
text = EmailsHelper.instance_method(:notification_reason_text).bind(self).call(NotificationReason::MENTIONED)
|
|
|
|
expect(new_subject).to have_body_text(text)
|
|
|
|
|
|
|
|
new_subject = described_class.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id, nil)
|
|
|
|
text = EmailsHelper.instance_method(:notification_reason_text).bind(self).call(nil)
|
|
|
|
expect(new_subject).to have_body_text(text)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-11-18 11:00:15 +05:30
|
|
|
describe 'that are new with a description' do
|
|
|
|
subject { described_class.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like "an unsubscribeable thread"
|
|
|
|
|
|
|
|
it 'contains the description' do
|
|
|
|
is_expected.to have_body_text(merge_request.description)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'that have been relabeled' do
|
|
|
|
subject { described_class.relabeled_merge_request_email(recipient.id, merge_request.id, %w[foo bar baz], current_user.id) }
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'a multiple recipients email'
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { merge_request }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
|
|
|
it_behaves_like 'an email with a labels subscriptions link in its footer'
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(current_user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has the correct subject and body' do
|
|
|
|
is_expected.to have_referable_subject(merge_request, reply: true)
|
|
|
|
is_expected.to have_body_text('foo, bar, and baz')
|
|
|
|
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'status changed' do
|
|
|
|
let(:status) { 'reopened' }
|
|
|
|
subject { described_class.merge_request_status_email(recipient.id, merge_request.id, status, current_user.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { merge_request }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
|
|
|
|
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(current_user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_referable_subject(merge_request, reply: true)
|
2018-03-17 18:26:18 +05:30
|
|
|
is_expected.to have_body_text(status)
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text(current_user.name)
|
2017-09-10 17:25:29 +05:30
|
|
|
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'that are merged' do
|
|
|
|
let(:merge_author) { create(:user) }
|
|
|
|
subject { described_class.merged_merge_request_email(recipient.id, merge_request.id, merge_author.id) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it_behaves_like 'a multiple recipients email'
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { merge_request }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'is sent as the merge author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(merge_author.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(merge_request, reply: true)
|
|
|
|
is_expected.to have_body_text('merged')
|
|
|
|
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
2018-05-09 12:01:36 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
describe 'that are unmergeable' do
|
|
|
|
set(:merge_request) do
|
|
|
|
create(:merge_request, :conflict,
|
|
|
|
source_project: project,
|
|
|
|
target_project: project,
|
|
|
|
author: current_user,
|
|
|
|
assignee: assignee,
|
|
|
|
description: 'Awesome description')
|
|
|
|
end
|
|
|
|
|
|
|
|
subject { described_class.merge_request_unmergeable_email(recipient.id, merge_request.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'a multiple recipients email'
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { merge_request }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
|
|
|
|
|
|
|
it 'is sent as the merge request author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(merge_request.author.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(merge_request, reply: true)
|
|
|
|
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
|
|
|
|
is_expected.to have_body_text('due to conflict.')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-05-09 12:01:36 +05:30
|
|
|
shared_examples 'a push to an existing merge request' do
|
|
|
|
let(:push_user) { create(:user) }
|
|
|
|
|
|
|
|
subject do
|
|
|
|
described_class.push_to_merge_request_email(recipient.id, merge_request.id, push_user.id, new_commits: merge_request.commits, existing_commits: existing_commits)
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'a multiple recipients email'
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { merge_request }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
|
|
|
|
|
|
|
it 'is sent as the push user' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
|
|
|
|
expect(sender.display_name).to eq(push_user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(merge_request, reply: true)
|
|
|
|
is_expected.to have_body_text("#{push_user.name} pushed new commits")
|
|
|
|
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'that have new commits' do
|
|
|
|
let(:existing_commits) { [] }
|
|
|
|
|
|
|
|
it_behaves_like 'a push to an existing merge request'
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'that have new commits on top of an existing one' do
|
|
|
|
let(:existing_commits) { [merge_request.commits.first] }
|
|
|
|
|
|
|
|
it_behaves_like 'a push to an existing merge request'
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
context 'for issue notes' do
|
|
|
|
let(:host) { Gitlab.config.gitlab.host }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
context 'in discussion' do
|
|
|
|
set(:first_note) { create(:discussion_note_on_issue) }
|
|
|
|
set(:second_note) { create(:discussion_note_on_issue, in_reply_to: first_note) }
|
|
|
|
set(:third_note) { create(:discussion_note_on_issue, in_reply_to: second_note) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
subject { described_class.note_issue_email(recipient.id, third_note.id) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'has In-Reply-To header pointing to previous note in discussion' do
|
|
|
|
expect(subject.header['In-Reply-To'].message_ids).to eq(["note_#{second_note.id}@#{host}"])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has References header including the notes and issue of the discussion' do
|
|
|
|
expect(subject.header['References'].message_ids).to include("issue_#{first_note.noteable.id}@#{host}",
|
|
|
|
"note_#{first_note.id}@#{host}",
|
|
|
|
"note_#{second_note.id}@#{host}")
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
|
|
|
it 'has X-GitLab-Discussion-ID header' do
|
|
|
|
expect(subject.header['X-GitLab-Discussion-ID'].value).to eq(third_note.discussion.id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'individual issue comments' do
|
|
|
|
set(:note) { create(:note_on_issue) }
|
|
|
|
|
|
|
|
subject { described_class.note_issue_email(recipient.id, note.id) }
|
|
|
|
|
|
|
|
it 'has In-Reply-To header pointing to the issue' do
|
|
|
|
expect(subject.header['In-Reply-To'].message_ids).to eq(["issue_#{note.noteable.id}@#{host}"])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has References header including the notes and issue of the discussion' do
|
|
|
|
expect(subject.header['References'].message_ids).to include("issue_#{note.noteable.id}@#{host}")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'for snippet notes' do
|
|
|
|
let(:project_snippet) { create(:project_snippet, project: project) }
|
|
|
|
let(:project_snippet_note) { create(:note_on_project_snippet, project: project, noteable: project_snippet) }
|
|
|
|
|
2018-11-29 20:51:05 +05:30
|
|
|
subject { described_class.note_project_snippet_email(project_snippet_note.author_id, project_snippet_note.id) }
|
2018-03-17 18:26:18 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { project_snippet }
|
|
|
|
end
|
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
|
|
|
|
|
|
|
it 'has the correct subject and body' do
|
|
|
|
is_expected.to have_referable_subject(project_snippet, reply: true)
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text project_snippet_note.note
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'project was moved' do
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.project_was_moved_email(project.id, user.id, "gitlab/gitlab") }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
2016-01-19 16:12:03 +05:30
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
is_expected.to have_subject("#{project.name} | Project was moved")
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text project.full_name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text(project.ssh_url_to_repo)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
describe 'project access requested' do
|
2018-03-27 19:54:05 +05:30
|
|
|
let(:project) do
|
|
|
|
create(:project, :public, :access_requestable) do |project|
|
2018-11-18 11:00:15 +05:30
|
|
|
project.add_maintainer(project.owner)
|
2016-06-22 15:30:34 +05:30
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
|
2018-03-27 19:54:05 +05:30
|
|
|
let(:project_member) do
|
|
|
|
project.request_access(user)
|
|
|
|
project.requesters.find_by(user_id: user.id)
|
|
|
|
end
|
|
|
|
subject { described_class.member_access_requested_email('project', project_member.id, recipient.notification_email) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2018-03-27 19:54:05 +05:30
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
2016-06-22 15:30:34 +05:30
|
|
|
|
2018-03-27 19:54:05 +05:30
|
|
|
it 'contains all the useful information' do
|
|
|
|
to_emails = subject.header[:to].addrs.map(&:address)
|
|
|
|
expect(to_emails).to eq([recipient.notification_email])
|
2016-06-22 15:30:34 +05:30
|
|
|
|
2018-03-27 19:54:05 +05:30
|
|
|
is_expected.to have_subject "Request to join the #{project.full_name} project"
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text project.full_name
|
2018-03-27 19:54:05 +05:30
|
|
|
is_expected.to have_body_text project_project_members_url(project)
|
|
|
|
is_expected.to have_body_text project_member.human_access
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'project access denied' do
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:project) { create(:project, :public, :access_requestable) }
|
2016-06-16 23:09:34 +05:30
|
|
|
let(:project_member) do
|
|
|
|
project.request_access(user)
|
2016-08-24 12:49:21 +05:30
|
|
|
project.requesters.find_by(user_id: user.id)
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.member_access_denied_email('project', project.id, user.id) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
|
|
|
|
|
|
|
it 'contains all the useful information' do
|
2018-03-27 19:54:05 +05:30
|
|
|
is_expected.to have_subject "Access to the #{project.full_name} project was denied"
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text project.full_name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text project.web_url
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
describe 'project access changed' do
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:owner) { create(:user, name: "Chang O'Keefe") }
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:project) { create(:project, :public, :access_requestable, namespace: owner.namespace) }
|
2015-09-11 14:41:01 +05:30
|
|
|
let(:project_member) { create(:project_member, project: project, user: user) }
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.member_access_granted_email('project', project_member.id) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
2016-01-19 16:12:03 +05:30
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
it 'contains all the useful information' do
|
2018-03-27 19:54:05 +05:30
|
|
|
is_expected.to have_subject "Access to the #{project.full_name} project was granted"
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text project.full_name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text project.web_url
|
|
|
|
is_expected.to have_body_text project_member.human_access
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2015-12-23 02:04:40 +05:30
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
def invite_to_project(project, inviter:)
|
|
|
|
create(
|
|
|
|
:project_member,
|
|
|
|
:developer,
|
|
|
|
project: project,
|
|
|
|
invite_token: '1234',
|
|
|
|
invite_email: 'toto@example.com',
|
|
|
|
user: nil,
|
|
|
|
created_by: inviter
|
2016-09-13 17:45:13 +05:30
|
|
|
)
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe 'project invitation' do
|
2018-11-18 11:00:15 +05:30
|
|
|
let(:maintainer) { create(:user).tap { |u| project.add_maintainer(u) } }
|
|
|
|
let(:project_member) { invite_to_project(project, inviter: maintainer) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.member_invited_email('project', project_member.id, project_member.invite_token) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
|
|
|
|
|
|
|
it 'contains all the useful information' do
|
2018-03-27 19:54:05 +05:30
|
|
|
is_expected.to have_subject "Invitation to join the #{project.full_name} project"
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text project.full_name
|
|
|
|
is_expected.to have_body_text project.full_name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text project_member.human_access
|
|
|
|
is_expected.to have_body_text project_member.invite_token
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'project invitation accepted' do
|
2016-11-03 12:29:30 +05:30
|
|
|
let(:invited_user) { create(:user, name: 'invited user') }
|
2018-11-18 11:00:15 +05:30
|
|
|
let(:maintainer) { create(:user).tap { |u| project.add_maintainer(u) } }
|
2016-06-16 23:09:34 +05:30
|
|
|
let(:project_member) do
|
2018-11-18 11:00:15 +05:30
|
|
|
invitee = invite_to_project(project, inviter: maintainer)
|
2016-06-16 23:09:34 +05:30
|
|
|
invitee.accept_invite!(invited_user)
|
|
|
|
invitee
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.member_invite_accepted_email('project', project_member.id) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
|
|
|
|
|
|
|
it 'contains all the useful information' do
|
|
|
|
is_expected.to have_subject 'Invitation accepted'
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text project.full_name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text project.web_url
|
|
|
|
is_expected.to have_body_text project_member.invite_email
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text invited_user.name
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'project invitation declined' do
|
2018-11-18 11:00:15 +05:30
|
|
|
let(:maintainer) { create(:user).tap { |u| project.add_maintainer(u) } }
|
2016-06-16 23:09:34 +05:30
|
|
|
let(:project_member) do
|
2018-11-18 11:00:15 +05:30
|
|
|
invitee = invite_to_project(project, inviter: maintainer)
|
2016-06-16 23:09:34 +05:30
|
|
|
invitee.decline_invite!
|
|
|
|
invitee
|
|
|
|
end
|
|
|
|
|
2018-11-18 11:00:15 +05:30
|
|
|
subject { described_class.member_invite_declined_email('project', project.id, project_member.invite_email, maintainer.id) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
|
|
|
|
|
|
|
it 'contains all the useful information' do
|
|
|
|
is_expected.to have_subject 'Invitation declined'
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text project.full_name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text project.web_url
|
|
|
|
is_expected.to have_body_text project_member.invite_email
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'items that are noteable, the email for a note' do
|
|
|
|
let(:note_author) { create(:user, name: 'author_name') }
|
|
|
|
let(:note) { create(:note, project: project, author: note_author) }
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
before do
|
2015-04-26 12:48:37 +05:30
|
|
|
allow(Note).to receive(:find).with(note.id).and_return(note)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe 'on a commit' do
|
2015-09-11 14:41:01 +05:30
|
|
|
let(:commit) { project.commit }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
before do
|
|
|
|
allow(note).to receive(:noteable).and_return(commit)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.note_commit_email(recipient.id, note.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'a note email'
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { commit }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Commit link'
|
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
|
|
|
|
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
2018-03-17 18:26:18 +05:30
|
|
|
is_expected.to have_subject("Re: #{project.name} | #{commit.title} (#{commit.short_id})")
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text(commit.short_id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'on a merge request' do
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:note_on_merge_request_path) { project_merge_request_path(project, merge_request, anchor: "note_#{note.id}") }
|
|
|
|
|
|
|
|
before do
|
|
|
|
allow(note).to receive(:noteable).and_return(merge_request)
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
subject { described_class.note_merge_request_email(recipient.id, note.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'a note email'
|
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { merge_request }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
|
|
|
|
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(merge_request, reply: true)
|
|
|
|
is_expected.to have_body_text note_on_merge_request_path
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'on an issue' do
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:note_on_issue_path) { project_issue_path(project, issue, anchor: "note_#{note.id}") }
|
|
|
|
|
|
|
|
before do
|
|
|
|
allow(note).to receive(:noteable).and_return(issue)
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
subject { described_class.note_issue_email(recipient.id, note.id) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
it_behaves_like 'a note email'
|
2017-08-17 22:00:37 +05:30
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { issue }
|
|
|
|
end
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Issue link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
|
|
|
|
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_referable_subject(issue, reply: true)
|
|
|
|
is_expected.to have_body_text(note_on_issue_path)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'items that are noteable, the email for a discussion note' do
|
|
|
|
let(:note_author) { create(:user, name: 'author_name') }
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
before do
|
2017-08-17 22:00:37 +05:30
|
|
|
allow(Note).to receive(:find).with(note.id).and_return(note)
|
|
|
|
end
|
|
|
|
|
|
|
|
shared_examples 'a discussion note email' do |model|
|
|
|
|
it_behaves_like 'it should have Gmail Actions links'
|
|
|
|
|
|
|
|
it 'is sent to the given recipient as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
|
|
|
|
aggregate_failures do
|
|
|
|
expect(sender.display_name).to eq(note_author.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
expect(subject).to deliver_to(recipient.notification_email)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'contains the message from the note' do
|
|
|
|
is_expected.to have_body_text note.note
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'contains an introduction' do
|
|
|
|
is_expected.to have_body_text 'started a new discussion'
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when a comment on an existing discussion' do
|
|
|
|
let!(:second_note) { create(model, author: note_author, noteable: nil, in_reply_to: note) }
|
|
|
|
|
|
|
|
it 'contains an introduction' do
|
|
|
|
is_expected.to have_body_text 'commented on a'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'on a commit' do
|
|
|
|
let(:commit) { project.commit }
|
|
|
|
let(:note) { create(:discussion_note_on_commit, commit_id: commit.id, project: project, author: note_author) }
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
before do
|
|
|
|
allow(note).to receive(:noteable).and_return(commit)
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
subject { described_class.note_commit_email(recipient.id, note.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'a discussion note email', :discussion_note_on_commit
|
2016-06-02 11:05:42 +05:30
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { commit }
|
|
|
|
end
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should show Gmail Actions View Commit link'
|
2016-06-02 11:05:42 +05:30
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
it 'has the correct subject' do
|
2018-03-17 18:26:18 +05:30
|
|
|
is_expected.to have_subject "Re: #{project.name} | #{commit.title} (#{commit.short_id})"
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'contains a link to the commit' do
|
2015-04-26 12:48:37 +05:30
|
|
|
is_expected.to have_body_text commit.short_id
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'on a merge request' do
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project, author: note_author) }
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:note_on_merge_request_path) { project_merge_request_path(project, merge_request, anchor: "note_#{note.id}") }
|
|
|
|
|
|
|
|
before do
|
|
|
|
allow(note).to receive(:noteable).and_return(merge_request)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.note_merge_request_email(recipient.id, note.id) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it_behaves_like 'a discussion note email', :discussion_note_on_merge_request
|
2016-06-02 11:05:42 +05:30
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { merge_request }
|
|
|
|
end
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
2016-01-19 16:12:03 +05:30
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
it 'has the correct subject' do
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_referable_subject(merge_request, reply: true)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'contains a link to the merge request note' do
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text note_on_merge_request_path
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'on an issue' do
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:note) { create(:discussion_note_on_issue, noteable: issue, project: project, author: note_author) }
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:note_on_issue_path) { project_issue_path(project, issue, anchor: "note_#{note.id}") }
|
|
|
|
|
|
|
|
before do
|
|
|
|
allow(note).to receive(:noteable).and_return(issue)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.note_issue_email(recipient.id, note.id) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it_behaves_like 'a discussion note email', :discussion_note_on_issue
|
2016-06-02 11:05:42 +05:30
|
|
|
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
|
|
|
|
let(:model) { issue }
|
|
|
|
end
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should show Gmail Actions View Issue link'
|
2016-01-19 16:12:03 +05:30
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
it 'has the correct subject' do
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_referable_subject(issue, reply: true)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'contains a link to the issue note' do
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text note_on_issue_path
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
context 'items that are noteable, the email for a diff discussion note' do
|
|
|
|
let(:note_author) { create(:user, name: 'author_name') }
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
before do
|
2017-08-17 22:00:37 +05:30
|
|
|
allow(Note).to receive(:find).with(note.id).and_return(note)
|
|
|
|
end
|
|
|
|
|
|
|
|
shared_examples 'an email for a note on a diff discussion' do |model|
|
|
|
|
let(:note) { create(model, author: note_author) }
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
context 'when note is on image' do
|
|
|
|
before do
|
|
|
|
allow_any_instance_of(DiffDiscussion).to receive(:on_image?).and_return(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not include diffs with character-level highlighting' do
|
|
|
|
is_expected.not_to have_body_text '<span class="p">}</span></span>'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'ends the intro with a dot' do
|
|
|
|
is_expected.to have_body_text "#{note.diff_file.file_path}</a>."
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'ends the intro with a colon' do
|
|
|
|
is_expected.to have_body_text "#{note.diff_file.file_path}</a>:"
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'includes diffs with character-level highlighting' do
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text '<span class="p">}</span></span>'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'contains a link to the diff file' do
|
|
|
|
is_expected.to have_body_text note.diff_file.file_path
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'it should have Gmail Actions links'
|
|
|
|
|
|
|
|
it 'is sent to the given recipient as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
|
|
|
|
aggregate_failures do
|
|
|
|
expect(sender.display_name).to eq(note_author.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
expect(subject).to deliver_to(recipient.notification_email)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'contains the message from the note' do
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text note.note
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'contains an introduction' do
|
|
|
|
is_expected.to have_body_text 'started a new discussion on'
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when a comment on an existing discussion' do
|
|
|
|
let!(:second_note) { create(model, author: note_author, noteable: nil, in_reply_to: note) }
|
|
|
|
|
|
|
|
it 'contains an introduction' do
|
|
|
|
is_expected.to have_body_text 'commented on a discussion on'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'on a commit' do
|
|
|
|
let(:commit) { project.commit }
|
|
|
|
let(:note) { create(:diff_note_on_commit) }
|
|
|
|
|
|
|
|
subject { described_class.note_commit_email(recipient.id, note.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'an email for a note on a diff discussion', :diff_note_on_commit
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Commit link'
|
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'on a merge request' do
|
|
|
|
let(:note) { create(:diff_note_on_merge_request) }
|
|
|
|
|
|
|
|
subject { described_class.note_merge_request_email(recipient.id, note.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'an email for a note on a diff discussion', :diff_note_on_merge_request
|
|
|
|
it_behaves_like 'it should show Gmail Actions View Merge request link'
|
|
|
|
it_behaves_like 'an unsubscribeable thread'
|
|
|
|
end
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
context 'for a group' do
|
2017-09-10 17:25:29 +05:30
|
|
|
set(:group) { create(:group) }
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
describe 'group access requested' do
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:group) { create(:group, :public, :access_requestable) }
|
2016-06-16 23:09:34 +05:30
|
|
|
let(:group_member) do
|
|
|
|
group.request_access(user)
|
2016-08-24 12:49:21 +05:30
|
|
|
group.requesters.find_by(user_id: user.id)
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2018-03-27 19:54:05 +05:30
|
|
|
subject { described_class.member_access_requested_email('group', group_member.id, recipient.notification_email) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
it 'contains all the useful information' do
|
2018-03-27 19:54:05 +05:30
|
|
|
to_emails = subject.header[:to].addrs.map(&:address)
|
|
|
|
expect(to_emails).to eq([recipient.notification_email])
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
is_expected.to have_subject "Request to join the #{group.name} group"
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text group.name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text group_group_members_url(group)
|
|
|
|
is_expected.to have_body_text group_member.human_access
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
describe 'group access denied' do
|
|
|
|
let(:group_member) do
|
|
|
|
group.request_access(user)
|
2016-08-24 12:49:21 +05:30
|
|
|
group.requesters.find_by(user_id: user.id)
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.member_access_denied_email('group', group.id, user.id) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
|
|
|
|
|
|
|
it 'contains all the useful information' do
|
|
|
|
is_expected.to have_subject "Access to the #{group.name} group was denied"
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text group.name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text group.web_url
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
describe 'group access changed' do
|
|
|
|
let(:group_member) { create(:group_member, group: group, user: user) }
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.member_access_granted_email('group', group_member.id) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
|
|
|
|
|
|
|
it 'contains all the useful information' do
|
|
|
|
is_expected.to have_subject "Access to the #{group.name} group was granted"
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text group.name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text group.web_url
|
|
|
|
is_expected.to have_body_text group_member.human_access
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
def invite_to_group(group, inviter:)
|
|
|
|
create(
|
|
|
|
:group_member,
|
|
|
|
:developer,
|
|
|
|
group: group,
|
|
|
|
invite_token: '1234',
|
|
|
|
invite_email: 'toto@example.com',
|
|
|
|
user: nil,
|
|
|
|
created_by: inviter
|
2016-09-13 17:45:13 +05:30
|
|
|
)
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe 'group invitation' do
|
|
|
|
let(:owner) { create(:user).tap { |u| group.add_user(u, Gitlab::Access::OWNER) } }
|
2016-11-03 12:29:30 +05:30
|
|
|
let(:group_member) { invite_to_group(group, inviter: owner) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.member_invited_email('group', group_member.id, group_member.invite_token) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
|
|
|
|
|
|
|
it 'contains all the useful information' do
|
|
|
|
is_expected.to have_subject "Invitation to join the #{group.name} group"
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text group.name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text group.web_url
|
|
|
|
is_expected.to have_body_text group_member.human_access
|
|
|
|
is_expected.to have_body_text group_member.invite_token
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'group invitation accepted' do
|
2016-11-03 12:29:30 +05:30
|
|
|
let(:invited_user) { create(:user, name: 'invited user') }
|
2016-06-16 23:09:34 +05:30
|
|
|
let(:owner) { create(:user).tap { |u| group.add_user(u, Gitlab::Access::OWNER) } }
|
|
|
|
let(:group_member) do
|
2016-11-03 12:29:30 +05:30
|
|
|
invitee = invite_to_group(group, inviter: owner)
|
2016-06-16 23:09:34 +05:30
|
|
|
invitee.accept_invite!(invited_user)
|
|
|
|
invitee
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.member_invite_accepted_email('group', group_member.id) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
|
|
|
|
|
|
|
it 'contains all the useful information' do
|
|
|
|
is_expected.to have_subject 'Invitation accepted'
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text group.name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text group.web_url
|
|
|
|
is_expected.to have_body_text group_member.invite_email
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text invited_user.name
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'group invitation declined' do
|
|
|
|
let(:owner) { create(:user).tap { |u| group.add_user(u, Gitlab::Access::OWNER) } }
|
|
|
|
let(:group_member) do
|
2016-11-03 12:29:30 +05:30
|
|
|
invitee = invite_to_group(group, inviter: owner)
|
2016-06-16 23:09:34 +05:30
|
|
|
invitee.decline_invite!
|
|
|
|
invitee
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.member_invite_declined_email('group', group.id, group_member.invite_email, owner.id) }
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
|
|
|
|
|
|
|
it 'contains all the useful information' do
|
|
|
|
is_expected.to have_subject 'Invitation declined'
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text group.name
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_body_text group.web_url
|
|
|
|
is_expected.to have_body_text group_member.invite_email
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'confirmation if email changed' do
|
|
|
|
let(:example_site_path) { root_path }
|
|
|
|
let(:user) { create(:user, email: 'old-email@mail.com') }
|
|
|
|
|
|
|
|
before do
|
2016-11-03 12:29:30 +05:30
|
|
|
stub_config_setting(email_subject_suffix: 'A Nice Suffix')
|
2015-12-23 02:04:40 +05:30
|
|
|
perform_enqueued_jobs do
|
|
|
|
user.email = "new-email@mail.com"
|
|
|
|
user.save
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
subject { ActionMailer::Base.deliveries.last }
|
|
|
|
|
|
|
|
it_behaves_like 'an email sent from GitLab'
|
2016-01-19 16:12:03 +05:30
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
it 'is sent to the new user' do
|
2015-04-26 12:48:37 +05:30
|
|
|
is_expected.to deliver_to 'new-email@mail.com'
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_subject('Confirmation instructions | A Nice Suffix')
|
|
|
|
is_expected.to have_body_text(example_site_path)
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'email on push for a created branch' do
|
|
|
|
let(:example_site_path) { root_path }
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:tree_path) { project_tree_path(project, "empty-branch") }
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/empty-branch', action: :create) }
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
2016-09-29 09:46:39 +05:30
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
2016-01-29 22:53:50 +05:30
|
|
|
it_behaves_like 'an email with X-GitLab headers containing project details'
|
|
|
|
it_behaves_like 'an email that contains a header with author username'
|
2015-12-23 02:04:40 +05:30
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_subject("[Git][#{project.full_path}] Pushed new branch empty-branch")
|
|
|
|
is_expected.to have_body_text(tree_path)
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'email on push for a created tag' do
|
|
|
|
let(:example_site_path) { root_path }
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:tree_path) { project_tree_path(project, "v1.0") }
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/tags/v1.0', action: :create) }
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
2016-01-19 16:12:03 +05:30
|
|
|
it_behaves_like "a user cannot unsubscribe through footer link"
|
2016-01-29 22:53:50 +05:30
|
|
|
it_behaves_like 'an email with X-GitLab headers containing project details'
|
|
|
|
it_behaves_like 'an email that contains a header with author username'
|
2015-12-23 02:04:40 +05:30
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_subject("[Git][#{project.full_path}] Pushed new tag v1.0")
|
|
|
|
is_expected.to have_body_text(tree_path)
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'email on push for a deleted branch' do
|
|
|
|
let(:example_site_path) { root_path }
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :delete) }
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
2016-09-29 09:46:39 +05:30
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
2016-01-29 22:53:50 +05:30
|
|
|
it_behaves_like 'an email with X-GitLab headers containing project details'
|
|
|
|
it_behaves_like 'an email that contains a header with author username'
|
2015-12-23 02:04:40 +05:30
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has the correct subject' do
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_subject "[Git][#{project.full_path}] Deleted branch master"
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'email on push for a deleted tag' do
|
|
|
|
let(:example_site_path) { root_path }
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/tags/v1.0', action: :delete) }
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
2016-09-29 09:46:39 +05:30
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
2016-01-29 22:53:50 +05:30
|
|
|
it_behaves_like 'an email with X-GitLab headers containing project details'
|
|
|
|
it_behaves_like 'an email that contains a header with author username'
|
2015-12-23 02:04:40 +05:30
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
|
|
|
expect(sender.display_name).to eq(user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has the correct subject' do
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.to have_subject "[Git][#{project.full_path}] Deleted tag v1.0"
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'email on push with multiple commits' do
|
|
|
|
let(:example_site_path) { root_path }
|
2016-09-13 17:45:13 +05:30
|
|
|
let(:raw_compare) { Gitlab::Git::Compare.new(project.repository.raw_repository, sample_image_commit.id, sample_commit.id) }
|
|
|
|
let(:compare) { Compare.decorate(raw_compare, project) }
|
|
|
|
let(:commits) { compare.commits }
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:diff_path) { project_compare_path(project, from: Commit.new(compare.base, project), to: Commit.new(compare.head, project)) }
|
2015-04-26 12:48:37 +05:30
|
|
|
let(:send_from_committer_email) { false }
|
2016-08-24 12:49:21 +05:30
|
|
|
let(:diff_refs) { Gitlab::Diff::DiffRefs.new(base_sha: project.merge_base_commit(sample_image_commit.id, sample_commit.id).id, head_sha: sample_commit.id) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare, reverse_compare: false, diff_refs: diff_refs, send_from_committer_email: send_from_committer_email) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should not have Gmail Actions links'
|
2016-09-29 09:46:39 +05:30
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
2016-01-29 22:53:50 +05:30
|
|
|
it_behaves_like 'an email with X-GitLab headers containing project details'
|
|
|
|
it_behaves_like 'an email that contains a header with author username'
|
2015-12-23 02:04:40 +05:30
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
2015-04-26 12:48:37 +05:30
|
|
|
expect(sender.display_name).to eq(user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_subject("[Git][#{project.full_path}][master] #{commits.length} commits: Ruby files modified")
|
|
|
|
is_expected.to have_body_text('Change some files')
|
|
|
|
is_expected.to have_body_text('def</span> <span class="nf">archive_formats_regex')
|
|
|
|
is_expected.to have_body_text(diff_path)
|
|
|
|
is_expected.not_to have_body_text('you are a member of')
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
context "when set to send from committer email if domain matches" do
|
|
|
|
let(:send_from_committer_email) { true }
|
|
|
|
|
|
|
|
before do
|
|
|
|
allow(Gitlab.config.gitlab).to receive(:host).and_return("gitlab.corp.company.com")
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when the committer email domain is within the GitLab domain" do
|
|
|
|
before do
|
|
|
|
user.update_attribute(:email, "user@company.com")
|
2015-09-25 12:07:36 +05:30
|
|
|
user.confirm
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it "is sent from the committer email" do
|
2017-08-17 22:00:37 +05:30
|
|
|
from = subject.header[:from].addrs.first
|
|
|
|
reply = subject.header[:reply_to].addrs.first
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
aggregate_failures do
|
|
|
|
expect(from.address).to eq(user.email)
|
|
|
|
expect(reply.address).to eq(user.email)
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when the committer email domain is not completely within the GitLab domain" do
|
|
|
|
before do
|
|
|
|
user.update_attribute(:email, "user@something.company.com")
|
2015-09-25 12:07:36 +05:30
|
|
|
user.confirm
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it "is sent from the default email" do
|
2017-08-17 22:00:37 +05:30
|
|
|
from = subject.header[:from].addrs.first
|
|
|
|
reply = subject.header[:reply_to].addrs.first
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
aggregate_failures do
|
|
|
|
expect(from.address).to eq(gitlab_sender)
|
|
|
|
expect(reply.address).to eq(gitlab_sender_reply_to)
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when the committer email domain is outside the GitLab domain" do
|
|
|
|
before do
|
|
|
|
user.update_attribute(:email, "user@mpany.com")
|
2015-09-25 12:07:36 +05:30
|
|
|
user.confirm
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it "is sent from the default email" do
|
2017-08-17 22:00:37 +05:30
|
|
|
from = subject.header[:from].addrs.first
|
|
|
|
reply = subject.header[:reply_to].addrs.first
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
aggregate_failures do
|
|
|
|
expect(from.address).to eq(gitlab_sender)
|
|
|
|
expect(reply.address).to eq(gitlab_sender_reply_to)
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'email on push with a single commit' do
|
|
|
|
let(:example_site_path) { root_path }
|
2016-09-13 17:45:13 +05:30
|
|
|
let(:raw_compare) { Gitlab::Git::Compare.new(project.repository.raw_repository, sample_commit.parent_id, sample_commit.id) }
|
|
|
|
let(:compare) { Compare.decorate(raw_compare, project) }
|
|
|
|
let(:commits) { compare.commits }
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:diff_path) { project_commit_path(project, commits.first) }
|
2016-08-24 12:49:21 +05:30
|
|
|
let(:diff_refs) { Gitlab::Diff::DiffRefs.new(base_sha: project.merge_base_commit(sample_image_commit.id, sample_commit.id).id, head_sha: sample_commit.id) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare, diff_refs: diff_refs) }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2015-12-23 02:04:40 +05:30
|
|
|
it_behaves_like 'it should show Gmail Actions View Commit link'
|
2016-09-29 09:46:39 +05:30
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
2016-01-29 22:53:50 +05:30
|
|
|
it_behaves_like 'an email with X-GitLab headers containing project details'
|
|
|
|
it_behaves_like 'an email that contains a header with author username'
|
2015-12-23 02:04:40 +05:30
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
it 'is sent as the author' do
|
|
|
|
sender = subject.header[:from].addrs[0]
|
2015-04-26 12:48:37 +05:30
|
|
|
expect(sender.display_name).to eq(user.name)
|
|
|
|
expect(sender.address).to eq(gitlab_sender)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'has the correct subject and body' do
|
|
|
|
aggregate_failures do
|
|
|
|
is_expected.to have_subject("[Git][#{project.full_path}][master] #{commits.first.title}")
|
|
|
|
is_expected.to have_body_text('Change some files')
|
|
|
|
is_expected.to have_body_text('def</span> <span class="nf">archive_formats_regex')
|
|
|
|
is_expected.to have_body_text(diff_path)
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe 'HTML emails setting' do
|
|
|
|
let(:multipart_mail) { described_class.project_was_moved_email(project.id, user.id, "gitlab/gitlab") }
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
context 'when disabled' do
|
|
|
|
it 'only sends the text template' do
|
|
|
|
stub_application_setting(html_emails_enabled: false)
|
|
|
|
|
2018-11-18 11:00:15 +05:30
|
|
|
Gitlab::Email::Hook::EmailTemplateInterceptor
|
|
|
|
.delivering_email(multipart_mail)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
expect(multipart_mail).to have_part_with('text/plain')
|
|
|
|
expect(multipart_mail).not_to have_part_with('text/html')
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
context 'when enabled' do
|
|
|
|
it 'sends a multipart message' do
|
|
|
|
stub_application_setting(html_emails_enabled: true)
|
|
|
|
|
2018-11-18 11:00:15 +05:30
|
|
|
Gitlab::Email::Hook::EmailTemplateInterceptor
|
|
|
|
.delivering_email(multipart_mail)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
expect(multipart_mail).to have_part_with('text/plain')
|
|
|
|
expect(multipart_mail).to have_part_with('text/html')
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
matcher :have_part_with do |expected|
|
|
|
|
match do |actual|
|
2018-03-17 18:26:18 +05:30
|
|
|
actual.body.parts.any? { |part| part.content_type.try(:match, /#{expected}/) }
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
|
|
|
context 'for personal snippet notes' do
|
|
|
|
let(:personal_snippet) { create(:personal_snippet) }
|
|
|
|
let(:personal_snippet_note) { create(:note_on_personal_snippet, noteable: personal_snippet) }
|
|
|
|
|
|
|
|
subject { described_class.note_personal_snippet_email(personal_snippet_note.author_id, personal_snippet_note.id) }
|
|
|
|
|
|
|
|
it_behaves_like 'a user cannot unsubscribe through footer link'
|
|
|
|
|
|
|
|
it 'has the correct subject and body' do
|
|
|
|
is_expected.to have_referable_subject(personal_snippet, reply: true)
|
2018-11-08 19:23:39 +05:30
|
|
|
is_expected.to have_body_text personal_snippet_note.note
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|