From 60c9020a11a88e07cb63ede737791bbeb8bbe6ec Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Mon, 28 Nov 2016 16:31:48 -0200 Subject: Convert URL constants to behave's userdata Behave 1.2.5 introduces user-specific configuration data, which can be used to override default values. See: https://github.com/pixelated/project-issues/issues/380 --- service/test/functional/features/steps/common.py | 8 -------- service/test/functional/features/steps/login.py | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'service/test/functional/features/steps') diff --git a/service/test/functional/features/steps/common.py b/service/test/functional/features/steps/common.py index 4ffe40ce..bbceb015 100644 --- a/service/test/functional/features/steps/common.py +++ b/service/test/functional/features/steps/common.py @@ -25,18 +25,10 @@ from selenium.webdriver.support.wait import WebDriverWait from test.support.integration import MailBuilder -LOADING = 'loading' - TIMEOUT_IN_S = 20 DEFAULT_IMPLICIT_WAIT_TIMEOUT_IN_S = 10.0 -HOMEPAGE_URL = 'http://localhost:8889/' - -MULTI_USER_PORT = 4568 - -MULTI_USER_URL = 'http://localhost:%d/' % MULTI_USER_PORT - class ImplicitWait(object): def __init__(self, context, timeout=5.0): diff --git a/service/test/functional/features/steps/login.py b/service/test/functional/features/steps/login.py index 2a653030..d1840900 100644 --- a/service/test/functional/features/steps/login.py +++ b/service/test/functional/features/steps/login.py @@ -21,13 +21,12 @@ from selenium.webdriver.common.by import By from common import ( fill_by_css_selector, find_element_by_css_selector, - MULTI_USER_URL, wait_until_element_is_visible_by_locator) @when(u'I open the login page') def login_page(context): - context.browser.get(MULTI_USER_URL + '/login') + context.browser.get(context.multi_user_url + '/login') @when(u'I enter {username} and {password} as credentials') -- cgit v1.2.3