From 2b36ee99cec639363c4e84020d37989a9a54ad52 Mon Sep 17 00:00:00 2001 From: kaeff Date: Mon, 17 Aug 2015 21:00:33 +0200 Subject: pep8 --- service/test/functional/features/steps/common.py | 2 ++ service/test/functional/features/steps/mail_list.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'service/test/functional/features') diff --git a/service/test/functional/features/steps/common.py b/service/test/functional/features/steps/common.py index d77e9903..af801902 100644 --- a/service/test/functional/features/steps/common.py +++ b/service/test/functional/features/steps/common.py @@ -44,10 +44,12 @@ def wait_until_element_is_deleted(context, locator_tuple, timeout=TIMEOUT_IN_S): def wait_for_user_alert_to_disapear(context, timeout=TIMEOUT_IN_S): wait_until_element_is_invisible_by_locator(context, (By.ID, 'user-alerts'), timeout) + def wait_for_user_alert_to_appear_and_disapear(context, timeout=TIMEOUT_IN_S): wait_until_element_is_visible_by_locator(context, (By.ID, LOADING), timeout) wait_until_element_is_invisible_by_locator(context, (By.ID, LOADING), timeout) + def wait_until_elements_are_visible_by_locator(context, locator_tuple, timeout=TIMEOUT_IN_S): spend_time_in_reactor() wait = WebDriverWait(context.browser, timeout) diff --git a/service/test/functional/features/steps/mail_list.py b/service/test/functional/features/steps/mail_list.py index 2ab46bab..ff7acaf4 100644 --- a/service/test/functional/features/steps/mail_list.py +++ b/service/test/functional/features/steps/mail_list.py @@ -102,8 +102,8 @@ def impl(context): context.current_mail_id = last_email().get_attribute('id') last_email().find_element_by_tag_name('input').click() find_element_by_id(context, 'delete-selected').click() - wait_for_user_alert_to_appear_and_disapear(context) # Loading - wait_for_user_alert_to_disapear(context) # Success message + wait_for_user_alert_to_appear_and_disapear(context) + wait_for_user_alert_to_disapear(context) spend_time_in_reactor() assert 0 == len(context.browser.find_element_by_id('mail-list').find_elements_by_tag_name('li')) -- cgit v1.2.3