diff options
author | Rémy Coutable <remy@rymai.me> | 2016-03-10 17:15:14 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-15 11:23:57 +0100 |
commit | 76350e2ede187a8bd15e343c30537c90ee557aa7 (patch) | |
tree | 6b5081eda7f9c9c2e7b18e86ae1631dd3b5c7f2c /spec | |
parent | 9403142083bf0ace81fc3059f2d6c5a494e48cbf (diff) | |
download | gitlab-ce-76350e2ede187a8bd15e343c30537c90ee557aa7.tar.gz |
Ensure "new SSH key" email do not ends up as dead Sidekiq jobsfix/ensure-no-new_ssh_key_email-dead-jobs
Related to #2235.
This is done by:
1. Delaying the notification sending after the SSH key is commited in DB
2. Gracefully exit the mailer method if the record cannot be found
Diffstat (limited to 'spec')
-rw-r--r-- | spec/mailers/emails/profile_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/mailers/emails/profile_spec.rb b/spec/mailers/emails/profile_spec.rb index 5b575da34f3..c6758ccad39 100644 --- a/spec/mailers/emails/profile_spec.rb +++ b/spec/mailers/emails/profile_spec.rb @@ -11,7 +11,7 @@ describe Notify do let(:example_site_path) { root_path } let(:new_user) { create(:user, email: new_user_address, created_by_id: 1) } let(:token) { 'kETLwRaayvigPq_x3SNM' } - + subject { Notify.new_user_email(new_user.id, token) } it_behaves_like 'an email sent from GitLab' @@ -77,6 +77,10 @@ describe Notify do it 'includes a link to ssh keys page' do is_expected.to have_body_text /#{profile_keys_path}/ end + + context 'with SSH key that does not exist' do + it { expect { Notify.new_ssh_key_email('foo') }.not_to raise_error } + end end describe 'user added email' do |