From 33d67d52389172974c70f182c0702edf68611aa1 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Mon, 20 Apr 2026 10:46:03 +0200
Subject: [PATCH] Fix tests

---
 test/test.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/test.js b/test/test.js
index e9f7eb3..b02d801 100755
--- a/test/test.js
+++ b/test/test.js
@@ -68,7 +68,7 @@ describe('Application life cycle test', function () {
         await sendKeys('#user_name', user);
         await sendKeys('#password', passwd);
         await click('//form[@action="/user/login"]//button');
-        await waitForElement('//img[contains(@class, "avatar")]');
+        await waitForElement('//nav//img[contains(@class, "avatar")]');
     }
 
     async function adminLogin() {
@@ -76,17 +76,24 @@ describe('Application life cycle test', function () {
     }
 
     async function loginGiteaOIDC() {
+        await clearCache();
+        await goto(`https://${app.fqdn}/user/login`, '//a[@href="/user/oauth2/cloudron"]');
+        await click('//a[@href="/user/oauth2/cloudron"]');
+        await loginOIDC('//nav//img[contains(@class, "avatar")]');
+    }
+
+    async function loginGiteaOIDCOld() {
         await clearCache();
         await goto(`https://${app.fqdn}/user/login`, '//a[contains(@class, "openidConnect")]');
         await click('//a[contains(@class, "openidConnect") and contains(., "Sign in with cloudron")]');
-        await loginOIDC('//img[contains(@class, "avatar")]');
+        await loginOIDC('//nav//img[contains(@class, "avatar")]');
     }
 
     async function logout() {
-        await goto(`https://${app.fqdn}`, '//img[contains(@class, "avatar")]');
-        await click('//img[contains(@class, "avatar")]');
-        await waitForElement('//a[@data-url="/user/logout"]');
-        await click('//a[@data-url="/user/logout"]');
+        await goto(`https://${app.fqdn}`, '//nav//img[contains(@class, "avatar")]');
+        await click('//nav//img[contains(@class, "avatar")]');
+        await waitForElement('//a[@href="/user/logout"]');
+        await click('//a[@href="/user/logout"]');
     }
 
     async function addPublicKey() {
@@ -211,7 +218,7 @@ describe('Application life cycle test', function () {
         cloudronCli.appstoreInstall({ tcpPortFlags: INSTALL_TCP_FLAGS });
     });
 
-    it('can login', loginGiteaOIDC);
+    it('can login', loginGiteaOIDCOld);
     it('can set avatar', setAvatar);
     it('can get avatar', checkAvatar);
     it('can add public key', addPublicKey);