From b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 5 Feb 2020 18:09:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/support/helpers/controller_helpers.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 spec/support/helpers/controller_helpers.rb (limited to 'spec/support/helpers/controller_helpers.rb') diff --git a/spec/support/helpers/controller_helpers.rb b/spec/support/helpers/controller_helpers.rb new file mode 100644 index 00000000000..8f5ef8c9696 --- /dev/null +++ b/spec/support/helpers/controller_helpers.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +module ControllerHelpers + # It seems Devise::Test::ControllerHelpers#sign_in doesn't clear out the @current_user + # variable of the controller, hence it's not overwritten on retries. + # This should be fixed in Devise: + # - https://github.com/heartcombo/devise/issues/5190 + # - https://github.com/heartcombo/devise/pull/5191 + def sign_in(resource, deprecated = nil, scope: nil) + super + + scope ||= Devise::Mapping.find_scope!(resource) + + @controller.instance_variable_set(:"@current_#{scope}", nil) + end +end + +Devise::Test::ControllerHelpers.prepend(ControllerHelpers) -- cgit v1.2.1