Merge branch 'sh-fix-captcha-state-pollution-spec' into 'master'

Fix order-dependent spec failures with reCAPTCHA

Closes #67133

See merge request gitlab-org/gitlab-ce!32771

1 files changed, 1 insertions, 7 deletions

diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index b79a1ac4810..5d87dbdee8b 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -74,11 +74,6 @@ describe RegistrationsController do
     end
 
     context 'when reCAPTCHA is enabled' do
-      def fail_recaptcha
-        # Without this, `verify_recaptcha` arbitrarily returns true in test env
-        Recaptcha.configuration.skip_verify_env.delete('test')
-      end
-
       before do
         stub_application_setting(recaptcha_enabled: true)
       end
@@ -91,7 +86,7 @@ describe RegistrationsController do
       end
 
       it 'displays an error when the reCAPTCHA is not solved' do
-        fail_recaptcha
+        allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
 
         post(:create, params: user_params)
 
@@ -107,7 +102,6 @@ describe RegistrationsController do
 
       it 'does not require reCAPTCHA if disabled by feature flag' do
         stub_feature_flags(registrations_recaptcha: false)
-        fail_recaptcha
 
         post(:create, params: user_params)