Add latest changes from gitlab-org/gitlab@13-2-stable-ee

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