This commit is contained in:
Benjamin Forehand Jr 2018-06-26 13:02:30 -04:00
Родитель 96a6a17da7
Коммит e5b25a5ccd
3 изменённых файлов: 21 добавлений и 25 удалений

Просмотреть файл

@ -27,10 +27,14 @@ class HomePage(Page):
logout[-1].click()
def search(self, term):
element = self.selenium.find_element_by_css_selector(".navbar__search__input")
element = self.selenium.find_element_by_css_selector(
".navbar__search__input"
)
element.click()
element.send_keys(term)
button = self.selenium.find_element_by_css_selector(".input-group-btn .btn")
button = self.selenium.find_element_by_css_selector(
".input-group-btn .btn"
)
button.click()
from pages.queries import QueryPage

Просмотреть файл

@ -23,7 +23,9 @@ class LoginPage(Page):
def alert(self):
"""Return the alert element."""
element = self.wait.until(
expected.visibility_of_element_located((By.CSS_SELECTOR, ".alert-danger"))
expected.visibility_of_element_located(
(By.CSS_SELECTOR, ".alert-danger")
)
)
return element.text
@ -61,7 +63,9 @@ class LoginPage(Page):
try:
self.wait.until(
lambda _: self.is_element_displayed(By.CSS_SELECTOR, ".alert-danger")
lambda _: self.is_element_displayed(
By.CSS_SELECTOR, ".alert-danger"
)
)
except TimeoutException:
return HomePage(self.selenium).wait_for_page_to_load()

Просмотреть файл

@ -55,7 +55,9 @@ def _verify_url(request, server_url, user, org):
"""
if server_url and request.config.option.verify_server_url:
session = Session()
retries = Retry(backoff_factor=0.1, status_forcelist=[500, 502, 503, 504])
retries = Retry(
backoff_factor=0.1, status_forcelist=[500, 502, 503, 504]
)
session.mount(server_url, HTTPAdapter(max_retries=retries))
session.get(server_url, verify=False)
@ -96,7 +98,9 @@ def fixture_users(variables, org, root_session, server_url, user_factory):
# Check if there are any users in the db, if not, Redash needs to be set up
response = root_session.get(f"{server_url}/api/users")
if response.status_code == 404:
raise RuntimeError("Root user must be created. Please run 'make setup-redash'")
raise RuntimeError(
"Root user must be created. Please run 'make setup-redash'"
)
for existing_user in response.json():
for user in variables[org]["users"].values():
@ -168,7 +172,9 @@ def fixture_create_user(root_session, server_url, user_factory):
except Exception:
raise RuntimeError(f"error sending invite: {response.text}")
return user_factory.create_user(name=name, email=email, password=password)
return user_factory.create_user(
name=name, email=email, password=password
)
return create_user
@ -202,24 +208,6 @@ def fixture_root_session(server_url, root_user):
return session
@pytest.fixture(name="create_datasource", scope="session")
def fixture_create_datasource(root_session, server_url, variables):
"""Create a data source."""
# Check if data source exists, if it does, don't recreate it
response = root_session.get(f"{server_url}/api/data_sources")
for item in response.json():
if item["name"] in variables["default"]["data-sources"]:
return
# response = root_session.post(
# f"{server_url}/api/data_sources",
# json={"options": {}, "name": "ui-test", "type": "url"},
# )
if response.status_code != 200:
raise RuntimeError(f"unable to create data source: {response.text}")
@pytest.fixture(name="create_queries", scope="session")
def fixture_create_queries(root_session, server_url, variables):
"""Create 2 queries using the data from variables.json."""