external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-03 00:07:05 +00:00
Code Issues Releases Wiki Activity

QA: updates for recent nextcloud changes

Browse Source
This commit is contained in:
downtownallday 2024-09-20 15:16:21 -04:00
parent 7e4b4ba70c
commit 62b691f44a
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/lib/python/browser/NextcloudAutomation.py
View File

@ -58,7 +58,10 @@ class NextcloudAutomation(object):
d.say("Logout of Nextcloud") d.say("Logout of Nextcloud")
self.click_avatar() 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: if not el:
# nc >= 26 # nc >= 26
el = d.find_el('#logout > a', throws=False) el = d.find_el('#logout > a', throws=False)
@ -72,7 +75,10 @@ class NextcloudAutomation(object):
d = self.d d = self.d
d.say("Open contacts") d.say("Open contacts")
# nc 25+ # 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: if not el:
# nc < 25 # nc < 25
el = d.find_el('header [data-id="contacts"]') el = d.find_el('header [data-id="contacts"]')

13
tests/suites/nextcloud/contacts.py
View File

@ -7,6 +7,7 @@
##### details. ##### details.
##### #####
from browser.automation import ( from browser.automation import (
TestDriver, TestDriver,
TimeoutException, TimeoutException,
@ -50,16 +51,20 @@ try:
# open Contacts # open Contacts
# #
d.start("Open contacts app") 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() nc.wait_for_app_load()
# #
# handle selected operation # handle selected operation
# #
if op=='exists': if op=='exists':
d.start("Check that contact %s exists", contact['email']) d.start("Check that contact %s exists", contact['email'])
contacts.click_contact(contact) # raises NoSuchElementException if not found contacts.click_contact(contact) # raises NoSuchElementException if not found
elif op=='delete': elif op=='delete':
d.start("Delete contact %s", contact['email']) d.start("Delete contact %s", contact['email'])
contacts.click_contact(contact) contacts.click_contact(contact)
@ -68,7 +73,7 @@ try:
elif op=='nop': elif op=='nop':
pass pass
else: else:
raise ValueError('Invalid operation: %s' % op) raise ValueError('Invalid operation: %s' % op)

4
tests/suites/remote-nextcloud.sh
View File

@ -172,7 +172,7 @@ test_web_config() {
record "output=$REST_OUTPUT" record "output=$REST_OUTPUT"
if [ $code -eq 0 ]; then if [ $code -eq 0 ]; then
test_failure "carddav url works, but expecting 401/NotAuthenticated from server" 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" test_failure "carddav url doesn't work: $REST_ERROR"
fi fi
fi fi
@ -189,7 +189,7 @@ test_web_config() {
record "output=$REST_OUTPUT" record "output=$REST_OUTPUT"
if [ $code -eq 0 ]; then if [ $code -eq 0 ]; then
test_failure "caldav url works, but expecting 401/NotAuthenticated from server" 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" test_failure "caldav url doesn't work: $REST_ERROR"
fi fi
fi fi