diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-09 09:06:01 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-09 09:06:01 +0000 |
commit | 7534f7a892d6e8c50475720e387b8689c94582da (patch) | |
tree | 034fbb1fe83bad0b51892cab4debe4e07008ea3b | |
parent | fa0923ddfed657223d2e337693f4f2dc74cd7604 (diff) | |
parent | 589f6b1907f1492396e02d12964984e0ed273a00 (diff) | |
download | gitlab-ce-7534f7a892d6e8c50475720e387b8689c94582da.tar.gz |
Merge branch 'sh-ldap-set-first-password-qa' into 'master'
Set initial password for instance in LDAP QA test
See merge request gitlab-org/gitlab-ce!17024
-rw-r--r-- | qa/qa/page/main/login.rb | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb index 0d1ffd9694a..fd49b27cb1a 100644 --- a/qa/qa/page/main/login.rb +++ b/qa/qa/page/main/login.rb @@ -31,22 +31,29 @@ module QA end end + def set_initial_password_if_present + 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 + end + def sign_in_using_ldap_credentials - click_link 'LDAP' + using_wait_time 0 do + set_initial_password_if_present - fill_in :username, with: Runtime::User.name - fill_in :password, with: Runtime::User.password + click_link 'LDAP' - click_button 'Sign in' + fill_in :username, with: Runtime::User.name + fill_in :password, with: Runtime::User.password + click_button 'Sign in' + end end def sign_in_using_credentials 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 + set_initial_password_if_present click_link 'Standard' if page.has_content?('LDAP') |