diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 22:57:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 22:57:17 +0300 |
commit | 37e3c3bb33c3d331fceb2840cf3c1d3c466dcfa9 (patch) | |
tree | 9d3739f627b491b42ede6424acd11b589beed25f /spec/migrations | |
parent | b55baf593e63db9be3f446ea0cca0281a69dd2e2 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/migrations')
-rw-r--r-- | spec/migrations/unconfirm_wrongfully_verified_emails_spec.rb | 46 |
1 files changed, 40 insertions, 6 deletions
diff --git a/spec/migrations/unconfirm_wrongfully_verified_emails_spec.rb b/spec/migrations/unconfirm_wrongfully_verified_emails_spec.rb index e93f2cb64de..cae2f331f6f 100644 --- a/spec/migrations/unconfirm_wrongfully_verified_emails_spec.rb +++ b/spec/migrations/unconfirm_wrongfully_verified_emails_spec.rb @@ -9,13 +9,47 @@ RSpec.describe UnconfirmWrongfullyVerifiedEmails do table(:emails).create!(email: 'test2@test.com', user_id: user.id) end - it 'enqueues WrongullyConfirmedEmailUnconfirmer job' do - Sidekiq::Testing.fake! do - migrate! + context 'when email confirmation is enabled' do + before do + table(:application_settings).create!(send_user_confirmation_email: true) + end + + it 'enqueues WrongullyConfirmedEmailUnconfirmer job' do + Sidekiq::Testing.fake! do + migrate! + + jobs = BackgroundMigrationWorker.jobs + expect(jobs.size).to eq(1) + expect(jobs.first["args"].first).to eq(Gitlab::BackgroundMigration::WrongfullyConfirmedEmailUnconfirmer.name.demodulize) + end + end + end + + context 'when email confirmation is disabled' do + before do + table(:application_settings).create!(send_user_confirmation_email: false) + end + + it 'does not enqueue WrongullyConfirmedEmailUnconfirmer job' do + Sidekiq::Testing.fake! do + migrate! + + expect(BackgroundMigrationWorker.jobs.size).to eq(0) + end + end + end + + context 'when email application setting record does not exist' do + before do + table(:application_settings).delete_all + end + + it 'does not enqueue WrongullyConfirmedEmailUnconfirmer job' do + Sidekiq::Testing.fake! do + migrate! - jobs = BackgroundMigrationWorker.jobs - expect(jobs.size).to eq(1) - expect(jobs.first["args"].first).to eq(Gitlab::BackgroundMigration::WrongfullyConfirmedEmailUnconfirmer.name.demodulize) + expect(BackgroundMigrationWorker.jobs.size).to eq(0) + end end end end |