diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-04 08:17:05 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-04 08:17:05 +0100 |
commit | 88857a2c3b0b841c7db8cc5a9dfd0d40b5665cef (patch) | |
tree | f596412ba7e75c9ce6baccbbfd7795ed3a725097 /spec/mailers/shared/notify.rb | |
parent | 735731a565e593fa8df445b3bb2ac2f768fb1fae (diff) | |
parent | 4be63f5b5bd9c0859f5ba2b91ecdbdcc57b69b98 (diff) | |
download | gitlab-ce-88857a2c3b0b841c7db8cc5a9dfd0d40b5665cef.tar.gz |
Merge branch 'master' into revert-c676283b
Diffstat (limited to 'spec/mailers/shared/notify.rb')
-rw-r--r-- | spec/mailers/shared/notify.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/mailers/shared/notify.rb b/spec/mailers/shared/notify.rb index 5c9851f14c7..3956d05060b 100644 --- a/spec/mailers/shared/notify.rb +++ b/spec/mailers/shared/notify.rb @@ -37,6 +37,16 @@ shared_examples 'an email sent from GitLab' do reply_to = subject.header[:reply_to].addresses expect(reply_to).to eq([gitlab_sender_reply_to]) end + + context 'when custom suffix for email subject is set' do + before do + stub_config_setting(email_subject_suffix: 'A Nice Suffix') + end + + it 'ends the subject with the suffix' do + is_expected.to have_subject /\ \| A Nice Suffix$/ + end + end end shared_examples 'an email that contains a header with author username' do |