Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/flow/login.rb')
-rw-r--r--qa/qa/flow/login.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/qa/qa/flow/login.rb b/qa/qa/flow/login.rb
index b60f74fe9bf..05f114acbc5 100644
--- a/qa/qa/flow/login.rb
+++ b/qa/qa/flow/login.rb
@@ -40,8 +40,14 @@ module QA
sign_in(as: Runtime::User.admin, address: address, admin: true)
end
- def sign_in_unless_signed_in(as: nil, address: :gitlab)
- sign_in(as: as, address: address) unless Page::Main::Menu.perform(&:signed_in?)
+ def sign_in_unless_signed_in(user: nil, address: :gitlab)
+ if user
+ sign_in(as: user, address: address) unless Page::Main::Menu.perform do |menu|
+ menu.signed_in_as_user?(user)
+ end
+ else
+ sign_in(address: address) unless Page::Main::Menu.perform(&:signed_in?)
+ end
end
end
end