Skip to content

G
gitlab-ce
Commit a6e43aa2 authored by Robert Speicher's avatar Robert Speicher
Browse files
Options

Combine redundant `it` blocks in Notify spec 

We perform a bunch of setup for most of these cases, and it didn't make
sense to do an entirely new costly setup just to test a different string
in the same body of the email we just generated in the last test.
parent fe390a8b
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 231 deletions
spec/mailers/notify_spec.rb
View file @ a6e43aa2
......@@ -24,14 +24,14 @@ describe Notify do
let(:previous_assignee) { create(:user, name: 'Previous Assignee') }
shared_examples 'an assignee email' do
it 'is sent as the author' do
sender = subject.header[:from].addrs[0]
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
it 'is sent to the assignee' do
is_expected.to deliver_to assignee.email
end
end
......@@ -49,12 +49,11 @@ describe Notify do
it_behaves_like 'it should show Gmail Actions View Issue link'
it_behaves_like 'an unsubscribeable thread'
it 'has the correct subject' do
it 'has the correct subject and body' do
aggregate_failures do
is_expected.to have_referable_subject(issue)
is_expected.to have_body_text(namespace_project_issue_path(project.namespace, project, issue))
end
it 'contains a link to the new issue' do
is_expected.to have_body_text namespace_project_issue_path(project.namespace, project, issue)
end
context 'when enabled email_author_in_body' do
......@@ -63,7 +62,7 @@ describe Notify do
end
it 'contains a link to note author' do
is_expected.to have_html_escaped_body_text issue.author_name
is_expected.to have_html_escaped_body_text(issue.author_name)
is_expected.to have_body_text 'wrote:'
end
end
......@@ -95,20 +94,13 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
it 'has the correct subject and body' do
aggregate_failures do
is_expected.to have_referable_subject(issue, reply: true)
is_expected.to have_html_escaped_body_text(previous_assignee.name)
is_expected.to have_html_escaped_body_text(assignee.name)
is_expected.to have_body_text(namespace_project_issue_path(project.namespace, project, issue))
end
it 'contains the name of the previous assignee' do
is_expected.to have_html_escaped_body_text previous_assignee.name
end
it 'contains the name of the new assignee' do
is_expected.to have_html_escaped_body_text assignee.name
end
it 'contains a link to the issue' do
is_expected.to have_body_text namespace_project_issue_path(project.namespace, project, issue)
end
end
......@@ -129,16 +121,12 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
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(namespace_project_issue_path(project.namespace, project, issue))
end
it 'contains the names of the added labels' do
is_expected.to have_body_text 'foo, bar, and baz'
end
it 'contains a link to the issue' do
is_expected.to have_body_text namespace_project_issue_path(project.namespace, project, issue)
end
end
......@@ -158,22 +146,15 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
it 'has the correct subject and body' do
aggregate_failures do
is_expected.to have_referable_subject(issue, reply: true)
end
it 'contains the new status' do
is_expected.to have_body_text status
end
it 'contains the user name' do
is_expected.to have_html_escaped_body_text current_user.name
end
it 'contains a link to the issue' do
is_expected.to have_body_text(status)
is_expected.to have_html_escaped_body_text(current_user.name)
is_expected.to have_body_text(namespace_project_issue_path project.namespace, project, issue)
end
end
end
describe 'moved to another project' do
let(:new_issue) { create(:issue) }
......@@ -189,18 +170,15 @@ describe Notify do
is_expected.to have_body_text 'Issue was moved to another project'
end
it 'has the correct subject' do
is_expected.to have_referable_subject(issue, reply: true)
end
it 'contains link to new issue' do
it 'has the correct subject and body' do
new_issue_url = namespace_project_issue_path(new_issue.project.namespace,
new_issue.project, new_issue)
is_expected.to have_body_text new_issue_url
end
it 'contains a link to the original issue' do
is_expected.to have_body_text namespace_project_issue_path(project.namespace, project, issue)
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(namespace_project_issue_path(project.namespace, project, issue))
end
end
end
end
......@@ -220,20 +198,13 @@ describe Notify do
it_behaves_like 'it should show Gmail Actions View Merge request link'
it_behaves_like 'an unsubscribeable thread'
it 'has the correct subject' do
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(namespace_project_merge_request_path(project.namespace, project, merge_request))
is_expected.to have_body_text(merge_request.source_branch)
is_expected.to have_body_text(merge_request.target_branch)
end
it 'contains a link to the new merge request' do
is_expected.to have_body_text namespace_project_merge_request_path(project.namespace, project, merge_request)
end
it 'contains the source branch for the merge request' do
is_expected.to have_body_text merge_request.source_branch
end
it 'contains the target branch for the merge request' do
is_expected.to have_body_text merge_request.target_branch
end
context 'when enabled email_author_in_body' do
......@@ -275,20 +246,13 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
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_html_escaped_body_text(previous_assignee.name)
is_expected.to have_body_text(namespace_project_merge_request_path(project.namespace, project, merge_request))
is_expected.to have_html_escaped_body_text(assignee.name)
end
it 'contains the name of the previous assignee' do
is_expected.to have_html_escaped_body_text previous_assignee.name
end
it 'contains the name of the new assignee' do
is_expected.to have_html_escaped_body_text assignee.name
end
it 'contains a link to the merge request' do
is_expected.to have_body_text namespace_project_merge_request_path(project.namespace, project, merge_request)
end
end
......@@ -309,16 +273,10 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
it 'has the correct subject and body' do
is_expected.to have_referable_subject(merge_request, reply: true)
end
it 'contains the names of the added labels' do
is_expected.to have_body_text 'foo, bar, and baz'
end
it 'contains a link to the merge request' do
is_expected.to have_body_text namespace_project_merge_request_path(project.namespace, project, merge_request)
is_expected.to have_body_text('foo, bar, and baz')
is_expected.to have_body_text(namespace_project_merge_request_path(project.namespace, project, merge_request))
end
end
......@@ -338,20 +296,13 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
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(status)
is_expected.to have_html_escaped_body_text(current_user.name)
is_expected.to have_body_text(namespace_project_merge_request_path(project.namespace, project, merge_request))
end
it 'contains the new status' do
is_expected.to have_body_text status
end
it 'contains the user name' do
is_expected.to have_html_escaped_body_text current_user.name
end
it 'contains a link to the merge request' do
is_expected.to have_body_text namespace_project_merge_request_path(project.namespace, project, merge_request)
end
end
......@@ -371,16 +322,12 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
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(namespace_project_merge_request_path(project.namespace, project, merge_request))
end
it 'contains the new status' do
is_expected.to have_body_text 'merged'
end
it 'contains a link to the merge request' do
is_expected.to have_body_text namespace_project_merge_request_path(project.namespace, project, merge_request)
end
end
end
......@@ -395,16 +342,10 @@ describe Notify do
it_behaves_like 'it should not have Gmail Actions links'
it_behaves_like "a user cannot unsubscribe through footer link"
it 'has the correct subject' do
is_expected.to have_subject "#{project.name} | Project was moved"
end
it 'contains name of project' do
it 'has the correct subject and body' do
is_expected.to have_subject("#{project.name} | Project was moved")
is_expected.to have_html_escaped_body_text project.name_with_namespace
end
it 'contains new user role' do
is_expected.to have_body_text project.ssh_url_to_repo
is_expected.to have_body_text(project.ssh_url_to_repo)
end
end
......@@ -597,14 +538,14 @@ describe Notify do
shared_examples 'a note email' do
it_behaves_like 'it should have Gmail Actions links'
it 'is sent as the author' do
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
it 'is sent to the given recipient' do
is_expected.to deliver_to recipient.notification_email
end
it 'contains the message from the note' do
......@@ -641,12 +582,11 @@ describe Notify do
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' do
is_expected.to have_subject "Re: #{project.name} | #{commit.title.strip} (#{commit.short_id})"
it 'has the correct subject and body' do
aggregate_failures do
is_expected.to have_subject("Re: #{project.name} | #{commit.title.strip} (#{commit.short_id})")
is_expected.to have_body_text(commit.short_id)
end
it 'contains a link to the commit' do
is_expected.to have_body_text commit.short_id
end
end
......@@ -664,14 +604,13 @@ describe Notify do
it_behaves_like 'it should show Gmail Actions View Merge request link'
it_behaves_like 'an unsubscribeable thread'
it 'has the correct subject' do
it 'has the correct subject and body' do
aggregate_failures do
is_expected.to have_referable_subject(merge_request, reply: true)
end
it 'contains a link to the merge request note' do
is_expected.to have_body_text note_on_merge_request_path
end
end
end
describe 'on an issue' do
let(:issue) { create(:issue, project: project) }
......@@ -687,12 +626,11 @@ describe Notify do
it_behaves_like 'it should show Gmail Actions View Issue link'
it_behaves_like 'an unsubscribeable thread'
it 'has the correct subject' do
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
it 'contains a link to the issue note' do
is_expected.to have_body_text note_on_issue_path
end
end
end
......@@ -717,14 +655,14 @@ describe Notify do
it_behaves_like 'it should have Gmail Actions links'
it 'is sent as the author' do
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
it 'is sent to the given recipient' do
is_expected.to deliver_to recipient.notification_email
end
it 'contains the message from the note' do
......@@ -934,21 +872,20 @@ describe Notify do
is_expected.to deliver_to 'new-email@mail.com'
end
it 'has the correct subject' do
is_expected.to have_subject 'Confirmation instructions | A Nice Suffix'
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
it 'includes a link to the site' do
is_expected.to have_body_text example_site_path
end
end
describe 'email on push for a created branch' do
let(:example_site_path) { root_path }
let(:user) { create(:user) }
let(:tree_path) { namespace_project_tree_path(project.namespace, project, "master") }
let(:tree_path) { namespace_project_tree_path(project.namespace, project, "empty-branch") }
subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :create) }
subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/empty-branch', action: :create) }
it_behaves_like 'it should not have Gmail Actions links'
it_behaves_like 'a user cannot unsubscribe through footer link'
......@@ -961,12 +898,11 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
is_expected.to have_subject "[Git][#{project.full_path}] Pushed new branch master"
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
it 'contains a link to the branch' do
is_expected.to have_body_text tree_path
end
end
......@@ -988,12 +924,11 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
is_expected.to have_subject "[Git][#{project.full_path}] Pushed new tag v1.0"
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
it 'contains a link to the tag' do
is_expected.to have_body_text tree_path
end
end
......@@ -1064,24 +999,14 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
is_expected.to have_subject "[Git][#{project.full_path}][master] #{commits.length} commits: Ruby files modified"
end
it 'includes commits list' do
is_expected.to have_body_text 'Change some files'
end
it 'includes diffs with character-level highlighting' do
is_expected.to have_body_text 'def</span> <span class="nf">archive_formats_regex'
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
it 'contains a link to the diff' do
is_expected.to have_body_text diff_path
end
it 'does not contain the misleading footer' do
is_expected.not_to have_body_text 'you are a member of'
end
context "when set to send from committer email if domain matches" do
......@@ -1098,13 +1023,13 @@ describe Notify do
end
it "is sent from the committer email" do
sender = subject.header[:from].addrs[0]
expect(sender.address).to eq(user.email)
end
from = subject.header[:from].addrs.first
reply = subject.header[:reply_to].addrs.first
it "is set to reply to the committer email" do
sender = subject.header[:reply_to].addrs[0]
expect(sender.address).to eq(user.email)
aggregate_failures do
expect(from.address).to eq(user.email)
expect(reply.address).to eq(user.email)
end
end
end
......@@ -1115,13 +1040,13 @@ describe Notify do
end
it "is sent from the default email" do
sender = subject.header[:from].addrs[0]
expect(sender.address).to eq(gitlab_sender)
end
from = subject.header[:from].addrs.first
reply = subject.header[:reply_to].addrs.first
it "is set to reply to the default email" do
sender = subject.header[:reply_to].addrs[0]
expect(sender.address).to eq(gitlab_sender_reply_to)
aggregate_failures do
expect(from.address).to eq(gitlab_sender)
expect(reply.address).to eq(gitlab_sender_reply_to)
end
end
end
......@@ -1132,13 +1057,13 @@ describe Notify do
end
it "is sent from the default email" do
sender = subject.header[:from].addrs[0]
expect(sender.address).to eq(gitlab_sender)
end
from = subject.header[:from].addrs.first
reply = subject.header[:reply_to].addrs.first
it "is set to reply to the default email" do
sender = subject.header[:reply_to].addrs[0]
expect(sender.address).to eq(gitlab_sender_reply_to)
aggregate_failures do
expect(from.address).to eq(gitlab_sender)
expect(reply.address).to eq(gitlab_sender_reply_to)
end
end
end
end
......@@ -1166,20 +1091,13 @@ describe Notify do
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject' do
is_expected.to have_subject "[Git][#{project.full_path}][master] #{commits.first.title}"
end
it 'includes commits list' do
is_expected.to have_body_text 'Change some files'
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
it 'includes diffs with character-level highlighting' do
is_expected.to have_body_text 'def</span> <span class="nf">archive_formats_regex'
end
it 'contains a link to the diff' do
is_expected.to have_body_text diff_path
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7