From b6fce9a3a7ca48ff7b33765a174b3333f9e49a62 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Mon, 2 Jun 2025 18:41:00 +0200 Subject: [PATCH] every refresh wants license acceptance --- test/test.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/test/test.js b/test/test.js index e29e4c1..403085c 100644 --- a/test/test.js +++ b/test/test.js @@ -70,7 +70,6 @@ describe('Application life cycle test', function () { async function confirmLicense() { await timers.setTimeout(5000); - console.log('confirming license'); await waitForElement(By.id('acknowledge-confirm')); const button = await browser.findElement(By.id('acknowledge-confirm')); await browser.executeScript('arguments[0].scrollIntoView(false)', button); @@ -98,8 +97,10 @@ describe('Application life cycle test', function () { } async function logout() { - await browser.get(`https://${app.fqdn}/`); - await waitForElement(By.xpath('//span[contains(text(), "Buckets")]')); + await browser.sleep(10000); + // await browser.get(`https://${app.fqdn}/`); + await waitForElement(By.xpath('//button[contains(., "Create Bucket")]')); + const button = await browser.findElement(By.xpath('//button[@id="sign-out"]')); await browser.executeScript('arguments[0].scrollIntoView(false)', button); await button.click(); @@ -108,19 +109,20 @@ describe('Application life cycle test', function () { } async function addBucket() { - await browser.get(`https://${app.fqdn}/buckets`); + // await browser.get(`https://${app.fqdn}/buckets`); await waitForElement(By.xpath('//button[contains(., "Create Bucket")]')); await browser.findElement(By.xpath('//button[contains(., "Create Bucket")]')).click(); await browser.sleep(1000); await waitForElement(By.xpath('//input[@id="bucket-name"]')); await browser.findElement(By.xpath('//input[@id="bucket-name"]')).sendKeys(BUCKET); await browser.findElement(By.xpath('//button[@id="create-bucket"]')).click(); - await browser.get(`https://${app.fqdn}/buckets`); + // await browser.get(`https://${app.fqdn}/buckets`); await waitForElement(By.xpath(`//h1[contains(text(), "${BUCKET}")]`)); } async function checkBucket() { - await browser.get(`https://${app.fqdn}/buckets`); + await browser.sleep(10000); + // await browser.get(`https://${app.fqdn}/buckets`); await waitForElement(By.xpath(`//h1[contains(text(), "${BUCKET}")]`)); } @@ -156,7 +158,7 @@ describe('Application life cycle test', function () { xit('build app', function () { execSync('cloudron build', EXEC_ARGS); }); - xit('install app', async function () { + it('install app', async function () { execSync(`cloudron install --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS); await timers.setTimeout(10000); }); @@ -175,7 +177,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', true)); it('has bucket', checkBucket); it('can logout', logout); it('does redirect', checkRedirect); @@ -192,7 +194,7 @@ describe('Application life cycle test', function () { }); it('can get app information', getAppInfo); - it('can admin login', login.bind(null, 'minioakey', 'minioskey')); + it('can admin login', login.bind(null, 'minioakey', 'minioskey', true)); it('has bucket', checkBucket); it('can logout', logout); @@ -206,7 +208,7 @@ describe('Application life cycle test', function () { }); it('can get app information', getAppInfo); - it('can admin login', login.bind(null, 'minioakey', 'minioskey')); + it('can admin login', login.bind(null, 'minioakey', 'minioskey', true)); it('has bucket', checkBucket); it('can logout', logout); @@ -220,7 +222,7 @@ describe('Application life cycle test', function () { it('can get app information', getAppInfo); it('can get admin credentials', getAdminCredentials); - it('can admin login', async function () { await login('minioadmin', rootPassword); }); + it('can admin login', async () => await login('minioadmin', rootPassword, true)); it('can add buckets', addBucket); it('can logout', logout); @@ -228,7 +230,7 @@ describe('Application life cycle test', function () { 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', async function () { await login('minioadmin', rootPassword); }); + it('can admin login', async () => await login('minioadmin', rootPassword, true)); it('has bucket', checkBucket); it('can logout', logout); @@ -237,4 +239,3 @@ describe('Application life cycle test', function () { it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); }); }); -