Update package version to 1.38.0

| datasource      | package        | from   | to     |
| --------------- | -------------- | ------ | ------ |
| github-releases | go-gitea/gitea | 1.25.5 | 1.26.0 |

CHANGELOG.md

@@ -1952,3 +1952,45 @@
 * BUGFIXES Fix SVG size calulation, only use `style` attribute ([#​36133](https://github.com/go-gitea/gitea/issues/36133)) ([#​36134](https://github.com/go-gitea/gitea/issues/36134))
 * BUGFIXES Make Golang correctly delete temp files during uploading ([#​36128](https://github.com/go-gitea/gitea/issues/36128)) ([#​36129](https://github.com/go-gitea/gitea/issues/36129))
 
+[1.37.4]
+* Update gitea to 1.25.4
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.25.4)
+* Release attachments must belong to the intended repo ([#36347](https://github.com/go-gitea/gitea/issues/36347)) ([#36375](https://github.com/go-gitea/gitea/issues/36375))
+* Fix permission check on org project operations ([#36318](https://github.com/go-gitea/gitea/issues/36318)) ([#36373](https://github.com/go-gitea/gitea/issues/36373))
+* Clean watches when make a repository private and check permission when send release emails ([#36319](https://github.com/go-gitea/gitea/issues/36319)) ([#36370](https://github.com/go-gitea/gitea/issues/36370))
+* Add more check for stopwatch read or list ([#36340](https://github.com/go-gitea/gitea/issues/36340)) ([#36368](https://github.com/go-gitea/gitea/issues/36368))
+* Fix openid setting check ([#36346](https://github.com/go-gitea/gitea/issues/36346)) ([#36361](https://github.com/go-gitea/gitea/issues/36361))
+* Fix cancel auto merge bug ([#36341](https://github.com/go-gitea/gitea/issues/36341)) ([#36356](https://github.com/go-gitea/gitea/issues/36356))
+* Fix delete attachment check ([#36320](https://github.com/go-gitea/gitea/issues/36320)) ([#36355](https://github.com/go-gitea/gitea/issues/36355))
+* LFS locks must belong to the intended repo ([#36344](https://github.com/go-gitea/gitea/issues/36344)) ([#36349](https://github.com/go-gitea/gitea/issues/36349))
+* Fix bug on notification read ([#36339](https://github.com/go-gitea/gitea/issues/36339)) [#36387](https://github.com/go-gitea/gitea/issues/36387)
+* Add more routes to the "expensive" list ([#36290](https://github.com/go-gitea/gitea/issues/36290))
+
+[1.37.5]
+* Update gitea to 1.25.5
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.25.5)
+* Make `security-check` informational only
+* Upgrade to github.com/cloudflare/circl 1.6.3, svgo 4.0.1, markdownlint-cli 0.48.0
+* Add some validation on values provided to USER_DISABLED_FEATURES and EXTERNAL_USER_DISABLED_FEATURES
+* Upgrade gogit to 5.16.5
+* Add wrap to runner label list
+* Add dnf5 command for Fedora in RPM package instructions
+* Allow scroll propagation outside code editor
+* Fix non-admins unable to automerge MRs from forks
+* Fix bug when pushing mirror with wiki
+* Fix artifacts v4 backend upload problems
+
+[1.38.0]
+* Update gitea to 1.26.0
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.26.0)
+* Correct swagger annotations for enums, status codes, and notification state ([#37030](https://github.com/go-gitea/gitea/issues/37030))
+* Remove GET API registration-token ([#36801](https://github.com/go-gitea/gitea/issues/36801))
+* Support Actions `concurrency` syntax ([#32751](https://github.com/go-gitea/gitea/issues/32751))
+* Make PUBLIC_URL_DETECTION default to "auto" ([#36955](https://github.com/go-gitea/gitea/issues/36955))
+* Add terraform state registry ([#36710](https://github.com/go-gitea/gitea/issues/36710))
+* Instance-wide (global) info banner and maintenance mode ([#36571](https://github.com/go-gitea/gitea/issues/36571))
+* Support rendering OpenAPI spec ([#36449](https://github.com/go-gitea/gitea/issues/36449))
+* Add keyboard shortcuts for repository file and code search ([#36416](https://github.com/go-gitea/gitea/issues/36416))
+* Automatic generation of release notes ([#35977](https://github.com/go-gitea/gitea/issues/35977))
+* Add button to re-run failed jobs in Actions ([#36924](https://github.com/go-gitea/gitea/issues/36924))
+

CloudronManifest.json

@@ -4,8 +4,8 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.37.3",
-  "upstreamVersion": "1.25.3",
+  "version": "1.38.0",
+  "upstreamVersion": "1.26.0",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,

Dockerfile

@@ -18,7 +18,7 @@ WORKDIR /home/git
 ENV GNUPGHOME="/app/data/gnupg"
 
 # renovate: datasource=github-releases depName=go-gitea/gitea versioning=semver extractVersion=^v(?<version>.+)$
-ARG GITEA_VERSION=1.25.3
+ARG GITEA_VERSION=1.26.0
 
 RUN mkdir -p /home/git/gitea && \
     curl -L https://github.com/go-gitea/gitea/releases/download/v${GITEA_VERSION}/gitea-${GITEA_VERSION}-linux-amd64 -o /home/git/gitea/gitea \

app.ini.template

@@ -91,8 +91,6 @@ ROOT_PATH = /run/gitea
 ; APP_DATA_PATH/avatars
 AVATAR_UPLOAD_PATH =
 GRAVATAR_SOURCE = gravatar
-DISABLE_GRAVATAR = false
-
 
 [attachment]
 ENABLE = true

start.sh

@@ -15,17 +15,6 @@ setup_oidc_source() {
         "REPLACE INTO login_source (id, type, name, is_active, cfg, created_unix, updated_unix) VALUES (1,6,'cloudron', 1,'{\"Provider\":\"openidConnect\",\"ClientID\":\"${CLOUDRON_OIDC_CLIENT_ID}\",\"ClientSecret\":\"${CLOUDRON_OIDC_CLIENT_SECRET}\",\"OpenIDConnectAutoDiscoveryURL\":\"${CLOUDRON_OIDC_ISSUER}/.well-known/openid-configuration\",\"CustomURLMapping\":null,\"IconURL\":\"\",\"Scopes\":[\"openid email profile\"],\"RequiredClaimName\":\"\",\"RequiredClaimValue\":\"\",\"GroupClaimName\":\"\",\"AdminGroup\":\"\",\"GroupTeamMap\":\"\",\"GroupTeamMapRemoval\":false,\"RestrictedGroup\":\"\"}','${now}','${now}')"
 }
 
-setup_root_user() {
-    set -eu
-
-    if sudo -H -u git /home/git/gitea/gitea admin user create --username root --password changeme --email admin@cloudron.local --admin -c /run/gitea/app.ini; then
-        echo "==> root user added"
-    else
-        echo "==> Failed to add root user"
-        exit 1
-    fi
-}
-
 setup_auth() {
     set -eu
 
@@ -45,7 +34,12 @@ setup_auth() {
     # be careful, not to create root user for existing LDAP based installs
     if [[ "${user_count}" == "0" ]]; then
         echo "==> Setting up root user for first run"
-        setup_root_user
+        if sudo -H -u git /home/git/gitea/gitea admin user create --username root --password changeme --email admin@cloudron.local --admin -c /run/gitea/app.ini; then
+            echo "==> root user added"
+        else
+            echo "==> Failed to add root user"
+            exit 1
+        fi
     fi
 }
 
@@ -124,7 +118,12 @@ echo "==> Creating dirs and changing permissions"
 mkdir -p /app/data/repository /app/data/ssh /app/data/custom /app/data/gnupg
 chown -R git:git /app/data /run/gitea
 
-# this expects app.ini to be available
+# OIDC creds are read from the db at gitea startup, so if migrations have already
+# run (i.e. the user table exists), refresh the OIDC source synchronously now.
+if mysql -u"${CLOUDRON_MYSQL_USERNAME}" -p"${CLOUDRON_MYSQL_PASSWORD}" -h"${CLOUDRON_MYSQL_HOST}" -P"${CLOUDRON_MYSQL_PORT}" --database="${CLOUDRON_MYSQL_DATABASE}" -N -B -e "SELECT count(*) FROM user" >/dev/null 2>&1; then
+    [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]] && setup_oidc_source
+else
     ( setup_auth ) &
+fi
 
 exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i Gitea

test/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "test.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "chromedriver": "^143.0.3",
-    "expect.js": "^0.3.1",
-    "mocha": "^11.7.5",
-    "selenium-webdriver": "^4.39.0",
-    "superagent": "^10.2.3"
-  }
-}

test/test.js

@@ -1,214 +1,152 @@
 #!/usr/bin/env node
 
-/* jshint esversion: 8 */
-/* global it, xit, describe, before, after, afterEach */
+import assert from 'node:assert/strict';
+import { execSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import superagent from '@cloudron/superagent';
+import {
+    app,
+    clearCache,
+    click,
+    cloudronCli,
+    executeScript,
+    goto,
+    loginOIDC,
+    scrollIntoView,
+    sendKeys,
+    setInputFiles,
+    setupBrowser,
+    takeScreenshot,
+    teardownBrowser,
+    username,
+    waitForElement,
+    waitForPath
+} from '@cloudron/charlie';
 
-'use strict';
+/* global it, describe, before, after, afterEach */
 
-require('chromedriver');
-
-const execSync = require('child_process').execSync,
-    expect = require('expect.js'),
-    fs = require('fs'),
-    path = require('path'),
-    superagent = require('superagent'),
-    { Builder, By, until } = require('selenium-webdriver'),
-    { Options } = require('selenium-webdriver/chrome');
-
-if (!process.env.USERNAME || !process.env.PASSWORD || !process.env.EMAIL) {
-    console.log('USERNAME, PASSWORD and EMAIL env vars need to be set');
-    process.exit(1);
-}
-
-describe('Application life cycle test', function () {
-    this.timeout(0);
-
-    const TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 5000;
-    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
-    const LOCATION = process.env.LOCATION || 'test';
 const SSH_PORT = 29420;
-
-    let app, browser;
-
+const INSTALL_TCP_FLAGS = { SSH_PORT };
 const repodir = '/tmp/testrepo';
 const reponame = 'testrepo';
 
-    const username = process.env.USERNAME;
-    const password = process.env.PASSWORD;
-
-    before(function () {
-        const chromeOptions = new Options().windowSize({ width: 1280, height: 1024 });
-        if (process.env.CI) chromeOptions.addArguments('no-sandbox', 'disable-dev-shm-usage', 'headless');
-        browser = new Builder().forBrowser('chrome').setChromeOptions(chromeOptions).build();
-        if (!fs.existsSync('./screenshots')) fs.mkdirSync('./screenshots');
-    });
-
-    after(function () {
-        browser.quit();
+describe('Application life cycle test', function () {
+    before(setupBrowser);
+    after(async function () {
+        await teardownBrowser();
         fs.rmSync(repodir, { recursive: true, force: true });
     });
 
     afterEach(async function () {
-        if (!process.env.CI || !app) return;
-
-        const currentUrl = await browser.getCurrentUrl();
-        if (!currentUrl.includes(app.domain)) return;
-        expect(this.currentTest.title).to.be.a('string');
-
-        const screenshotData = await browser.takeScreenshot();
-        fs.writeFileSync(`./screenshots/${new Date().getTime()}-${this.currentTest.title.replaceAll(' ', '_')}.png`, screenshotData, 'base64');
+        await takeScreenshot(this.currentTest.title);
     });
 
-    function getAppInfo() {
-        const inspect = JSON.parse(execSync('cloudron inspect'));
-        app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
-        expect(app).to.be.an('object');
-    }
-
-    async function waitForElement(elem) {
-        await browser.wait(until.elementLocated(elem), TIMEOUT);
-        await browser.wait(until.elementIsVisible(browser.findElement(elem)), TIMEOUT);
-    }
-
-    function sleep(millis) {
-        return new Promise(resolve => setTimeout(resolve, millis));
-    }
-
     async function setAvatar() {
-        await browser.get('https://' + app.fqdn + '/user/settings');
-
-        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);
+        await goto(`https://${app.fqdn}/user/settings`, '//label[contains(text(), "Use Custom Avatar")]');
+        await scrollIntoView('//label[contains(text(), "Use Custom Avatar")]');
+        await click('//label[contains(text(), "Use Custom Avatar")]');
+        await setInputFiles('//input[@type="file" and @name="avatar"]', path.resolve(import.meta.dirname, '../logo.png'));
+        await click('//button[contains(text(), "Update Avatar")]');
+        await waitForElement('//p[contains(text(),"Your avatar has been updated.")]');
     }
 
     async function checkAvatar() {
-        await browser.get(`https://${app.fqdn}/${username}`);
-
-        const avatarSrc = await browser.findElement(By.xpath('//div[@id="profile-avatar"]/a/img')).getAttribute('src');
-
-        const response = await superagent.get(avatarSrc);
-        expect(response.statusCode).to.equal(200);
+        await goto(`https://${app.fqdn}/${username}`, '//div[@id="profile-avatar"]/a/img');
+        const avatarSrc = await executeScript(() => {
+            const el = document.querySelector('#profile-avatar a img');
+            return el ? el.getAttribute('src') : null;
+        });
+        assert.ok(avatarSrc);
+        const avatarUrl = new URL(avatarSrc, `https://${app.fqdn}`).href;
+        const response = await superagent.get(avatarUrl);
+        assert.strictEqual(response.status, 200);
     }
 
-    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.xpath('//form[@action="/user/login"]//button')).click();
-        await browser.wait(until.elementLocated(By.xpath('//img[contains(@class, "avatar")]')), TIMEOUT);
+    async function login(user, passwd) {
+        await goto(`https://${app.fqdn}/user/login`, '#user_name');
+        await sendKeys('#user_name', user);
+        await sendKeys('#password', passwd);
+        await click('//form[@action="/user/login"]//button');
+        await waitForElement('//nav//img[contains(@class, "avatar")]');
     }
 
     async function adminLogin() {
         await login('root', 'changeme');
     }
 
-    async function loginOIDC(username, password, alreadyAuthenticated = true) {
-        browser.manage().deleteAllCookies();
-        await browser.get(`https://${app.fqdn}/user/login`);
-        await browser.sleep(2000);
-
-
-        await browser.findElement(By.xpath('//a[contains(@class, "openidConnect") and contains(., "Sign in with cloudron")]')).click();
-        await browser.sleep(2000);
-
-        if (!alreadyAuthenticated) {
-            await waitForElement(By.id('inputUsername'));
-            await browser.findElement(By.id('inputUsername')).sendKeys(username);
-            await browser.findElement(By.id('inputPassword')).sendKeys(password);
-            await browser.sleep(2000);
-            await browser.findElement(By.id('loginSubmitButton')).click();
-            await browser.sleep(2000);
+    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")]');
     }
 
-        await waitForElement(By.xpath('//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('//nav//img[contains(@class, "avatar")]');
     }
 
     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);
+        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() {
-        const publicKey = fs.readFileSync(__dirname + '/id_ed25519.pub', 'utf8');
-        execSync(`chmod g-rw,o-rw ${__dirname}/id_ed25519`); // ssh will complain about perms later
+        const keyPath = path.join(import.meta.dirname, 'id_ed25519');
+        fs.chmodSync(keyPath, 0o600);
 
-        await browser.get('https://' + app.fqdn + '/user/settings/keys');
-
-        await browser.wait(until.elementLocated(By.id('add-ssh-button')), TIMEOUT);
-        await browser.findElement(By.id('add-ssh-button')).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('//form//button[contains(text(),"Add Key")]')).click();
-
-        await browser.wait(until.elementLocated(By.xpath('//p[contains(text(), "has been added.")]')), TIMEOUT);
+        await goto(`https://${app.fqdn}/user/settings/keys`, '#add-ssh-button');
+        await click('#add-ssh-button');
+        await sendKeys('#ssh-key-title', 'testkey');
+        await sendKeys('#ssh-key-content', fs.readFileSync(`${import.meta.dirname}/id_ed25519.pub`, 'utf8').trim());
+        await scrollIntoView('//button[contains(text(), "Add Key")]');
+        await click('//form//button[contains(text(),"Add Key")]');
+        await waitForElement('//p[contains(text(), "has been added.")]');
     }
 
     async function createRepo() {
-        await browser.get(`https://${app.fqdn}/repo/create`);
-        await browser.wait(until.elementLocated(By.id('repo_name')));
-        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;
-            });
-        }, TIMEOUT);
+        await goto(`https://${app.fqdn}/repo/create`, '#repo_name');
+        await sendKeys('#repo_name', reponame);
+        await scrollIntoView('//button[contains(text(), "Create Repository")]');
+        await click('#auto-init');
+        await click('//button[contains(text(), "Create Repository")]');
+        await waitForPath(`/${username}/${reponame}`);
     }
 
     function cloneRepo() {
         fs.rmSync(repodir, { recursive: true, force: true });
-        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 });
+        const env = Object.create(process.env);
+        env.GIT_SSH = path.join(import.meta.dirname, 'git_ssh_wrapper.sh');
+        execSync(`git clone ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame}.git ${repodir}`, { env });
     }
 
     function pushFile() {
         const 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} main`,
-                 { env: env, cwd: repodir });
+        env.GIT_SSH = path.join(import.meta.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} main`,
+            { env, cwd: repodir }
+        );
         fs.rmSync(repodir, { recursive: true, force: true });
     }
 
     function fileExists() {
-        expect(fs.existsSync(repodir + '/newfile')).to.be(true);
+        assert.strictEqual(fs.existsSync(`${repodir}/newfile`), true);
     }
 
-    async function sendMail() {
-        await browser.get(`https://${app.fqdn}/-/admin/config`);
-        await browser.sleep(3000);
-        const button = await browser.findElement(By.xpath('//button[contains(., "Send")]'));
-        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[contains(., "Send")]')).click();
-        await browser.wait(until.elementLocated(By.xpath('//p[contains(., "A testing email has been sent")]')), TIMEOUT);
-    }
-
-    xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
-    it('install app', function () { execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
-
-    it('can get app information', getAppInfo);
+    it('install app', function () {
+        cloudronCli.install({ tcpPortFlags: INSTALL_TCP_FLAGS });
+    });
 
     it('can admin login', adminLogin);
-    it('can send mail', sendMail);
     it('can logout', logout);
 
-    it('can login', loginOIDC.bind(null, username, password, false));
+    it('can login', loginGiteaOIDC);
     it('can set avatar', setAvatar);
     it('can get avatar', checkAvatar);
 
@@ -220,57 +158,58 @@ describe('Application life cycle test', function () {
 
     it('can add and push a file', pushFile);
 
-    it('can restart app', function () { execSync('cloudron restart  --app ' + app.id); });
+    it('can restart app', function () {
+        cloudronCli.restart();
+    });
 
-    xit('can login', loginOIDC.bind(null, username, password)); // no need to relogin since session persists
     it('can clone the url', cloneRepo);
     it('file exists in repo', fileExists);
 
-    it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
-    it('restore app', function () { execSync('cloudron restore --app ' + app.id, EXEC_ARGS); });
+    it('backup app', async function () {
+        await cloudronCli.createBackup();
+    });
+    it('restore app', async function () {
+        await cloudronCli.restoreFromLatestBackup();
+    });
 
-    it('can login', loginOIDC.bind(null, username, password));
+    it('can login', loginGiteaOIDC);
     it('can get avatar', checkAvatar);
     it('can clone the url', cloneRepo);
-    it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); });
+    it('file exists in repo', function () {
+        assert.strictEqual(fs.existsSync(`${repodir}/newfile`), true);
+    });
 
     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
-        await browser.get('about:blank');
-
-        execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, EXEC_ARGS);
+        await cloudronCli.changeLocation();
     });
-    it('can get app information', getAppInfo);
 
-    it('can login', loginOIDC.bind(null, username, password));
+    it('can login', loginGiteaOIDC);
     it('can get avatar', checkAvatar);
     it('can clone the url', cloneRepo);
-    it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); });
-
-    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);
+    it('file exists in repo', function () {
+        assert.strictEqual(fs.existsSync(`${repodir}/newfile`), true);
     });
 
-    // No SSO
-    it('install app (no sso)', function () { execSync(`cloudron install --no-sso --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
+    it('uninstall app', async function () {
+        await cloudronCli.uninstall();
+    });
+
+    it('install app (no sso)', function () {
+        cloudronCli.install({ noSso: true, tcpPortFlags: INSTALL_TCP_FLAGS });
+    });
 
-    it('can get app information', getAppInfo);
     it('can admin login (no sso)', adminLogin);
     it('can logout', logout);
 
     it('uninstall app (no sso)', async function () {
-        await browser.get('about:blank');
-        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+        await cloudronCli.uninstall();
     });
 
-    // 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 () {
+        cloudronCli.appstoreInstall({ tcpPortFlags: INSTALL_TCP_FLAGS });
+    });
 
-    it('can get app information', getAppInfo);
-    it('can login', loginOIDC.bind(null, username, password));
+    it('can login', loginGiteaOIDCOld);
     it('can set avatar', setAvatar);
     it('can get avatar', checkAvatar);
     it('can add public key', addPublicKey);
@@ -278,21 +217,19 @@ describe('Application life cycle test', function () {
     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 get app information', getAppInfo);
+    it('can update', async function () {
+        await cloudronCli.update();
+    });
 
     it('can admin login', adminLogin);
-    it('can send mail', sendMail);
     it('can logout', logout);
 
-    it('can login', loginOIDC.bind(null, username, password));
+    it('can login', loginGiteaOIDC);
     it('can get avatar', checkAvatar);
     it('can clone the url', cloneRepo);
     it('file exists in cloned repo', fileExists);
 
     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);
+        await cloudronCli.uninstall();
     });
 });