diff options
| author | Felipe Barreto <fbarreto@redhat.com> | 2018-02-09 15:38:00 -0200 |
|---|---|---|
| committer | Christian Heimes <cheimes@redhat.com> | 2018-02-16 09:57:07 +0100 |
| commit | 7c3f9b79eb42252b4540e26267e5aa229343f392 (patch) | |
| tree | 859c8b8344f4ef28587ae668bf107c67afa1cfd0 | |
| parent | 3fa4378bc4f8b1d01c3f9844d605c174d0aa815f (diff) | |
| download | freeipa-7c3f9b79eb42252b4540e26267e5aa229343f392.tar.gz freeipa-7c3f9b79eb42252b4540e26267e5aa229343f392.tar.xz freeipa-7c3f9b79eb42252b4540e26267e5aa229343f392.zip | |
WebUI Tests: refactoring login method to be more readable
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
| -rw-r--r-- | ipatests/test_webui/ui_driver.py | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/ipatests/test_webui/ui_driver.py b/ipatests/test_webui/ui_driver.py index d027f1cd4..221caef99 100644 --- a/ipatests/test_webui/ui_driver.py +++ b/ipatests/test_webui/ui_driver.py @@ -363,34 +363,37 @@ class UI_driver(object): Log in if user is not logged in. """ self.wait_for_request(n=2) - if not self.logged_in(): - - if not login: - login = self.config['ipa_admin'] - if not password: - password = self.config['ipa_password'] - if not new_password: - new_password = password - - auth = self.get_login_screen() - login_tb = self.find("//input[@type='text'][@name='username']", 'xpath', auth, strict=True) - psw_tb = self.find("//input[@type='password'][@name='password']", 'xpath', auth, strict=True) - login_tb.send_keys(login) - psw_tb.send_keys(password) - psw_tb.send_keys(Keys.RETURN) + if self.logged_in(): + return + + if not login: + login = self.config['ipa_admin'] + if not password: + password = self.config['ipa_password'] + if not new_password: + new_password = password + + auth = self.get_login_screen() + login_tb = self.find("//input[@type='text'][@name='username']", + 'xpath', auth, strict=True) + psw_tb = self.find("//input[@type='password'][@name='password']", + 'xpath', auth, strict=True) + login_tb.send_keys(login) + psw_tb.send_keys(password) + psw_tb.send_keys(Keys.RETURN) + self.wait(0.5) + self.wait_for_request(n=2) + + # reset password if needed + newpw_tb = self.find("//input[@type='password'][@name='new_password']", 'xpath', auth) + verify_tb = self.find("//input[@type='password'][@name='verify_password']", 'xpath', auth) + if newpw_tb and newpw_tb.is_displayed(): + newpw_tb.send_keys(new_password) + verify_tb.send_keys(new_password) + verify_tb.send_keys(Keys.RETURN) self.wait(0.5) self.wait_for_request(n=2) - # reset password if needed - newpw_tb = self.find("//input[@type='password'][@name='new_password']", 'xpath', auth) - verify_tb = self.find("//input[@type='password'][@name='verify_password']", 'xpath', auth) - if newpw_tb and newpw_tb.is_displayed(): - newpw_tb.send_keys(new_password) - verify_tb.send_keys(new_password) - verify_tb.send_keys(Keys.RETURN) - self.wait(0.5) - self.wait_for_request(n=2) - def logged_in(self): """ Check if user is logged in |