Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 0 deletions

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)