diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-03 15:18:35 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-03 15:18:35 +0300 |
commit | c3d02481519a29927e63d55b417b3e5ef71f1bd1 (patch) | |
tree | ceaba1dbfe3135c01b78c0b5e2efecf50a0d94bf /spec | |
parent | 6f2fc50f0db94ac0cc26ca444e5ddf71c0392989 (diff) | |
parent | c0c9e5dd6f2ff98240e6e4c3deba9cd2b1112b4d (diff) |
Merge branch '49899-merge-request-e-mail-link-has-full-url' into 'master'
Resolve "Merge request e-mail link has full URL"
Closes #49899
See merge request gitlab-org/gitlab-ce!21000
Diffstat (limited to 'spec')
-rw-r--r-- | spec/support/shared_examples/notify_shared_examples.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/support/shared_examples/notify_shared_examples.rb b/spec/support/shared_examples/notify_shared_examples.rb index 5beae005cf7..5fb9ced3b63 100644 --- a/spec/support/shared_examples/notify_shared_examples.rb +++ b/spec/support/shared_examples/notify_shared_examples.rb @@ -87,6 +87,10 @@ shared_examples 'an email starting a new thread with reply-by-email enabled' do include_examples 'an email with X-GitLab headers containing project details' include_examples 'a new thread email with reply-by-email enabled' + it 'includes "Reply to this email directly or <View it on GitLab>"' do + expect(subject.default_part.body).to include(%(Reply to this email directly or <a href="#{Gitlab::UrlBuilder.build(model)}">view it on GitLab</a>.)) + end + context 'when reply-by-email is enabled with incoming address with %{key}' do it 'has a Reply-To header' do is_expected.to have_header 'Reply-To', /<reply+(.*)@#{Gitlab.config.gitlab.host}>\Z/ |