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/notify_spec.rb | |
| parent | 735731a565e593fa8df445b3bb2ac2f768fb1fae (diff) | |
| parent | 4be63f5b5bd9c0859f5ba2b91ecdbdcc57b69b98 (diff) | |
| download | gitlab-ce-88857a2c3b0b841c7db8cc5a9dfd0d40b5665cef.tar.gz | |
Merge branch 'master' into revert-c676283b
Diffstat (limited to 'spec/mailers/notify_spec.rb')
| -rw-r--r-- | spec/mailers/notify_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index cd8578b6f49..0e4130e8a3a 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -831,6 +831,7 @@ describe Notify do let(:user) { create(:user, email: 'old-email@mail.com') } before do + stub_config_setting(email_subject_suffix: 'A Nice Suffix') perform_enqueued_jobs do user.email = "new-email@mail.com" user.save @@ -847,7 +848,7 @@ describe Notify do end it 'has the correct subject' do - is_expected.to have_subject "Confirmation instructions" + is_expected.to have_subject /^Confirmation instructions/ end it 'includes a link to the site' do |