From a46e5672f723625f153051590ed49a419573c797 Mon Sep 17 00:00:00 2001 From: Arne Tarara Date: Thu, 15 Aug 2024 19:01:39 +0200 Subject: [PATCH] Textual and CSS selector adaptions for nextcloud 29 --- energy-tests/nextcloud_create_doc_and_share.py | 6 +++--- energy-tests/nextcloud_create_event.py | 8 ++++---- energy-tests/nextcloud_create_user.py | 8 ++++---- energy-tests/nextcloud_docs_collaboration.py | 6 +++--- energy-tests/nextcloud_talk.py | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/energy-tests/nextcloud_create_doc_and_share.py b/energy-tests/nextcloud_create_doc_and_share.py index 476a2ea8..5266dff5 100644 --- a/energy-tests/nextcloud_create_doc_and_share.py +++ b/energy-tests/nextcloud_create_doc_and_share.py @@ -21,9 +21,9 @@ def run(playwright: Playwright, browser_name: str) -> None: try: log_note("Login") page.goto("http://nc/") - page.get_by_label("Account name or email").click() - page.get_by_label("Account name or email").fill("Crash") - page.get_by_label("Account name or email").press("Tab") + page.get_by_label("Login with username or email").click() + page.get_by_label("Login with username or email").fill("Crash") + page.get_by_label("Login with username or email").press("Tab") page.get_by_label("Password", exact=True).fill("Override") page.get_by_label("Password", exact=True).press("Enter") log_note("Create new text file") diff --git a/energy-tests/nextcloud_create_event.py b/energy-tests/nextcloud_create_event.py index cafb535f..d15aef95 100644 --- a/energy-tests/nextcloud_create_event.py +++ b/energy-tests/nextcloud_create_event.py @@ -22,8 +22,8 @@ def run(playwright: Playwright, browser_name: str) -> None: try: page.goto("http://nc/login") log_note("Login") - page.get_by_label("Account name or email").fill("Crash") - page.get_by_label("Account name or email").press("Tab") + page.get_by_label("Login with username or email").fill("Crash") + page.get_by_label("Login with username or email").press("Tab") page.get_by_label("Password", exact=True).fill("Override") page.get_by_label("Password", exact=True).press("Enter") log_note("Wait for welcome popup") @@ -31,14 +31,14 @@ def run(playwright: Playwright, browser_name: str) -> None: sleep(5) log_note("Close welcome popup") with contextlib.suppress(TimeoutError): - page.locator('button.first-run-wizard__close-button').click(timeout=15_000) + page.locator('#firstrunwizard .modal-container__content button[aria-label=Close]').click(timeout=15_000) log_note("Go to calendar") page.get_by_role("link", name="Calendar").click() # Second welcome screen? with contextlib.suppress(TimeoutError): - page.locator('button.first-run-wizard__close-button').click(timeout=15_000) + page.locator('#firstrunwizard .modal-container__content button[aria-label=Close]').click(timeout=15_000) log_note("Create event") event_name = "Weekly sync" diff --git a/energy-tests/nextcloud_create_user.py b/energy-tests/nextcloud_create_user.py index 2730847a..c58752ea 100644 --- a/energy-tests/nextcloud_create_user.py +++ b/energy-tests/nextcloud_create_user.py @@ -21,9 +21,9 @@ def create_user(playwright: Playwright, browser_name: str, username: str, passwo page = context.new_page() log_note("Login") page.goto("http://nc/") - page.get_by_label("Account name or email").click() - page.get_by_label("Account name or email").fill("Crash") - page.get_by_label("Account name or email").press("Tab") + page.get_by_label("Login with username or email").click() + page.get_by_label("Login with username or email").fill("Crash") + page.get_by_label("Login with username or email").press("Tab") page.get_by_label("Password", exact=True).fill("Override") page.get_by_label("Password", exact=True).press("Enter") @@ -32,7 +32,7 @@ def create_user(playwright: Playwright, browser_name: str, username: str, passwo sleep(5) with contextlib.suppress(TimeoutError): - page.locator('button.first-run-wizard__close-button').click(timeout=15_000) + page.locator('#firstrunwizard .modal-container__content button[aria-label=Close]').click(timeout=15_000) log_note("Create user") page.get_by_role("link", name="Open settings menu").click() page.get_by_role("link", name="Users").first.click() diff --git a/energy-tests/nextcloud_docs_collaboration.py b/energy-tests/nextcloud_docs_collaboration.py index 38d9d119..5105b692 100644 --- a/energy-tests/nextcloud_docs_collaboration.py +++ b/energy-tests/nextcloud_docs_collaboration.py @@ -94,9 +94,9 @@ def collaborate(playwright: Playwright, browser_name: str) -> None: def login(page, username, password): page.goto("http://nc/login") - page.get_by_label("Account name or email").click() - page.get_by_label("Account name or email").fill(username) - page.get_by_label("Account name or email").press("Tab") + page.get_by_label("Login with username or email").click() + page.get_by_label("Login with username or email").fill(username) + page.get_by_label("Login with username or email").press("Tab") page.get_by_label("Password", exact=True).fill(password) page.get_by_label("Password", exact=True).press("Enter") diff --git a/energy-tests/nextcloud_talk.py b/energy-tests/nextcloud_talk.py index 4c3b3f49..637eb246 100644 --- a/energy-tests/nextcloud_talk.py +++ b/energy-tests/nextcloud_talk.py @@ -35,9 +35,9 @@ def create_conversation(playwright: Playwright, browser_name: str) -> str: try: log_note("Login as admin") page.goto("http://nc/") - page.get_by_label("Account name or email").click() - page.get_by_label("Account name or email").fill("Crash") - page.get_by_label("Account name or email").press("Tab") + page.get_by_label("Login with username or email").click() + page.get_by_label("Login with username or email").fill("Crash") + page.get_by_label("Login with username or email").press("Tab") page.get_by_label("Password", exact=True).fill("Override") page.get_by_role("button", name="Log in").click() @@ -53,7 +53,7 @@ def create_conversation(playwright: Playwright, browser_name: str) -> str: # Second welcome screen? with contextlib.suppress(TimeoutError): - page.locator('button.first-run-wizard__close-button').click(timeout=15_000) + page.locator('#firstrunwizard .modal-container__content button[aria-label=Close]').click(timeout=15_000) # Headless browsers trigger a warning in Nextcloud, however they actually work fine log_note("Close headless warning")