Merge branch 'qa/rs-remove-login-wait' into 'master'

Remove the wait time for the login form check See merge request gitlab-org/gitlab-ce!16594

Merge branch 'qa/rs-remove-login-wait' into 'master'
ba02e3a5 · Grzegorz Bizon · 8d6b029e · b7846937 · ba02e3a5
Commit ba02e3a5 authored Jan 20, 2018 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

login.rb qa/qa/page/main/login.rb +9 -7

No files found.
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -19,15 +19,17 @@ module QA
        end

        def sign_in_using_credentials
-          if page.has_content?('Change your password')
+          using_wait_time 0 do
+            if page.has_content?('Change your password')
+              fill_in :user_password, with: Runtime::User.password
+              fill_in :user_password_confirmation, with: Runtime::User.password
+              click_button 'Change your password'
+            end
+
+            fill_in :user_login, with: Runtime::User.name
            fill_in :user_password, with: Runtime::User.password
-            fill_in :user_password_confirmation, with: Runtime::User.password
-            click_button 'Change your password'
+            click_button 'Sign in'
          end
-
-          fill_in :user_login, with: Runtime::User.name
-          fill_in :user_password, with: Runtime::User.password
-          click_button 'Sign in'
        end

        def self.path