From 2958b95c65122fab71721a4c699a9a4c6fe6e279 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 4 Dec 2023 19:57:01 +0100 Subject: [PATCH] use url fixture in setup_nextcloud_admin_session, cleanup --- src/tests_nextcloud/setup_nextcloud.py | 41 +++----------------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/src/tests_nextcloud/setup_nextcloud.py b/src/tests_nextcloud/setup_nextcloud.py index e88a6a6..e816227 100644 --- a/src/tests_nextcloud/setup_nextcloud.py +++ b/src/tests_nextcloud/setup_nextcloud.py @@ -1,6 +1,7 @@ from playwright.sync_api import Page, expect from src.dir_manager import DirManager +from src.utils import BaseUrl # url dashboard # https://files.test.dev.local-it.cloud/apps/dashboard/ @@ -8,47 +9,13 @@ from src.dir_manager import DirManager # https://files.test.dev.local-it.cloud/apps/files/ -def setup_nextcloud_admin_session(authentik_admin_page: Page, DIR: DirManager): +def setup_nextcloud_admin_session(authentik_admin_page: Page, DIR: DirManager, URL: BaseUrl): """visit nextcloud from authentik with admin_session to create wordpress_admin_session""" with authentik_admin_page.expect_popup() as event_context: authentik_admin_page.get_by_role("link", name="Nextcloud").click() page_nextcloud = event_context.value context = page_nextcloud.context - context.storage_state(path=DIR.STATES / "nextcloud_admin_state.json") - page_nextcloud.goto("/apps/files") + page_nextcloud.goto(URL.get("/apps/files")) expect(page_nextcloud.get_by_role("link", name="Name")).to_be_visible() - - -# @pytest.fixture(scope="session", autouse=True) -# def nc_login(browser: Browser): -# """Nextcloud Login""" -# context = setup_context(browser, f"{STATES}/user_state.json") -# page = context.new_page() -# page.goto(CONFIG["domain"]) -# with page.expect_popup() as nextcloud_info: -# link = page.get_by_role("link", name="Nextcloud") -# CONFIG["nc_domain"] = link.get_attribute("href") -# link.click() -# nextcloud = nextcloud_info.value -# check_for(nextcloud.get_by_role("link", name="Name")) -# if nextcloud.query_selector(".close-icon"): -# close_button = nextcloud.get_by_role("button", name="Close modal") -# close_button.click() -# expect(close_button).to_be_hidden() -# nextcloud.wait_for_timeout(2000) -# context.storage_state(path=f"{STATES}/nc_user_state.json") -# context.tracing.stop(path=f"{RECORDS}/nextcloud_login_user.zip") -# context.close() - - -# @pytest.fixture -# def nc_session(browser: Browser): -# """Reuse Nextcloud User Session""" -# context = setup_context(browser, f"{STATES}/nc_user_state.json") -# page = context.new_page() -# page.goto(CONFIG["nc_domain"]) -# if page.query_selector(".close-icon"): -# page.get_by_role("button", name="Close modal").click() -# yield context, page -# context.close() + context.storage_state(path=DIR.STATES / "nextcloud_admin_state.json")