From 6184782eb7b09be060014c2d5fe811806758b597 Mon Sep 17 00:00:00 2001 From: theresa Date: Thu, 12 Jan 2023 09:18:34 +0100 Subject: [PATCH] Tests: Refactor acceptance tests --- Makefile | 16 +++++++++------- frontend/testcaferc.json | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 436a37d8d..86de47091 100644 --- a/Makefile +++ b/Makefile @@ -62,13 +62,15 @@ test-commands: reset-sqlite run-test-commands test-photoprism: reset-sqlite run-test-photoprism test-short: reset-sqlite run-test-short test-mariadb: reset-acceptance run-test-mariadb -acceptance-run-chromium: storage/acceptance acceptance-auth-sqlite-restart acceptance-auth acceptance-auth-sqlite-stop acceptance-sqlite-restart acceptance acceptance-sqlite-stop -acceptance-run-chromium-short: storage/acceptance acceptance-auth-sqlite-restart acceptance-auth-short acceptance-auth-sqlite-stop acceptance-sqlite-restart acceptance-short acceptance-sqlite-stop -acceptance-auth-run-chromium: storage/acceptance acceptance-auth-sqlite-restart acceptance-auth acceptance-auth-sqlite-stop -acceptance-public-run-chromium: storage/acceptance acceptance-sqlite-restart acceptance acceptance-sqlite-stop -acceptance-run-firefox: storage/acceptance acceptance-auth-sqlite-restart acceptance-auth-firefox acceptance-auth-sqlite-stop acceptance-sqlite-restart acceptance-firefox acceptance-sqlite-stop -acceptance-auth-run-firefox: storage/acceptance acceptance-auth-sqlite-restart acceptance-auth-firefox acceptance-auth-sqlite-stop -acceptance-public-run-firefox: storage/acceptance acceptance-sqlite-restart acceptance-firefox acceptance-sqlite-stop +acceptance-run-chromium: storage/acceptance acceptance-auth-sqlite-restart wait acceptance-auth acceptance-auth-sqlite-stop acceptance-sqlite-restart wait acceptance acceptance-sqlite-stop +acceptance-run-chromium-short: storage/acceptance acceptance-auth-sqlite-restart wait acceptance-auth-short acceptance-auth-sqlite-stop acceptance-sqlite-restart wait acceptance-short acceptance-sqlite-stop +acceptance-auth-run-chromium: storage/acceptance acceptance-auth-sqlite-restart wait acceptance-auth acceptance-auth-sqlite-stop +acceptance-public-run-chromium: storage/acceptance acceptance-sqlite-restart wait acceptance acceptance-sqlite-stop +acceptance-run-firefox: storage/acceptance acceptance-auth-sqlite-restart wait acceptance-auth-firefox acceptance-auth-sqlite-stop acceptance-sqlite-restart wait acceptance-firefox acceptance-sqlite-stop +acceptance-auth-run-firefox: storage/acceptance acceptance-auth-sqlite-restart wait acceptance-auth-firefox acceptance-auth-sqlite-stop +acceptance-public-run-firefox: storage/acceptance acceptance-sqlite-restart wait acceptance-firefox acceptance-sqlite-stop +wait: + sleep 15 test-all: test acceptance-run-chromium fmt: fmt-js fmt-go clean-local: clean-local-config clean-local-cache diff --git a/frontend/testcaferc.json b/frontend/testcaferc.json index ce7155a11..c0c1db2e6 100644 --- a/frontend/testcaferc.json +++ b/frontend/testcaferc.json @@ -1,6 +1,6 @@ { "skipJsErrors": true, - "quarantineMode": true, + "quarantineMode": false, "selectorTimeout": 5000, "screenshots": { "path": "tests/acceptance/screenshots",