diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-08-12 17:23:19 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-08-12 17:23:19 -0500 |
commit | c770201061c5d39e6e297951badfafc8ddf14906 (patch) | |
tree | 72da00c88358d605f33c983945dd7e1565956c47 /spec/mailers | |
parent | 9d9b7212bc5fe04e64a0a034a412f5d92cc96151 (diff) | |
parent | 11eefba891f214eefc1efa334adbcc9e979c0ce3 (diff) | |
download | gitlab-ce-c770201061c5d39e6e297951badfafc8ddf14906.tar.gz |
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'spec/mailers')
-rw-r--r-- | spec/mailers/emails/profile_spec.rb | 2 | ||||
-rw-r--r-- | spec/mailers/notify_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/mailers/emails/profile_spec.rb b/spec/mailers/emails/profile_spec.rb index c6758ccad39..781472d0c00 100644 --- a/spec/mailers/emails/profile_spec.rb +++ b/spec/mailers/emails/profile_spec.rb @@ -48,7 +48,7 @@ describe Notify do it_behaves_like 'it should not have Gmail Actions links' it_behaves_like 'a user cannot unsubscribe through footer link' - it 'should not contain the new user\'s password' do + it 'does not contain the new user\'s password' do is_expected.not_to have_body_text /password/ end end diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index e2866ef160c..fa241867858 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -591,7 +591,7 @@ describe Notify do is_expected.to have_body_text /#{note.note}/ end - it 'not contains note author' do + it 'does not contain note author' do is_expected.not_to have_body_text /wrote\:/ end |