Miscellaneous cleanup of Notify shared examples
This commit is contained in:
parent
6fb81afe98
commit
fe390a8b8c
|
@ -27,15 +27,15 @@ shared_examples 'a multiple recipients email' do
|
|||
end
|
||||
|
||||
shared_examples 'an email sent from GitLab' do
|
||||
it 'is sent from GitLab' do
|
||||
it 'has the characteristics of an email sent from GitLab' do
|
||||
sender = subject.header[:from].addrs[0]
|
||||
expect(sender.display_name).to eq(gitlab_sender_display_name)
|
||||
expect(sender.address).to eq(gitlab_sender)
|
||||
end
|
||||
|
||||
it 'has a Reply-To address' do
|
||||
reply_to = subject.header[:reply_to].addresses
|
||||
expect(reply_to).to eq([gitlab_sender_reply_to])
|
||||
|
||||
aggregate_failures do
|
||||
expect(sender.display_name).to eq(gitlab_sender_display_name)
|
||||
expect(sender.address).to eq(gitlab_sender)
|
||||
expect(reply_to).to eq([gitlab_sender_reply_to])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -46,43 +46,40 @@ shared_examples 'an email that contains a header with author username' do
|
|||
end
|
||||
|
||||
shared_examples 'an email with X-GitLab headers containing project details' do
|
||||
it 'has X-GitLab-Project* headers' do
|
||||
is_expected.to have_header 'X-GitLab-Project', /#{project.name}/
|
||||
is_expected.to have_header 'X-GitLab-Project-Id', /#{project.id}/
|
||||
is_expected.to have_header 'X-GitLab-Project-Path', /#{project.path_with_namespace}/
|
||||
it 'has X-GitLab-Project headers' do
|
||||
aggregate_failures do
|
||||
is_expected.to have_header('X-GitLab-Project', /#{project.name}/)
|
||||
is_expected.to have_header('X-GitLab-Project-Id', /#{project.id}/)
|
||||
is_expected.to have_header('X-GitLab-Project-Path', /#{project.path_with_namespace}/)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples 'a new thread email with reply-by-email enabled' do
|
||||
let(:regex) { /\A<reply\-(.*)@#{Gitlab.config.gitlab.host}>\Z/ }
|
||||
it 'has the characteristics of a threaded email' do
|
||||
host = Gitlab.config.gitlab.host
|
||||
route_key = "#{model.class.model_name.singular_route_key}_#{model.id}"
|
||||
|
||||
it 'has a Message-ID header' do
|
||||
is_expected.to have_header 'Message-ID', "<#{model.class.model_name.singular_route_key}_#{model.id}@#{Gitlab.config.gitlab.host}>"
|
||||
end
|
||||
|
||||
it 'has a References header' do
|
||||
is_expected.to have_header 'References', regex
|
||||
aggregate_failures do
|
||||
is_expected.to have_header('Message-ID', "<#{route_key}@#{host}>")
|
||||
is_expected.to have_header('References', /\A<reply\-.*@#{host}>\Z/ )
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples 'a thread answer email with reply-by-email enabled' do
|
||||
include_examples 'an email with X-GitLab headers containing project details'
|
||||
let(:regex) { /\A<#{model.class.model_name.singular_route_key}_#{model.id}@#{Gitlab.config.gitlab.host}> <reply\-(.*)@#{Gitlab.config.gitlab.host}>\Z/ }
|
||||
|
||||
it 'has a Message-ID header' do
|
||||
is_expected.to have_header 'Message-ID', /\A<(.*)@#{Gitlab.config.gitlab.host}>\Z/
|
||||
end
|
||||
it 'has the characteristics of a threaded reply' do
|
||||
host = Gitlab.config.gitlab.host
|
||||
route_key = "#{model.class.model_name.singular_route_key}_#{model.id}"
|
||||
|
||||
it 'has a In-Reply-To header' do
|
||||
is_expected.to have_header 'In-Reply-To', "<#{model.class.model_name.singular_route_key}_#{model.id}@#{Gitlab.config.gitlab.host}>"
|
||||
end
|
||||
|
||||
it 'has a References header' do
|
||||
is_expected.to have_header 'References', regex
|
||||
end
|
||||
|
||||
it 'has a subject that begins with Re: ' do
|
||||
is_expected.to have_subject /^Re: /
|
||||
aggregate_failures do
|
||||
is_expected.to have_header('Message-ID', /\A<.*@#{host}>\Z/)
|
||||
is_expected.to have_header('In-Reply-To', "<#{route_key}@#{host}>")
|
||||
is_expected.to have_header('References', /\A<#{route_key}@#{host}> <reply\-.*@#{host}>\Z/ )
|
||||
is_expected.to have_subject(/^Re: /)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -127,65 +124,76 @@ shared_examples 'an answer to an existing thread with reply-by-email enabled' do
|
|||
end
|
||||
|
||||
shared_examples 'it should have Gmail Actions links' do
|
||||
it { is_expected.to have_body_text '<script type="application/ld+json">' }
|
||||
it { is_expected.to have_body_text /ViewAction/ }
|
||||
it do
|
||||
aggregate_failures do
|
||||
is_expected.to have_body_text('<script type="application/ld+json">')
|
||||
is_expected.to have_body_text('ViewAction')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples 'it should not have Gmail Actions links' do
|
||||
it { is_expected.not_to have_body_text '<script type="application/ld+json">' }
|
||||
it { is_expected.not_to have_body_text /ViewAction/ }
|
||||
it do
|
||||
aggregate_failures do
|
||||
is_expected.not_to have_body_text('<script type="application/ld+json">')
|
||||
is_expected.not_to have_body_text('ViewAction')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples 'it should show Gmail Actions View Issue link' do
|
||||
it_behaves_like 'it should have Gmail Actions links'
|
||||
|
||||
it { is_expected.to have_body_text /View Issue/ }
|
||||
it { is_expected.to have_body_text('View Issue') }
|
||||
end
|
||||
|
||||
shared_examples 'it should show Gmail Actions View Merge request link' do
|
||||
it_behaves_like 'it should have Gmail Actions links'
|
||||
|
||||
it { is_expected.to have_body_text /View Merge request/ }
|
||||
it { is_expected.to have_body_text('View Merge request') }
|
||||
end
|
||||
|
||||
shared_examples 'it should show Gmail Actions View Commit link' do
|
||||
it_behaves_like 'it should have Gmail Actions links'
|
||||
|
||||
it { is_expected.to have_body_text /View Commit/ }
|
||||
it { is_expected.to have_body_text('View Commit') }
|
||||
end
|
||||
|
||||
shared_examples 'an unsubscribeable thread' do
|
||||
it_behaves_like 'an unsubscribeable thread with incoming address without %{key}'
|
||||
|
||||
it 'has a List-Unsubscribe header in the correct format' do
|
||||
is_expected.to have_header 'List-Unsubscribe', /unsubscribe/
|
||||
is_expected.to have_header 'List-Unsubscribe', /mailto/
|
||||
is_expected.to have_header 'List-Unsubscribe', /^<.+,.+>$/
|
||||
it 'has a List-Unsubscribe header in the correct format, and a body link' do
|
||||
aggregate_failures do
|
||||
is_expected.to have_header('List-Unsubscribe', /unsubscribe/)
|
||||
is_expected.to have_header('List-Unsubscribe', /mailto/)
|
||||
is_expected.to have_header('List-Unsubscribe', /^<.+,.+>$/)
|
||||
is_expected.to have_body_text('unsubscribe')
|
||||
end
|
||||
end
|
||||
|
||||
it { is_expected.to have_body_text /unsubscribe/ }
|
||||
end
|
||||
|
||||
shared_examples 'an unsubscribeable thread with incoming address without %{key}' do
|
||||
include_context 'reply-by-email is enabled with incoming address without %{key}'
|
||||
|
||||
it 'has a List-Unsubscribe header in the correct format' do
|
||||
is_expected.to have_header 'List-Unsubscribe', /unsubscribe/
|
||||
is_expected.not_to have_header 'List-Unsubscribe', /mailto/
|
||||
is_expected.to have_header 'List-Unsubscribe', /^<[^,]+>$/
|
||||
it 'has a List-Unsubscribe header in the correct format, and a body link' do
|
||||
aggregate_failures do
|
||||
is_expected.to have_header('List-Unsubscribe', /unsubscribe/)
|
||||
is_expected.not_to have_header('List-Unsubscribe', /mailto/)
|
||||
is_expected.to have_header('List-Unsubscribe', /^<[^,]+>$/)
|
||||
is_expected.to have_body_text('unsubscribe')
|
||||
end
|
||||
end
|
||||
|
||||
it { is_expected.to have_body_text /unsubscribe/ }
|
||||
end
|
||||
|
||||
shared_examples 'a user cannot unsubscribe through footer link' do
|
||||
it 'does not have a List-Unsubscribe header' do
|
||||
is_expected.not_to have_header 'List-Unsubscribe', /unsubscribe/
|
||||
it 'does not have a List-Unsubscribe header or a body link' do
|
||||
aggregate_failures do
|
||||
is_expected.not_to have_header('List-Unsubscribe', /unsubscribe/)
|
||||
is_expected.not_to have_body_text('unsubscribe')
|
||||
end
|
||||
end
|
||||
|
||||
it { is_expected.not_to have_body_text /unsubscribe/ }
|
||||
end
|
||||
|
||||
shared_examples 'an email with a labels subscriptions link in its footer' do
|
||||
it { is_expected.to have_body_text /label subscriptions/ }
|
||||
it { is_expected.to have_body_text('label subscriptions') }
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue