From 62b691f44a2f201f55052831e2b1ddad962a9cb9 Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Fri, 20 Sep 2024 15:16:21 -0400
Subject: [PATCH] QA: updates for recent nextcloud changes

---
 tests/lib/python/browser/NextcloudAutomation.py | 10 ++++++++--
 tests/suites/nextcloud/contacts.py              | 13 +++++++++----
 tests/suites/remote-nextcloud.sh                |  4 ++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/tests/lib/python/browser/NextcloudAutomation.py b/tests/lib/python/browser/NextcloudAutomation.py
index da209bb0..b2eeca91 100644
--- a/tests/lib/python/browser/NextcloudAutomation.py
+++ b/tests/lib/python/browser/NextcloudAutomation.py
@@ -58,7 +58,10 @@ class NextcloudAutomation(object):
         d.say("Logout of Nextcloud")
         self.click_avatar()
 
-        el = d.find_el('[data-id="logout"] a', throws=False) # nc < 26
+        el = d.find_el('a#logout', throws=False)
+        if not el:
+            # nc >= 29
+            el = d.find_el('[data-id="logout"] a', throws=False) # nc < 26
         if not el:
             # nc >= 26
             el = d.find_el('#logout > a', throws=False)
@@ -72,7 +75,10 @@ class NextcloudAutomation(object):
         d = self.d
         d.say("Open contacts")
         # nc 25+
-        el = d.find_el('header [data-app-id="contacts"]', throws=False)
+        el = d.find_el('header [title="Contacts"]', throws=False)
+        if not el:
+            # nc < 29
+            el = d.find_el('header [data-app-id="contacts"]', throws=False)
         if not el:
             # nc < 25
             el = d.find_el('header [data-id="contacts"]')
diff --git a/tests/suites/nextcloud/contacts.py b/tests/suites/nextcloud/contacts.py
index ddf82b41..6b204e32 100644
--- a/tests/suites/nextcloud/contacts.py
+++ b/tests/suites/nextcloud/contacts.py
@@ -7,6 +7,7 @@
 ##### details.
 #####
 
+
 from browser.automation import (
     TestDriver,
     TimeoutException,
@@ -50,16 +51,20 @@ try:
     # open Contacts
     #
     d.start("Open contacts app")
-    contacts = nc.open_contacts()
+    try:
+        contacts = nc.open_contacts()
+    except NoSuchElementException:
+        nc.close_first_run_wizard()
+        contacts = nc.open_contacts()
     nc.wait_for_app_load()
 
     #
-    # handle selected operation 
+    # handle selected operation
     #
     if op=='exists':
         d.start("Check that contact %s exists", contact['email'])
         contacts.click_contact(contact) # raises NoSuchElementException if not found
-        
+
     elif op=='delete':
         d.start("Delete contact %s", contact['email'])
         contacts.click_contact(contact)
@@ -68,7 +73,7 @@ try:
 
     elif op=='nop':
         pass
-        
+
     else:
         raise ValueError('Invalid operation: %s' % op)
 
diff --git a/tests/suites/remote-nextcloud.sh b/tests/suites/remote-nextcloud.sh
index 795fe67a..f054609c 100644
--- a/tests/suites/remote-nextcloud.sh
+++ b/tests/suites/remote-nextcloud.sh
@@ -172,7 +172,7 @@ test_web_config() {
 		record "output=$REST_OUTPUT"
 		if [ $code -eq 0 ]; then
 			test_failure "carddav url works, but expecting 401/NotAuthenticated from server"
-		elif [ $code -eq 1 -o $REST_HTTP_CODE -ne 401 ] || ! grep "NotAuthenticated" <<<"$REST_OUTPUT" >/dev/null; then
+		elif [ $REST_HTTP_CODE -ne 401 ]; then
 			test_failure "carddav url doesn't work: $REST_ERROR"
 		fi
 	fi
@@ -189,7 +189,7 @@ test_web_config() {
 		record "output=$REST_OUTPUT"
 		if [ $code -eq 0 ]; then
 			test_failure "caldav url works, but expecting 401/NotAuthenticated from server"
-		elif [ $code -eq 1 -o $REST_HTTP_CODE -ne 401 ] || ! grep "NotAuthenticated" <<<"$REST_OUTPUT" >/dev/null; then
+		elif [ $REST_HTTP_CODE -ne 401 ]; then
 			test_failure "caldav url doesn't work: $REST_ERROR"
 		fi
 	fi