Version 1.18.0

Still show old changelog link since the current version is just patch
release

CHANGELOG

@@ -395,3 +395,112 @@
 * Ensure Request Body Readers are closed in LFS server (#8454) (#8459)
 * Ensure that LFS files are relative to the LFS content path (#8455) (#8458)
 * Ignore mentions for users with no access (#8395) (#8484)
+
+[1.14.0]
+* Update Gitea to 1.10.0
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.10.0)
+
+[1.14.1]
+* Update Gitea to 1.10.1
+* Fix max length check and limit in multiple repo forms (#9148) (#9204)
+* Properly fix displaying virtual session provider in admin panel (#9137) (#9203)
+* Upgrade levelqueue to 0.1.0 (#9192) (#9199)
+* Fix panic when diff (#9187) (#9193)
+* Smtp logger configuration sendTos should be an array (#9154) (#9157)
+* Always Show Password Field on Link Account Sign-in Page (#9150)
+* Create PR on Current Repository by Default (#8670) (#9141)
+* Fix race on indexer (#9136) (#9139)
+* Fix reCAPTCHA URL (#9119)
+* Hide migrated credentials (#9098)
+* Update golang.org/x/crypto vendor to use acme v2 (#9056) (#9085)
+* Fix password checks on admin create/edit user (#9076) (#9081)
+* Fix add search as a reserved username (#9063) (#9065)
+* Fix permission checks for close/reopen from commit (#8875) (#9033)
+* Ensure Written is set in GZIP ProxyResponseWriter (#9018) (#9025)
+* Fix broken link to branch from issue list (#9003) (#9021)
+* Fix wrong system notice when repository is empty (#9020)
+* Shadow password correctly for session config (#8984) (#9002)
+
+[1.14.2]
+* Update Gitea to 1.10.2
+* Allow only specific Columns to be updated on Issue via API (#9539) (#9580)
+* Add ErrReactionAlreadyExist error (#9550) (#9564)
+* Fix bug when migrate from API (#8631) (#9563)
+* Use default avatar for ghost user (#9536) (#9537)
+* Fix repository issues pagination bug when there are more than one label filter (#9512) (#9528)
+* Fix deleted branch not removed when push the branch again (#9516) (#9524)
+* Fix missing repository status when migrating repository via API (#9511)
+* Trigger webhook when deleting a branch after merging a PR (#9510)
+* Fix paging on /repos/{owner}/{repo}/git/trees/{sha} API endpoint (#9482)
+* Fix NewCommitStatus (#9434) (#9435)
+* Use OriginalURL instead of CloneAddr in migration logging (#9418) (#9420)
+* Fix Slack webhook payload title generation to work with Mattermost (#9404)
+* DefaultBranch needs to be prefixed by BranchPrefix (#9356) (#9359)
+* Fix issue indexer not triggered when migrating a repository (#9333)
+* Fix bug that release attachment files not deleted when deleting repository (#9322) (#9329)
+* Fix migration releases (#9319) (#9326) (#9328)
+* Fix File Edit: Author/Committer interchanged (#9297) (#9300)
+
+[1.14.3]
+* Update Gitea to 1.10.3
+* Hide credentials when submitting migration (#9102) (#9704)
+* Never allow an empty password to validate (#9682) (#9684)
+* Prevent redirect to Host (#9678) (#9680)
+* Hide public repos owned by private orgs (#9609) (#9616)
+* Allow assignee on Pull Creation when Issue Unit is deactivated (#9836) (#9838)
+* Fix download file wrong content-type (#9825) (#9835)
+* Fix wrong identify poster on a migrated pull request when submit review (#9827) (#9831)
+* Fix dump non-exist log directory (#9818) (#9820)
+* Fix compare (#9808) (#9815)
+* Fix missing msteam webhook on organization (#9781) (#9795)
+* Fix add team on collaborator page when same name as organization (#9783)
+* Fix cache problem on dashboard (#9358) (#9703)
+* Send tag create and push webhook when release created on UI (#8671) (#9702)
+* Branches not at ref commit ID should not be listed as Merged (#9614) (#9639)
+
+[1.15.0]
+* Update Gitea to 1.11.0
+
+[1.15.1]
+* Update Gitea to 1.11.1
+* Repo name added to automatically generated commit message when merging (#9997) (#10285)
+* Fix Workerpool deadlock (#10283) (#10284)
+* Divide GetIssueStats query in smaller chunks (#10176) (#10282)
+* Fix reply on code review (#10257)
+* Stop hanging issue indexer initialisation from preventing shutdown (#10243) (#10249)
+* Fix filter label emoji width (#10241) (#10244)
+* Fix issue sidebar menus having an infinite height (#10239) (#10240)
+* Fix commit between two commits calculation if there is only last commit (#10225) (#10226)
+* Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206)
+* Blacklist manifest.json & milestones user (#10292) (#10293)
+
+[1.15.2]
+* Update Gitea to 1.11.2
+
+[1.15.3]
+* Update Gitea to 1.11.3
+
+[1.15.4]
+* Update Gitea to 1.11.4
+
+[1.16.0]
+* Update Gitea to [1.11.5](https://github.com/go-gitea/gitea/releases/tag/v1.11.5)
+* Update base image to 2.0.0
+
+[1.16.1]
+* Update Gitea to 1.11.6
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.11.6)
+* Fix missing authorization check on pull for public repos of private/limited org (#11656) (#11683)
+* Use session for retrieving org teams (#11438) (#11439)
+* Return json on 500 error from API (#11574) (#11660)
+* Fix wrong milestone in webhook message (#11596) (#11612)
+* Prevent (caught) panic on login (#11590) (#11598)
+* Fix commit page js error (#11527)
+
+[1.17.0]
+* Update Gitea to 1.12.1
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.12.0)
+
+[1.18.0]
+* Add forumUrl and update tags and screenshots
+

CloudronManifest.json

@@ -4,9 +4,10 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.13.6",
+  "version": "1.18.0",
   "healthCheckPath": "/healthcheck",
   "httpPort": 3000,
+  "memoryLimit": 536870912,
   "addons": {
     "mysql": { },
     "sendmail": { },
@@ -26,15 +27,17 @@
   "icon": "file://logo.png",
   "optionalSso": true,
   "mediaLinks": [
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/1.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/2.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/3.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/4.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/5.png"
+    "https://cloudron-app-screenshots.s3.amazonaws.com/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/1.png",
+    "https://cloudron-app-screenshots.s3.amazonaws.com/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/2.png",
+    "https://cloudron-app-screenshots.s3.amazonaws.com/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/3.png",
+    "https://cloudron-app-screenshots.s3.amazonaws.com/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/4.png",
+    "https://cloudron-app-screenshots.s3.amazonaws.com/io.gitea.cloudronapp/f89a2ab8d49094c80589f69a2d60bef63b2dbb62/5.png"
   ],
-  "tags": [ "version control", "git", "code hosting", "development" ],
+  "tags": [ "version control", "git", "code hosting", "development", "github", "bitbucket", "gitlab" ],
   "changelog": "file://CHANGELOG",
   "postInstallMessage": "file://POSTINSTALL.md",
   "minBoxVersion": "4.1.4",
+  "minBoxVersion": "5.3.0",
+  "forumUrl": "https://forum.cloudron.io/category/19/gitea",
   "documentationUrl": "https://cloudron.io/documentation/apps/gitea/"
 }

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.9.5</upstream>
+This app packages Gitea <upstream>1.12.1</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.
 

Dockerfile

@@ -1,6 +1,6 @@
-FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
+FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
 
-ARG VERSION=1.9.5
+ARG VERSION=1.12.1
 
 RUN apt-get update && \
     apt-get install -y openssh-server git && \

POSTINSTALL.md

@@ -1,14 +1,12 @@
-A default admin user has been setup with the following credentials (use the `Local` authentication source when logging in):
+This app is pre-setup with an admin account (use the `Local` authentication source for logging in as admin).
+The initial credentials are:
+  
+**Username**: root <br/>
+**Password**: changeme <br/>
 
-```
-username: root
-password: changeme
-```
-
-**Note:** Please change the password and email immediately after installation.
+Please change the admin password immediately.
 
 <sso>
-This app integrates with the Cloudron SSO. Cloudron users can login and use Gitea
-using the `Cloudron` authentication source.
+Cloudron users can login using the `Cloudron` authentication source.
 </sso>
 

test/package.json

@@ -8,16 +8,13 @@
   },
   "author": "",
   "license": "ISC",
-  "devDependencies": {
-    "chromedriver": "^78.0.1",
-    "expect.js": "^0.3.1",
-    "mocha": "^6.2.2",
-    "rimraf": "^3.0.0",
-    "superagent": "^5.1.0"
-  },
   "dependencies": {
+    "chromedriver": "^83.0.0",
+    "expect.js": "^0.3.1",
+    "mocha": "^8.0.1",
+    "rimraf": "^3.0.2",
     "selenium-server-standalone-jar": "^3.141.59",
     "selenium-webdriver": "^3.6.0",
-    "superagent": "^1.8.5"
+    "superagent": "^5.3.1"
   }
 }

test/test.js

@@ -16,42 +16,43 @@ var execSync = require('child_process').execSync,
     fs = require('fs'),
     path = require('path'),
     rimraf = require('rimraf'),
-    superagent = require('superagent');
+    superagent = require('superagent'),
+    { Builder, By, until } = require('selenium-webdriver'),
+    { Options } = require('selenium-webdriver/chrome');
 
-var by = require('selenium-webdriver').By,
-    until = require('selenium-webdriver').until,
-    Builder = require('selenium-webdriver').Builder;
-
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+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);
-    var server, browser = new Builder().forBrowser('chrome').build();
+
+    var TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 5000;
+    var EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
     var LOCATION = 'test';
     var SSH_PORT = 29420;
+
+    var app;
+    var token;
+
+    var server, browser = new Builder().forBrowser('chrome').build();
     var repodir = '/tmp/testrepo';
-    var app, reponame = 'testrepo';
+    var reponame = 'testrepo';
+
     var username = process.env.USERNAME;
     var password = process.env.PASSWORD;
-    var TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 5000;
-    var email = process.env.EMAIL, token;
-
-    before(function (done) {
-        if (!process.env.USERNAME) return done(new Error('USERNAME env var not set'));
-        if (!process.env.PASSWORD) return done(new Error('PASSWORD env var not set'));
-        if (!process.env.EMAIL) return done(new Error('EMAIL env var not set'));
+    var email = process.env.EMAIL;
 
+    before(function () {
         var seleniumJar= require('selenium-server-standalone-jar');
         var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
         server = new SeleniumServer(seleniumJar.path, { port: 4444 });
         server.start();
-
-        done();
     });
 
     after(function (done) {
         browser.quit();
-        server.stop();
         rimraf.sync(repodir);
         done();
     });
@@ -74,14 +75,14 @@ describe('Application life cycle test', function () {
 
     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'));
+            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();
+            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);
+                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);
+                return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"Your avatar setting has been updated.")]')), TIMEOUT);
             }
         }).then(function () {
             done();
@@ -92,16 +93,16 @@ describe('Application life cycle test', function () {
         if (app.manifest.version === '1.5.4') return setAvatarOld(done);
 
         browser.get('https://' + app.fqdn + '/user/settings').then(function () {
-            var button = browser.findElement(by.xpath('//label[contains(text(), "Use Custom Avatar")]'));
+            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();
+            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'));
+            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();
+            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);
+            return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"Your avatar has been updated.")]')), TIMEOUT);
         }).then(function () {
             done();
         });
@@ -116,31 +117,15 @@ return done();
         });
     }
 
-    function editFile(done) {
-        browser.get('https://' + app.fqdn + '/' + username + '/' + reponame + '/_edit/master/newfile').then(function () {
-            var cm = browser.findElement(by.xpath('//div[contains(@class,"CodeMirror")]'));
-            var text = 'yo';
-            return browser.executeScript('arguments[0].CodeMirror.setValue("' + text + '");', cm);
-        }).then(function () {
-            return browser.findElement(by.xpath('//input[@name="commit_summary"]')).sendKeys('Dummy edit');
-        }).then(function () {
-            return browser.findElement(by.xpath('//button[contains(text(), "Commit Changes")]')).click();
-        }).then(function () {
-            return waitForUrl('https://' + app.fqdn + '/' + username + '/' + reponame + '/src/branch/master/newfile');
-        }).then(function () {
-            done();
-        });
-    }
-
     function login(username, password, done) {
         browser.get('https://' + app.fqdn + '/user/login').then(function () {
-            return browser.findElement(by.id('user_name')).sendKeys(username);
+            return browser.findElement(By.id('user_name')).sendKeys(username);
         }).then(function () {
-            return browser.findElement(by.id('password')).sendKeys(password);
+            return browser.findElement(By.id('password')).sendKeys(password);
         }).then(function () {
-            return browser.findElement(by.tagName('form')).submit();
+            return browser.findElement(By.tagName('form')).submit();
         }).then(function () {
-            return browser.wait(until.elementLocated(by.linkText('Dashboard')), TIMEOUT);
+            return browser.wait(until.elementLocated(By.linkText('Dashboard')), TIMEOUT);
         }).then(function () {
             done();
         });
@@ -151,8 +136,14 @@ return done();
     }
 
     function logout(done) {
-        browser.get('https://' + app.fqdn + '/user/logout').then(function () {
-            return waitForUrl('https://' + app.fqdn + '/explore/repos');
+        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();
         });
@@ -164,21 +155,21 @@ return done();
         const sshPage = 'https://' + app.fqdn + '/user/settings/keys';
 
         browser.get(sshPage).then(function () {
-            return browser.findElement(by.xpath('//div[text()="Add Key"]')).click();
+            return browser.findElement(By.xpath('//div[text()="Add Key"]')).click();
         }).then(function () {
-            return browser.findElement(by.id('ssh-key-title')).sendKeys('testkey');
+            return browser.findElement(By.id('ssh-key-title')).sendKeys('testkey');
         }).then(function () {
-            return browser.findElement(by.id('ssh-key-content')).sendKeys(publicKey.trim()); // #3480
+            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")]'));
+            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();
+            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);
+                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);
+                return browser.wait(until.elementLocated(By.xpath('//p[contains(text(), "has been added.")]')), TIMEOUT);
             }
         }).then(function () {
             done();
@@ -189,23 +180,23 @@ return 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();
+                return browser.findElement(By.linkText('New Repository')).click();
             }).then(function () {
-                return browser.wait(until.elementLocated(by.xpath('//*[contains(text(), "New Repository")]')), TIMEOUT);
+                return browser.wait(until.elementLocated(By.xpath('//*[contains(text(), "New Repository")]')), TIMEOUT);
             });
         } else {
             getRepoPage = browser.get('https://' + app.fqdn + '/repo/create');
         }
 
         getRepoPage.then(function () {
-            return browser.findElement(by.id('repo_name')).sendKeys(reponame);
+            return browser.findElement(By.id('repo_name')).sendKeys(reponame);
         }).then(function () {
-            var button = browser.findElement(by.xpath('//button[contains(text(), "Create Repository")]'));
+            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();
+            return browser.findElement(By.id('auto-init')).click();
         }).then(function () {
-            return browser.findElement(by.xpath('//button[contains(text(), "Create Repository")]')).click();
+            return browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]')).click();
         }).then(function () {
             browser.wait(function () {
                 return browser.getCurrentUrl().then(function (url) {
@@ -219,9 +210,9 @@ return done();
 
     function checkCloneUrl(done) {
         browser.get('https://' + app.fqdn + '/' + username + '/' + reponame).then(function () {
-            return browser.findElement(by.id('repo-clone-ssh')).click();
+            return browser.findElement(By.id('repo-clone-ssh')).click();
         }).then(function () {
-            return browser.findElement(by.id('repo-clone-url')).getAttribute('value');
+            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();
@@ -268,49 +259,45 @@ return done();
 
     function sendMail(done) {
         browser.get(`https://${app.fqdn}/admin/config`).then(function () {
-            var button = browser.findElement(by.xpath('//button[@id="test-mail-btn"]'));
+            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');
+            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();
+            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);
+            return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"A testing email has been sent to \'test@cloudron.io\'")]')), TIMEOUT);
         }).then(function () {
             done();
         });
     }
 
-    xit('build app', function () {
-        execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
 
-    it('can login', function (done) {
-        var inspect = JSON.parse(execSync('cloudron inspect'));
+    // 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));
+    //     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;
+    //         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));
+    //         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();
-            });
-        });
-    });
+    //             email = result.body.email;
+    //             done();
+    //         });
+    //     });
+    // });
 
-    it('install app', function () {
-        execSync(`cloudron install --new --wait --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    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) {
@@ -339,28 +326,19 @@ return done();
     it('can clone the url', cloneRepo);
 
     it('can add and push a file', pushFile);
-    it('can edit file', editFile);
 
     it('can add custom file', addCustomFile);
     it('can check custom file', checkCustomFile);
 
-    it('can restart app', function (done) {
-        execSync('cloudron restart --wait --app ' + app.id);
-        done();
-    });
+    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
     it('displays correct clone url', checkCloneUrl);
     it('can clone the url', cloneRepo);
     it('file exists in repo', fileExists);
 
-    it('backup app', function () {
-        execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
-
-    it('restore app', function () {
-        execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    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('can login', login.bind(null, username, password));
     it('can get avatar', checkAvatar);
@@ -371,7 +349,7 @@ return done();
         //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 --wait --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+            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');
@@ -389,14 +367,14 @@ return done();
     it('uninstall app', function (done) {
         // ensure we don't hit NXDOMAIN in the mean time
         browser.get('about:blank').then(function () {
-            execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+            execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
             done();
         });
     });
 
     // check if the _first_ login via email succeeds
     it('can login via email', function (done) {
-        execSync(`cloudron install --new --wait --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS);
         var inspect = JSON.parse(execSync('cloudron inspect'));
 
         app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
@@ -407,7 +385,7 @@ return done();
 
             // ensure we don't hit NXDOMAIN in the mean time
             browser.get('about:blank').then(function () {
-                execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+                execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
                 done();
             });
         });
@@ -415,7 +393,7 @@ return done();
 
     // No SSO
     it('install app (no sso)', function () {
-        execSync(`cloudron install --new --wait --no-sso --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync(`cloudron install --no-sso --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS);
     });
 
     it('can get app information', function () {
@@ -430,12 +408,12 @@ return done();
     it('can logout', logout);
 
     it('uninstall app (no sso)', function () {
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
     });
 
     // test update
     it('can install app', function () {
-        execSync(`cloudron install --new --wait --appstore-id ${app.manifest.id} --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync(`cloudron install --appstore-id ${app.manifest.id} --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS);
     });
 
     it('can get app information', getAppInfo);
@@ -448,7 +426,7 @@ return done();
     it('can add and push a file', pushFile);
 
     it('can update', function () {
-        execSync('cloudron install --wait --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron update --app ' + app.id, EXEC_ARGS);
     });
 
     xit('can admin login', adminLogin);
@@ -463,7 +441,7 @@ return done();
     it('uninstall app', function (done) {
         // ensure we don't hit NXDOMAIN in the mean time
         browser.get('about:blank').then(function () {
-            execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+            execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
             done();
         });
     });