diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /spec/services/emails | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'spec/services/emails')
-rw-r--r-- | spec/services/emails/create_service_spec.rb | 5 | ||||
-rw-r--r-- | spec/services/emails/destroy_service_spec.rb | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/spec/services/emails/create_service_spec.rb b/spec/services/emails/create_service_spec.rb index 1396a1fce30..2fabf4ae66a 100644 --- a/spec/services/emails/create_service_spec.rb +++ b/spec/services/emails/create_service_spec.rb @@ -3,7 +3,8 @@ require 'spec_helper' RSpec.describe Emails::CreateService do - let(:user) { create(:user) } + let_it_be(:user) { create(:user) } + let(:opts) { { email: 'new@email.com', user: user } } subject(:service) { described_class.new(user, opts) } @@ -22,7 +23,7 @@ RSpec.describe Emails::CreateService do it 'has the right user association' do service.execute - expect(user.emails).to eq(Email.where(opts)) + expect(user.emails).to include(Email.find_by(opts)) end end end diff --git a/spec/services/emails/destroy_service_spec.rb b/spec/services/emails/destroy_service_spec.rb index f8407be41e7..7dcf367016e 100644 --- a/spec/services/emails/destroy_service_spec.rb +++ b/spec/services/emails/destroy_service_spec.rb @@ -15,5 +15,15 @@ RSpec.describe Emails::DestroyService do expect(user.emails).not_to include(email) expect(response).to be true end + + context 'when it corresponds to the user primary email' do + let(:email) { user.emails.find_by!(email: user.email) } + + it 'does not remove the email and raises an exception' do + expect { service.execute(email) }.to raise_error(StandardError, 'Cannot delete primary email') + + expect(user.emails).to include(email) + end + end end end |