diff options
author | Mark Lapierre <mlapierre@gitlab.com> | 2019-02-07 19:44:16 +0000 |
---|---|---|
committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-02-07 19:44:16 +0000 |
commit | 439bde0052a3e3f36e420a83d80345f911ac955c (patch) | |
tree | 26cc007aec137429b53d123bf5d8a0b0ecfc00fd /qa/qa | |
parent | 82423ac34ac90e3ff3443495a14af0105feff67d (diff) | |
parent | 621b92120e133e1fa8e29a51ece8b850302a6a63 (diff) | |
download | gitlab-ce-439bde0052a3e3f36e420a83d80345f911ac955c.tar.gz |
Merge branch 'qa-check-server-responding-before-suit' into 'master'
Wait for login page to load at the beginning of QA suite
See merge request gitlab-org/gitlab-ce!24991
Diffstat (limited to 'qa/qa')
-rw-r--r-- | qa/qa/page/main/login.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb index d5377f1d1c1..e476cbe29a2 100644 --- a/qa/qa/page/main/login.rb +++ b/qa/qa/page/main/login.rb @@ -40,17 +40,9 @@ module QA element :login_page end - def initialize - # The login page is usually the entry point for all the scenarios so - # we need to wait for the instance to start. That said, in some cases - # we are already logged-in so we check both cases here. - # Check if we're already logged in first. If we don't then we have to - # wait 10 seconds for the check for the login page to fail every time - # we use this class when we're already logged in (E.g., whenever we - # create a personal access token to use for API access). - wait(max: 500) do - Page::Main::Menu.act { has_personal_area?(wait: 0) } || - has_element?(:login_page) + def page_loaded? + wait(max: 60) do + has_element?(:login_page) end end |