From 7527b54bd77e94415c903797e64e40eacad82ffa Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 4 Dec 2020 12:36:06 +0100 Subject: [PATCH] tests (e2e/libervia/conftest): new `log_in_account1_s2` fixture --- tests/e2e/libervia/conftest.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/e2e/libervia/conftest.py b/tests/e2e/libervia/conftest.py index 3c8bbaf4..b2f70213 100644 --- a/tests/e2e/libervia/conftest.py +++ b/tests/e2e/libervia/conftest.py @@ -31,7 +31,7 @@ LIBERVIA_PORT_HTTPS = 8443 BASE_URL = f"https://{LIBERVIA_HOST}:{LIBERVIA_PORT_HTTPS}" SIZE_DESKTOP = (1024, 728) SIZE_MOBILE = (380, 640) -account_1_cookies = None +accounts_cookies = {} @pytest.hookimpl(tryfirst=True, hookwrapper=True) @@ -92,20 +92,26 @@ def browser(): def nobody_logged_in(browser): browser.get_driver().delete_all_cookies() +def log_in(browser, account): + try: + account_cookies = accounts_cookies[account] + except KeyError: + browser.get_driver().delete_all_cookies() + browser.go_to("https://libervia.test:8443/login") + browser.write(account, into="login") + browser.write("test", into="password") + browser.click("log in") + accounts_cookies[account] = browser.get_driver().get_cookies()[0] + else: + browser.get_driver().add_cookie(account_cookies) @pytest.fixture def log_in_account1(browser): - global account_1_cookies - if account_1_cookies is None: - browser.get_driver().delete_all_cookies() - browser.go_to("https://libervia.test:8443/login") - browser.write("account1", into="login") - browser.write("test", into="password") - browser.click("log in") - account_1_cookies = browser.get_driver().get_cookies() - else: - browser.get_driver().add_cookie(account_1_cookies) + log_in(browser, "account1") +@pytest.fixture +def log_in_account1_s2(browser): + log_in(browser, "account1_s2") @pytest.fixture def mobile_screen(browser):