Fixes for docs scenario

nextcloud_create_doc_and_share.py

@@ -1,16 +1,23 @@
-from time import time_ns
+import contextlib
+import sys
+from time import sleep, time_ns
 
-from playwright.sync_api import Playwright, sync_playwright
+from playwright.sync_api import Playwright, sync_playwright, Error
 
 def log_note(message: str) -> None:
     timestamp = str(time_ns())[:16]
     print(f"{timestamp} {message}")
 
-def run(playwright: Playwright) -> None:
+def run(playwright: Playwright, browser_name: str) -> None:
-    log_note("Launch browser")
+    log_note(f"Launch browser {browser_name}")
-    browser = playwright.chromium.launch(headless=True)
+    if browser_name == "firefox":
+        browser_type = playwright.firefox
+    else:
+        browser_type = playwright.chromium
+    browser = browser_type.launch(headless=True)
     context = browser.new_context()
     page = context.new_page()
+    try:
         log_note("Login")
         page.goto("http://nc/")
         page.get_by_label("Account name or email").click()
@@ -25,7 +32,10 @@ def run(playwright: Playwright) -> None:
         page.locator("#view9-input-file").fill("colab_meeting.md")
         page.locator("#view9-input-file").press("Enter")
         page.get_by_role("button", name="Create a new file with the selected template").click()
-    page.get_by_role("button", name="Close modal").click()
+        sleep(5)
+        with contextlib.suppress(Exception):
+            page.get_by_role("button", name="Close modal").click(timeout=15_000)
+        page.keyboard.press("Escape")
         log_note("Share file with other user")
         page.get_by_role("link", name="colab_meeting .md").get_by_role("link", name="Share").click()
         page.get_by_placeholder("Name, email, or Federated Cloud ID …").click()
@@ -37,7 +47,19 @@ def run(playwright: Playwright) -> None:
         # ---------------------
         context.close()
         browser.close()
+    except Error as e:
+        log_note(f"Exception occurred: {e.message}")
+        log_note(f"Page content was: {page.content()}")
+        raise e
 
 
 with sync_playwright() as playwright:
-    run(playwright)
+    if len(sys.argv) > 1:
+        browser_name = sys.argv[1].lower()
+        if browser_name not in ["chromium", "firefox"]:
+            print("Invalid browser name. Please choose either 'chromium' or 'firefox'.")
+            sys.exit(1)
+    else:
+        browser_name = "chromium"
+
+    run(playwright, browser_name)

nextcloud_create_user.py

@@ -1,16 +1,22 @@
+import sys
 import contextlib
 from time import time_ns
 
-from playwright.sync_api import Playwright, sync_playwright
+from playwright.sync_api import Playwright, sync_playwright, Error
 
 def log_note(message: str) -> None:
     timestamp = str(time_ns())[:16]
     print(f"{timestamp} {message}")
 
-def create_user(playwright: Playwright, username: str, password: str) -> None:
+def create_user(playwright: Playwright, browser_name: str, username: str, password: str) -> None:
-    log_note("Launch browser")
+    log_note(f"Launch browser {browser_name}")
-    browser = playwright.chromium.launch(headless=True)
+    if browser_name == "firefox":
+        browser_type = playwright.firefox
+    else:
+        browser_type = playwright.chromium
+    browser = browser_type.launch(headless=True)
     context = browser.new_context()
+    try:
         page = context.new_page()
         log_note("Login")
         page.goto("http://nc/")
@@ -37,7 +43,19 @@ def create_user(playwright: Playwright, username: str, password: str) -> None:
         page.close()
         context.close()
         browser.close()
+    except Error as e:
+        log_note(f"Exception occurred: {e.message}")
+        log_note(f"Page content was: {page.content()}")
+        raise e
 
 
 with sync_playwright() as playwright:
-    create_user(playwright, username="docs_dude", password="docsrule!12")
+    if len(sys.argv) > 1:
+        browser_name = sys.argv[1].lower()
+        if browser_name not in ["chromium", "firefox"]:
+            print("Invalid browser name. Please choose either 'chromium' or 'firefox'.")
+            sys.exit(1)
+    else:
+        browser_name = "chromium"
+
+    create_user(playwright, browser_name, username="docs_dude", password="docsrule!12")

nextcloud_docs_collaboration.py

@@ -1,8 +1,10 @@
+import contextlib
 import random
 import string
+import sys
 from time import time_ns, sleep
 
-from playwright.sync_api import Playwright, sync_playwright, expect
+from playwright.sync_api import Playwright, sync_playwright, expect, Error
 
 
 def get_random_text() -> str:
@@ -14,21 +16,29 @@ def log_note(message: str) -> None:
     timestamp = str(time_ns())[:16]
     print(f"{timestamp} {message}")
 
-def collaborate(playwright: Playwright) -> None:
+def collaborate(playwright: Playwright, browser_name: str) -> None:
-    log_note("Launching browsers")
+    log_note(f"Launch two {browser_name} browsers")
-    browser = playwright.chromium.launch(headless=True)
+    if browser_name == "firefox":
+        browser_type = playwright.firefox
+    else:
+        browser_type = playwright.chromium
+
+    browser = browser_type.launch(headless=True)
     context = browser.new_context()
     admin_user = context.new_page()
 
-    browser_two = playwright.chromium.launch(headless=True)
+    browser_two = browser_type.launch(headless=True)
     context_two = browser_two.new_context()
     docs_user = context_two.new_page()
 
+    try:
         # Login and open the file for both users
         log_note("Logging in with users")
         login(admin_user, "Crash", "Override")
         login(docs_user, "docs_dude", "docsrule!12")
         log_note("Opening document with both users")
+        with contextlib.suppress(Exception):
+            sleep(5)
             docs_user.get_by_role("button", name="Close modal").click(timeout=15_000)
         admin_user.get_by_role("link", name="Files").click()
         docs_user.get_by_role("link", name="Files").click()
@@ -67,6 +77,12 @@ def collaborate(playwright: Playwright) -> None:
         browser.close()
         browser_two.close()
 
+    except Error as e:
+        log_note(f"Exception occurred: {e.message}")
+        log_note(f"Page content was: {docs_user.content()}")
+        log_note(f"Page content was: {admin_user.content()}")
+        raise e
+
 def login(page, username, password):
     page.goto("http://nc/login")
     page.get_by_label("Account name or email").click()
@@ -77,4 +93,12 @@ def login(page, username, password):
 
 
 with sync_playwright() as playwright:
-    collaborate(playwright)
+    if len(sys.argv) > 1:
+        browser_name = sys.argv[1].lower()
+        if browser_name not in ["chromium", "firefox"]:
+            print("Invalid browser name. Please choose either 'chromium' or 'firefox'.")
+            sys.exit(1)
+    else:
+        browser_name = "chromium"
+
+    collaborate(playwright, browser_name)

nextcloud_install.py

@@ -36,14 +36,13 @@ def main(browser_name: str = "chromium"):
             # 3. Dashboard
             page.wait_for_selector('.app-dashboard')
             log_note("Installation complete")
+            browser.close()
 
         except Error as e:
             log_note(f"Exception occurred: {e.message}")
             log_note(f"Page content was: {page.content()}")
             raise e
 
-        browser.close()
-
 
 if __name__ == '__main__':
     if len(sys.argv) > 1: