TT#122872 selenium: Only switch to new admin UI when necessary

Only press "Go back to new UI" button when in old ui. Before it would still
try to press the button regardless if in old or new ui

Change-Id: If22484be82c22802f7b930820e782e4514dd6f03
mr10.0
Nico Schedel 4 years ago
parent 5f2925cdb0
commit b989ed8625

@ -12,7 +12,14 @@ from functions.Functions import wait_for_invisibility
def login_panel(driver, username="administrator", password="administrator"):
driver.get(os.environ['CATALYST_SERVER'] + ":1443")
driver.find_element_by_xpath('//*[@id="login_page_v1"]/div[3]/div/b/a').click()
try:
driver.implicitly_wait(1)
driver.find_element_by_xpath('//*[@id="login_page_v1"]//div/b/a').click()
driver.implicitly_wait(10)
except:
pass
finally:
driver.implicitly_wait(10)
WebDriverWait(driver, 10).until(EC.element_to_be_clickable((By.XPATH, '//*[@aria-label="Username"]')))
fill_element(driver, '//*[@aria-label="Username"]', username)
fill_element(driver, '//*[@aria-label="Password"]', password)

@ -676,7 +676,14 @@ class testrun(unittest.TestCase):
filename = "test_login_page.png"
driver = self.driver
driver.get(os.environ['CATALYST_SERVER'] + ":1443")
driver.find_element_by_xpath('//*[@id="login_page_v1"]/div[3]/div/b/a').click()
try:
driver.implicitly_wait(1)
driver.find_element_by_xpath('//*[@id="login_page_v1"]//div/b/a').click()
driver.implicitly_wait(10)
except:
pass
finally:
driver.implicitly_wait(10)
print("\nTry to login with no credentials...", end="")
WebDriverWait(driver, 10).until(EC.element_to_be_clickable((By.XPATH, '//*[@id="q-app"]/div//main/div/form//button[contains(., "Sign In")]')))
click_js(driver, '//*[@id="q-app"]/div//main/div/form//button[contains(., "Sign In")]')

Loading…
Cancel
Save