1 files changed, 43 insertions, 29 deletions
diff --git a/spec/controllers/confirmations_controller_spec.rb b/spec/controllers/confirmations_controller_spec.rb
index 773a416dcb4..fea43894f1c 100644
--- a/spec/controllers/confirmations_controller_spec.rb
+++ b/spec/controllers/confirmations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ConfirmationsController do
+RSpec.describe ConfirmationsController, feature_category: :system_access do
   include DeviseHelpers
 
   before do
@@ -58,8 +58,7 @@ RSpec.describe ConfirmationsController do
           m.call(*args)
 
           expect(Gitlab::ApplicationContext.current)
-            .to include('meta.user' => user.username,
-                        'meta.caller_id' => 'ConfirmationsController#show')
+            .to include('meta.user' => user.username, 'meta.caller_id' => 'ConfirmationsController#show')
         end
 
         perform_request
@@ -94,8 +93,7 @@ RSpec.describe ConfirmationsController do
           m.call(*args)
 
           expect(Gitlab::ApplicationContext.current)
-            .to include('meta.user' => user.username,
-                        'meta.caller_id' => 'ConfirmationsController#show')
+            .to include('meta.user' => user.username, 'meta.caller_id' => 'ConfirmationsController#show')
         end
 
         travel_to(3.days.from_now) { perform_request }
@@ -150,51 +148,67 @@ RSpec.describe ConfirmationsController do
       end
     end
 
-    context 'when reCAPTCHA is disabled' do
+    context "when `email_confirmation_setting` is set to `soft`" do
       before do
-        stub_application_setting(recaptcha_enabled: false)
+        stub_application_setting_enum('email_confirmation_setting', 'soft')
       end
 
-      it 'successfully sends password reset when reCAPTCHA is not solved' do
-        perform_request
+      context 'when reCAPTCHA is disabled' do
+        before do
+          stub_application_setting(recaptcha_enabled: false)
+        end
 
-        expect(response).to redirect_to(dashboard_projects_path)
-      end
-    end
+        it 'successfully sends password reset when reCAPTCHA is not solved' do
+          perform_request
 
-    context 'when reCAPTCHA is enabled' do
-      before do
-        stub_application_setting(recaptcha_enabled: true)
+          expect(response).to redirect_to(dashboard_projects_path)
+        end
       end
 
-      context 'when the reCAPTCHA is not solved' do
+      context 'when reCAPTCHA is enabled' do
         before do
-          Recaptcha.configuration.skip_verify_env.delete('test')
+          stub_application_setting(recaptcha_enabled: true)
         end
 
-        it 'displays an error' do
-          perform_request
+        context 'when the reCAPTCHA is not solved' do
+          before do
+            Recaptcha.configuration.skip_verify_env.delete('test')
+          end
+
+          it 'displays an error' do
+            alert_text = _('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
+
+            perform_request
+
+            expect(response).to render_template(:new)
+            expect(flash[:alert]).to include alert_text
+          end
 
-          expect(response).to render_template(:new)
-          expect(flash[:alert]).to include _('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
+          it 'sets gon variables' do
+            Gon.clear
+
+            perform_request
+
+            expect(response).to render_template(:new)
+            expect(Gon.all_variables).not_to be_empty
+          end
         end
 
-        it 'sets gon variables' do
-          Gon.clear
+        it 'successfully sends password reset when reCAPTCHA is solved' do
+          Recaptcha.configuration.skip_verify_env << 'test'
 
           perform_request
 
-          expect(response).to render_template(:new)
-          expect(Gon.all_variables).not_to be_empty
+          expect(response).to redirect_to(dashboard_projects_path)
         end
       end
+    end
 
-      it 'successfully sends password reset when reCAPTCHA is solved' do
-        Recaptcha.configuration.skip_verify_env << 'test'
-
+    context "when `email_confirmation_setting` is not set to `soft`" do
+      it 'redirects to the users_almost_there path' do
         perform_request
 
-        expect(response).to redirect_to(dashboard_projects_path)
+        expect(response).to redirect_to(users_almost_there_path)
       end
     end
   end