From 3a237b02c567fc0521bd36c6b8b5820bcbcb6fdf Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Fri, 18 Jul 2025 20:05:20 +0200
Subject: [PATCH] build(e2e): make new sync test setup work

---
 docker-compose.webdav-e2e.yaml   | 16 ----------------
 docker-compose.yaml              |  8 +++++++-
 e2e/commands/setupWebdavSync.ts  |  4 ++--
 e2e/nightwatch.conf.js           |  2 +-
 e2e/src/sync/webdav-basic.e2e.ts |  2 +-
 package.json                     |  2 +-
 6 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 docker-compose.webdav-e2e.yaml

diff --git a/docker-compose.webdav-e2e.yaml b/docker-compose.webdav-e2e.yaml
deleted file mode 100644
index d54328b2c..000000000
--- a/docker-compose.webdav-e2e.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-services:
-  webdav:
-    image: hacdias/webdav:latest
-    ports:
-      - '2345:2345'
-    volumes:
-      - ./webdav.yaml:/config.yml:ro
-      - ./e2e-webdav-data:/data
-    environment:
-      - WEBDAV_CONFIG=/config.yml
-    healthcheck:
-      test: ['CMD', 'wget', '--quiet', '--tries=1', '--spider', 'http://localhost:2345/']
-      interval: 10s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b50981d51..b6a8aede8 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -20,4 +20,10 @@ services:
       - '2345:2345'
     volumes:
       - ./webdav.yaml:/config.yml:ro
-      - ./data:/data
+      - ${WEBDAV_DATA_DIR:-./data}:/data
+    healthcheck:
+      test: ['CMD', 'wget', '--quiet', '--tries=1', '--spider', 'http://localhost:2345/']
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
diff --git a/e2e/commands/setupWebdavSync.ts b/e2e/commands/setupWebdavSync.ts
index a0edc1541..992d02603 100644
--- a/e2e/commands/setupWebdavSync.ts
+++ b/e2e/commands/setupWebdavSync.ts
@@ -30,8 +30,8 @@ module.exports = {
       .pause(100)
 
       .setValue(sel.baseUrlInput, 'http://localhost:2345')
-      .setValue(sel.userNameInput, 'alice')
-      .setValue(sel.passwordInput, 'alice')
+      .setValue(sel.userNameInput, 'admin')
+      .setValue(sel.passwordInput, 'admin')
       .setValue(sel.syncFolder, '/')
       .pause(100)
 
diff --git a/e2e/nightwatch.conf.js b/e2e/nightwatch.conf.js
index 1e0d2b76d..1c33043f6 100644
--- a/e2e/nightwatch.conf.js
+++ b/e2e/nightwatch.conf.js
@@ -22,7 +22,7 @@ module.exports = {
         browserName: 'chrome',
         chromeOptions: {
           args: [
-            '--headless',
+            // '--headless',
             '--disable-gpu',
             '--window-size=1280,800',
             '--no-sandbox',
diff --git a/e2e/src/sync/webdav-basic.e2e.ts b/e2e/src/sync/webdav-basic.e2e.ts
index e87d6211b..77f865872 100644
--- a/e2e/src/sync/webdav-basic.e2e.ts
+++ b/e2e/src/sync/webdav-basic.e2e.ts
@@ -26,7 +26,7 @@ module.exports = {
       .pause(3000)
       // .noError()
       .assert.not.elementPresent('.sync-btn mat-icon.spin')
-      .assert.textContains('.sync-btn mat-icon', 'check')
+      .assert.textContains('.sync-btn mat-icon:nth-of-type(2)', 'check')
       .end();
   },
 };
diff --git a/package.json b/package.json
index 61ec7e687..ebe70e5a2 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "droid": "npm run buildFrontend:stageWeb:unminified && npx cap sync",
     "e2e": "cross-env TZ='Europe/Berlin' DETECT_CHROMEDRIVER_VERSION=true SKIP_POST_INSTALL=true npm i -D chromedriver --legacy-peer-deps && tsc --project e2e/tsconfig.e2e.json && start-server-and-test 'ng serve --no-live-reload' http://localhost:4200 'nightwatch -c ./e2e/nightwatch.conf.js --suiteRetries 1 --retries 1'",
     "e2e:tag": "killall chromedriver; rm -R ./.tmp/out-tsc; tsc --project e2e/tsconfig.e2e.json && nightwatch -c ./e2e/nightwatch.conf.js --suiteRetries 0 --retries 0 --tag ",
-    "e2e:webdav": "docker compose -f docker-compose.webdav-e2e.yaml up -d && sleep 5 && npm run e2e:tag webdav; docker compose -f docker-compose.webdav-e2e.yaml down",
+    "e2e:webdav": "WEBDAV_DATA_DIR=./e2e-webdav-data docker compose up -d webdav && sleep 5 && npm run e2e:tag webdav; docker compose down",
     "electron": "NODE_ENV=PROD electron .",
     "electron:build": "tsc -p electron/tsconfig.electron.json",
     "electron:watch": "tsc -p electron/tsconfig.electron.json --watch",