summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-01-19 16:00:48 -0600
committerRobert Speicher <rspeicher@gmail.com>2018-01-19 16:00:48 -0600
commitb784693759dbeef19adb6387cf1c6c01a0a43cb8 (patch)
tree0cd8bf0627a085a1ed641a869098c2fb9dc53da0
parent7fa0a3e7775703ad9e53216f6154a773ca17ad4a (diff)
downloadgitlab-ce-qa/rs-remove-login-wait.tar.gz
Remove the wait time for the login form checkqa/rs-remove-login-wait
The "Change your password" text is either on the page or it isn't. There's no benefit to using Capybara's default waiting behavior here, as it will never load in via AJAX, for example.
-rw-r--r--qa/qa/page/main/login.rb16
1 files changed, 9 insertions, 7 deletions
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index 7b4c1603017..9cff2c5c317 100644
--- 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