From 623b291e62f5b48edff9e357fc903d560cf7a9df Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Tue, 20 Feb 2024 13:26:29 +0100
Subject: [PATCH] Fixup tests

---
 test/test.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/test/test.js b/test/test.js
index 597be59..12bf679 100644
--- a/test/test.js
+++ b/test/test.js
@@ -57,14 +57,15 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     }
 
-    async function login(username, password) {
+    async function login(username, password, expandLoginForm=true) {
         await browser.manage().deleteAllCookies();
         await browser.get('about:blank');
         await browser.sleep(2000);
         await browser.get(`https://${app.fqdn}/login`);
         await browser.sleep(2000);
 
-        if (await browser.findElements(By.id('accessKey')).then(found => !found.length) && await browser.findElements(By.id('alternativeMethods-select')).then(found => !!found.length)) {
+        if (expandLoginForm) {
+            await waitForElement(By.xpath('//div[@id="alternativeMethods-select"]/div[contains(., "Other Authentication Methods")]'));
             await browser.findElement(By.xpath('//div[@id="alternativeMethods-select"]/div[contains(., "Other Authentication Methods")]')).click();
             await browser.sleep(2000);
             await browser.findElement(By.xpath('//li[contains(., "Use Credentials")] | //div[@label="Use Credentials"]')).click();
@@ -165,7 +166,7 @@ describe('Application life cycle test', function () {
 
     it('can get app information', getAppInfo);
 
-    it('can admin login', login.bind(null, 'minioadmin', 'minioadmin'));
+    it('can admin login', login.bind(null, 'minioadmin', 'minioadmin', false));
     it('can add bucket', addBucket);
     it('can logout', logout);
     it('does redirect', checkRedirect);
@@ -177,7 +178,7 @@ describe('Application life cycle test', function () {
         await timers.setTimeout(10000);
     });
 
-    it('can admin login', login.bind(null, 'minioakey', 'minioskey'));
+    it('can admin login', login.bind(null, 'minioakey', 'minioskey', false));
     it('has bucket', checkBucket);
     it('can logout', logout);
     it('does redirect', checkRedirect);
@@ -265,29 +266,26 @@ describe('Application life cycle test', function () {
     it('can install app for update', function () { execSync('cloudron install --appstore-id io.minio.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
     it('can get app information', getAppInfo);
 
-    it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
+    it('can get admin credentials', getAdminCredentials);
+    it('can admin login', async function () { await login('minioadmin', rootPassword); });
     it('can add buckets', addBucket);
     it('can logout', logout);
 
-    /* should be added on the next release
     it('can OIDC login', loginOIDC.bind(null, username, password));
     it('has bucket', checkBucket);
     it('can logout', logout);
-    */
 
     it('can update', function () { execSync(`cloudron update --app ${LOCATION}`, EXEC_ARGS); });
     it('can configure', function () { execSync(`cloudron configure --app ${LOCATION} --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS); });
     it('can get app information', getAppInfo);
 
-    it('can admin login', login.bind(null, 'minioadmin', 'minioadmin'));
+    it('can admin login', async function () { await login('minioadmin', rootPassword); });
     it('has bucket', checkBucket);
     it('can logout', logout);
 
-    /* should be added on the next release
     it('can OIDC login', loginOIDC.bind(null, username, password));
     it('has bucket', checkBucket);
     it('can logout', logout);
-    */
 
     it('does redirect', checkRedirect);
     it('check api', checkApi);