From fa5c52217d57ac425e36ec26f1aec62e5af1992e Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Thu, 5 Sep 2019 18:38:19 +0200 Subject: Fix global state in registrations_controller_spec This spec would mess with global state used for captchas, but not reset the state in all cases. This would then lead to the spec spec/controllers/snippets_controller_spec.rb failing, but only on a fork of gitlab-ee. To fix this we ensure the state is properly reset after running the specs that change this state. --- spec/controllers/registrations_controller_spec.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb index 35487682462..b79a1ac4810 100644 --- a/spec/controllers/registrations_controller_spec.rb +++ b/spec/controllers/registrations_controller_spec.rb @@ -83,6 +83,13 @@ describe RegistrationsController do stub_application_setting(recaptcha_enabled: true) end + after do + # Avoid test ordering issue and ensure `verify_recaptcha` returns true + unless Recaptcha.configuration.skip_verify_env.include?('test') + Recaptcha.configuration.skip_verify_env << 'test' + end + end + it 'displays an error when the reCAPTCHA is not solved' do fail_recaptcha @@ -93,11 +100,6 @@ describe RegistrationsController do end it 'redirects to the dashboard when the recaptcha is solved' do - # Avoid test ordering issue and ensure `verify_recaptcha` returns true - unless Recaptcha.configuration.skip_verify_env.include?('test') - Recaptcha.configuration.skip_verify_env << 'test' - end - post(:create, params: user_params) expect(flash[:notice]).to include 'Welcome! You have signed up successfully.' -- cgit v1.2.1