Skip to content
Snippets Groups Projects

Match address of host when checking whether to login

Merged Ian Baum requested to merge qa-geo-check-address into master
All threads resolved!
1 file
+ 4
3
Compare changes
  • Side-by-side
  • Inline
+ 4
3
@@ -6,8 +6,6 @@ module Login
@@ -6,8 +6,6 @@ module Login
module_function
module_function
def while_signed_in(as: nil, address: :gitlab, admin: false)
def while_signed_in(as: nil, address: :gitlab, admin: false)
Page::Main::Menu.perform {|menu| menu.sign_out_if_signed_in(address) }
sign_in(as: as, address: address, admin: admin)
sign_in(as: as, address: address, admin: admin)
result = yield
result = yield
@@ -23,7 +21,10 @@ def while_signed_in_as_admin(address: :gitlab)
@@ -23,7 +21,10 @@ def while_signed_in_as_admin(address: :gitlab)
end
end
def sign_in(as: nil, address: :gitlab, skip_page_validation: false, admin: false)
def sign_in(as: nil, address: :gitlab, skip_page_validation: false, admin: false)
Runtime::Browser.visit(address, Page::Main::Login)
unless Page::Main::Login.perform(&:on_login_page?)
 
Page::Main::Menu.perform(&:sign_out) if Page::Main::Menu.perform(&:signed_in?)
 
Runtime::Browser.visit(address, Page::Main::Login)
 
end
Page::Main::Login.perform do |login|
Page::Main::Login.perform do |login|
if admin
if admin
Loading