summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-01-20 11:25:49 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-01-20 11:25:49 +0000
commitba02e3a5dfb0fb95a1a32b81e893b6fe2ea39b9e (patch)
tree98add3c5740486249e47411cc1abbfeece80a864
parent8d6b029e25ab07283be0bb25b0a1667df9207009 (diff)
parentb784693759dbeef19adb6387cf1c6c01a0a43cb8 (diff)
downloadgitlab-ce-ba02e3a5dfb0fb95a1a32b81e893b6fe2ea39b9e.tar.gz
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
-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