From 0008351e7cd57614e037d752d5f4993ef4c9a40f Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Mon, 23 Aug 2021 13:10:31 +0200 Subject: [PATCH] Fixup tests --- test/test.js | 343 +++++++++++++++------------------------------------ 1 file changed, 98 insertions(+), 245 deletions(-) diff --git a/test/test.js b/test/test.js index 9627ffc..da44cd3 100755 --- a/test/test.js +++ b/test/test.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -/* jslint node:true */ +/* jshint esversion: 8 */ /* global it:false */ /* global xit:false */ /* global describe:false */ @@ -54,247 +54,130 @@ describe('Application life cycle test', function () { function getAppInfo() { var inspect = JSON.parse(execSync('cloudron inspect')); - - app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0]; - + app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0]; expect(app).to.be.an('object'); } - function setAvatarOld(done) { - browser.get('https://' + app.fqdn + '/user/settings/avatar').then(function () { - return browser.findElement(By.xpath('//input[@type="file" and @name="avatar"]')).sendKeys(path.resolve(__dirname, '../logo.png')); - }).then(function () { - return browser.findElement(By.xpath('//button[contains(text(), "Update Avatar Setting")]')).click(); - }).then(function () { - if (app.manifest.version === '1.0.3') { - return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"updated successfully")]')), TIMEOUT); - } else { - return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"Your avatar setting has been updated.")]')), TIMEOUT); - } - }).then(function () { - done(); - }); + function sleep(millis) { + return new Promise(resolve => setTimeout(resolve, millis)); } - function setAvatar(done) { - if (app.manifest.version === '1.5.4') return setAvatarOld(done); + async function setAvatar() { + await browser.get('https://' + app.fqdn + '/user/settings'); - browser.get('https://' + app.fqdn + '/user/settings').then(function () { - var button = browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]')); - return browser.executeScript('arguments[0].scrollIntoView(false)', button); - }).then(function () { - return browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]')).click(); - }).then(function () { - return browser.findElement(By.xpath('//input[@type="file" and @name="avatar"]')).sendKeys(path.resolve(__dirname, '../logo.png')); - }).then(function () { - return browser.findElement(By.xpath('//button[contains(text(), "Update Avatar")]')).click(); - }).then(function () { - return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"Your avatar has been updated.")]')), TIMEOUT); - }).then(function () { - done(); - }); + var button = await browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]')); + await browser.executeScript('arguments[0].scrollIntoView(false)', button); + await browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]')).click(); + await browser.findElement(By.xpath('//input[@type="file" and @name="avatar"]')).sendKeys(path.resolve(__dirname, '../logo.png')); + await browser.findElement(By.xpath('//button[contains(text(), "Update Avatar")]')).click(); + await browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"Your avatar has been updated.")]')), TIMEOUT); } - function checkAvatar(done) { -return done(); - superagent.get('https://' + app.fqdn + '/avatars/a3e6f3316fc1738e29d621e6a26e93d3').end(function (error, result) { - expect(error).to.be(null); - expect(result.statusCode).to.be(200); - done(); - }); + async function checkAvatar() { + await browser.get(`https://${app.fqdn}/${username}`); + + var avatarSrc = await browser.findElement(By.xpath('//a[@id="profile-avatar"]/img')).getAttribute('src'); + + var avatar = await superagent.get(avatarSrc); + expect(avatar.statusCode).to.equal(200); } - function login(username, password, done) { - browser.get('https://' + app.fqdn + '/user/login').then(function () { - return browser.findElement(By.id('user_name')).sendKeys(username); - }).then(function () { - return browser.findElement(By.id('password')).sendKeys(password); - }).then(function () { - return browser.findElement(By.tagName('form')).submit(); - }).then(function () { - return browser.wait(until.elementLocated(By.linkText('Dashboard')), TIMEOUT); - }).then(function () { - done(); - }); + async function login(username, password) { + await browser.get('https://' + app.fqdn + '/user/login'); + + await browser.findElement(By.id('user_name')).sendKeys(username); + await browser.findElement(By.id('password')).sendKeys(password); + await browser.findElement(By.tagName('form')).submit(); + await browser.wait(until.elementLocated(By.linkText('Dashboard')), TIMEOUT); } - function adminLogin(done) { - login('root', 'changeme', done); + async function adminLogin() { + await login('root', 'changeme'); } - function logout(done) { - browser.get('https://' + app.fqdn).then(function () { - return browser.findElement(By.xpath('//img[contains(@class, "avatar")]')).click(); - }).then(function () { - browser.sleep(2000); - }).then(function () { - return browser.findElement(By.xpath('//a[@data-url="/user/logout"]')).click(); - }).then(function () { - browser.sleep(2000); - }).then(function () { - done(); - }); + async function logout() { + await browser.get('https://' + app.fqdn); + + await browser.findElement(By.xpath('//img[contains(@class, "avatar")]')).click(); + await sleep(2000); + await browser.findElement(By.xpath('//a[@data-url="/user/logout"]')).click(); + await sleep(2000); } - function addPublicKey(done) { + async function addPublicKey() { var publicKey = fs.readFileSync(__dirname + '/id_rsa.pub', 'utf8'); const sshPage = 'https://' + app.fqdn + '/user/settings/keys'; - browser.get(sshPage).then(function () { - return browser.findElement(By.xpath('//div[text()="Add Key"]')).click(); - }).then(function () { - return browser.findElement(By.id('ssh-key-title')).sendKeys('testkey'); - }).then(function () { - return browser.findElement(By.id('ssh-key-content')).sendKeys(publicKey.trim()); // #3480 - }).then(function () { - var button = browser.findElement(By.xpath('//button[contains(text(), "Add Key")]')); - return browser.executeScript('arguments[0].scrollIntoView(false)', button); - }).then(function () { - return browser.findElement(By.xpath('//button[contains(text(), "Add Key")]')).click(); - }).then(function () { - if (app.manifest.version === '1.0.3') { - return browser.wait(until.elementLocated(By.xpath('//p[contains(text(), "added successfully!")]')), TIMEOUT); - } else { - return browser.wait(until.elementLocated(By.xpath('//p[contains(text(), "has been added.")]')), TIMEOUT); - } - }).then(function () { - done(); - }); + await browser.get(sshPage); + + await browser.findElement(By.xpath('//div[text()="Add Key"]')).click(); + await browser.findElement(By.id('ssh-key-title')).sendKeys('testkey'); + await browser.findElement(By.id('ssh-key-content')).sendKeys(publicKey.trim()); // #3480 + var button = browser.findElement(By.xpath('//button[contains(text(), "Add Key")]')); + await browser.executeScript('arguments[0].scrollIntoView(false)', button); + await browser.findElement(By.xpath('//button[contains(text(), "Add Key")]')).click(); + + await browser.wait(until.elementLocated(By.xpath('//p[contains(text(), "has been added.")]')), TIMEOUT); } - function createRepo(done) { - var getRepoPage; - if (app.manifest.version === '1.0.3') { - getRepoPage = browser.get('https://' + app.fqdn).then(function () { - return browser.findElement(By.linkText('New Repository')).click(); - }).then(function () { - return browser.wait(until.elementLocated(By.xpath('//*[contains(text(), "New Repository")]')), TIMEOUT); + async function createRepo() { + var getRepoPage = await browser.get('https://' + app.fqdn + '/repo/create'); + + await browser.findElement(By.id('repo_name')).sendKeys(reponame); + var button = browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]')); + await browser.executeScript('arguments[0].scrollIntoView(true)', button); + await browser.findElement(By.id('auto-init')).click(); + await browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]')).click(); + + await browser.wait(function () { + return browser.getCurrentUrl().then(function (url) { + return url === 'https://' + app.fqdn + '/' + username + '/' + reponame; }); - } else { - getRepoPage = browser.get('https://' + app.fqdn + '/repo/create'); - } - - getRepoPage.then(function () { - return browser.findElement(By.id('repo_name')).sendKeys(reponame); - }).then(function () { - var button = browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]')); - return browser.executeScript('arguments[0].scrollIntoView(true)', button); - }).then(function () { - return browser.findElement(By.id('auto-init')).click(); - }).then(function () { - return browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]')).click(); - }).then(function () { - browser.wait(function () { - return browser.getCurrentUrl().then(function (url) { - return url === 'https://' + app.fqdn + '/' + username + '/' + reponame; - }); - }, TIMEOUT); - }).then(function () { - done(); - }); + }, TIMEOUT); } - function checkCloneUrl(done) { - browser.get('https://' + app.fqdn + '/' + username + '/' + reponame).then(function () { - return browser.findElement(By.id('repo-clone-ssh')).click(); - }).then(function () { - return browser.findElement(By.id('repo-clone-url')).getAttribute('value'); - }).then(function (cloneUrl) { - expect(cloneUrl).to.be(`ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame}.git`); - done(); - }); + async function checkCloneUrl() { + await browser.get('https://' + app.fqdn + '/' + username + '/' + reponame); + await browser.findElement(By.id('repo-clone-ssh')).click(); + + var cloneUrl = await browser.findElement(By.id('repo-clone-url')).getAttribute('value'); + expect(cloneUrl).to.be(`ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame}.git`); } - function cloneRepo(done) { + function cloneRepo() { rimraf.sync(repodir); var env = Object.create(process.env); env.GIT_SSH = __dirname + '/git_ssh_wrapper.sh'; execSync(`git clone ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame}.git ${repodir}`, { env: env }); - done(); } - function pushFile(done) { + function pushFile() { var env = Object.create(process.env); env.GIT_SSH = __dirname + '/git_ssh_wrapper.sh'; execSync(`touch newfile && git add newfile && git commit -a -mx && git push ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame} master`, { env: env, cwd: repodir }); rimraf.sync('/tmp/testrepo'); - done(); - } - - function addCustomFile(done) { - fs.writeFileSync('/tmp/customfile.txt', 'GOGS TEST', 'utf8'); - execSync(`cloudron exec --app ${app.id} -- mkdir -p /app/data/custom/public`); - execSync(`cloudron push --app ${app.id} /tmp/customfile.txt /app/data/custom/public/customfile.txt`); - fs.unlinkSync('/tmp/customfile.txt'); - done(); - } - - function checkCustomFile(done) { - superagent.get('https://' + app.fqdn + '/customfile.txt').end(function (error, result) { - if (error) return done(error); - - expect(result.text).to.contain('GOGS TEST'); - done(); - }); } function fileExists() { expect(fs.existsSync(repodir + '/newfile')).to.be(true); } - function sendMail(done) { - browser.get(`https://${app.fqdn}/admin/config`).then(function () { - var button = browser.findElement(By.xpath('//button[@id="test-mail-btn"]')); - return browser.executeScript('arguments[0].scrollIntoView(true)', button); - }).then(function () { - return browser.findElement(By.xpath('//input[@name="email"]')).sendKeys('test@cloudron.io'); - }).then(function () { - return browser.findElement(By.xpath('//button[@id="test-mail-btn"]')).click(); - }).then(function () { - return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"A testing email has been sent to \'test@cloudron.io\'")]')), TIMEOUT); - }).then(function () { - done(); - }); + async function sendMail() { + await browser.get(`https://${app.fqdn}/admin/config`); + + var button = await browser.findElement(By.xpath('//button[@id="test-mail-btn"]')); + await browser.executeScript('arguments[0].scrollIntoView(true)', button); + await browser.findElement(By.xpath('//input[@name="email"]')).sendKeys('test@cloudron.io'); + await browser.findElement(By.xpath('//button[@id="test-mail-btn"]')).click(); + await browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"A testing email has been sent to \'test@cloudron.io\'")]')), TIMEOUT); } xit('build app', function () { execSync('cloudron build', EXEC_ARGS); }); - - // it('can login', function (done) { - // var inspect = JSON.parse(execSync('cloudron inspect')); - - // superagent.post(`https://${inspect.apiEndpoint}/api/v1/developer/login`).send({ - // username: username, - // password: password - // }).end(function (error, result) { - // if (error) return done(error); - // if (result.statusCode !== 200) return done(new Error('Login failed with status ' + result.statusCode)); - - // token = result.body.accessToken; - - // superagent.get(`https://${inspect.apiEndpoint}/api/v1/profile`) - // .query({ access_token: token }).end(function (error, result) { - // if (error) return done(error); - // if (result.statusCode !== 200) return done(new Error('Get profile failed with status ' + result.statusCode)); - - // email = result.body.email; - // done(); - // }); - // }); - // }); - it('install app', function () { execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); }); it('can get app information', getAppInfo); - it('can get the main page', function (done) { - superagent.get('https://' + app.fqdn).end(function (error, result) { - expect(error).to.be(null); - expect(result.status).to.eql(200); - - done(); - }); - }); it('can admin login', adminLogin); it('can send mail', sendMail); @@ -314,9 +197,6 @@ return done(); it('can add and push a file', pushFile); - it('can add custom file', addCustomFile); - it('can check custom file', checkCustomFile); - it('can restart app', function () { execSync('cloudron restart --app ' + app.id); }); xit('can login', login.bind(null, username, password)); // no need to relogin since session persists @@ -332,18 +212,14 @@ return done(); it('can clone the url', cloneRepo); it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); }); - it('move to different location', function (done) { + it('move to different location', async function () { //browser.manage().deleteAllCookies(); // commented because of error "'Network.deleteCookie' wasn't found" // ensure we don't hit NXDOMAIN in the mean time - browser.get('about:blank').then(function () { - execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, EXEC_ARGS); - var inspect = JSON.parse(execSync('cloudron inspect')); - app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0]; - expect(app).to.be.an('object'); + await browser.get('about:blank'); - done(); - }); + execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, EXEC_ARGS); }); + it('can get app information', getAppInfo); it('can login', login.bind(null, username, password)); it('can get avatar', checkAvatar); @@ -351,57 +227,38 @@ return done(); it('can clone the url', cloneRepo); it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); }); - it('uninstall app', function (done) { + it('uninstall app', async function () { // ensure we don't hit NXDOMAIN in the mean time - browser.get('about:blank').then(function () { - execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); - done(); - }); + await browser.get('about:blank'); + execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); }); // check if the _first_ login via email succeeds - it('can login via email', function (done) { - execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); - var inspect = JSON.parse(execSync('cloudron inspect')); + it('can login via email', async function () { execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); }); - app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0]; - expect(app).to.be.an('object'); + it('can get app information', getAppInfo); + it('can login', login.bind(null, email, password)); - login(email, password, function (error) { - if (error) return done(error); - - // ensure we don't hit NXDOMAIN in the mean time - browser.get('about:blank').then(function () { - execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); - done(); - }); - }); + it('uninstall app', async function () { + // ensure we don't hit NXDOMAIN in the mean time + await browser.get('about:blank'); + execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); }); // No SSO - it('install app (no sso)', function () { - execSync(`cloudron install --no-sso --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); - }); - - it('can get app information', function () { - var inspect = JSON.parse(execSync('cloudron inspect')); - - app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0]; - - expect(app).to.be.an('object'); - }); + it('install app (no sso)', function () { execSync(`cloudron install --no-sso --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); }); + it('can get app information', getAppInfo); it('can admin login (no sso)', adminLogin); it('can logout', logout); - it('uninstall app (no sso)', function () { + it('uninstall app (no sso)', async function () { + await browser.get('about:blank'); execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); }); // test update - it('can install app', function () { - execSync(`cloudron install --appstore-id ${app.manifest.id} --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); - }); + it('can install app', function () { execSync(`cloudron install --appstore-id ${app.manifest.id} --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); }); it('can get app information', getAppInfo); it('can login', login.bind(null, username, password)); @@ -412,9 +269,7 @@ return done(); it('can clone the url', cloneRepo); it('can add and push a file', pushFile); - it('can update', function () { - execSync('cloudron update --app ' + app.id, EXEC_ARGS); - }); + it('can update', function () { execSync('cloudron update --app ' + app.id, EXEC_ARGS); }); xit('can admin login', adminLogin); xit('can send mail', sendMail); @@ -425,11 +280,9 @@ return done(); it('can clone the url', cloneRepo); it('file exists in cloned repo', fileExists); - it('uninstall app', function (done) { + it('uninstall app', async function () { // ensure we don't hit NXDOMAIN in the mean time - browser.get('about:blank').then(function () { - execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); - done(); - }); + await browser.get('about:blank'); + execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); }); });