Update test deps

This version is not yet available as a build

CHANGELOG

@@ -177,3 +177,259 @@
 * certs now supports multiple domains for TLS termination, refer #10207
 * Context now passed around at storage layer for future context support, refer #10321
 
+[1.12.0]
+* Update Syncthing to 1.11.1
+* #6880: fatal error: concurrent map iteration and map write
+* #6917: Reconsider db check on upgrade
+* #6930: Can't add new folder with versioning enabled, Cleanup Interval field lacks default value
+* #6940: TypeError: Object doesn't support property or method 'startsWith' in IE 11 / Windows 7
+* #6943: Missing strings for translation
+* #6961: Accounting issue with receive-only deleted files causing spurious 95% completion for remote devices
+* #6968: Very slow scans on Windows in 1.9.0
+* #6972: Deleting a folder containing a symlink results in a permanently out of sync on windows
+* #6973: given name "syncthingxxx.tmp" differs from name in filesystem "syncthingXXX.tmp"
+* #4277: Announce internal and external address to the global discovery service, encrypted
+* #6734: Consider moving configuration to a proto contract
+* #6928: Announce LAN addresses to global discovery
+
+[1.12.1]
+* Update Syncthing to 1.12.0
+* #5360: Dangling symlink prevents filesystem watcher on FreeBSD
+* #6664: Panic due to internal folder context used on exported methods
+* #7063: panic: runtime error: invalid memory address or nil pointer dereference
+* #7077: GUI stuck with "id is not defined" error when trying to ignore non-existent folder
+* #7098: File deletions are not being synced in newly shared folders
+* #6540: Config PATCH/PUT/DELETE API
+* #7099: Add a html message to GUI when javascript is disabled
+* #7108: Certificate for relaysrv with better naming
+
+[1.13.0]
+* Update base image to v3
+
+[1.14.0]
+* Update Syncthing to 1.14.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.14.0)
+
+[1.15.0]
+* Update Syncthing to 1.15.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.15.0)
+
+[1.15.1]
+* Update Syncthing to 1.15.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.15.1)
+
+[1.16.0]
+* Update Syncthing to 1.16.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.16.0)
+
+[1.16.1]
+* Update Syncthing to 1.16.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.16.1)
+
+[1.17.0]
+* Update Syncthing to 1.17.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.17.0)
+
+[1.18.0]
+* Update Syncthing to 1.18.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.0)
+
+[1.18.1]
+* Update Syncthing to 1.18.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.1)
+
+[1.18.2]
+* Update Syncthing to 1.18.2
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.2)
+* #7827: The error message "given name ... differs from filesystem name ..." does not help users to resolve the issue
+* #7893: Updating ignores blocks GUI when IO slots are unavailable
+
+[1.18.3]
+* Update Syncthing to 1.18.3
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.3)
+
+[1.18.4]
+* Update Syncthing to 1.18.4
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.4)
+* #7991: Encryption trailer not updated on shortcut
+* #7994: Index "out of sync with reality" on receive-encrypted folder
+* #8000: stdiscosrv + strelaysrv systemd services not restarting on upgrade
+* #8012: Not retrying to sync when a new connection is established
+
+[1.18.5]
+* Update Syncthing to 1.18.5
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.5)
+* Update base image to 3.2.0
+* #7715: Deleted encrypted files don't show up as locally changed in web UI
+* #7115: Use CRLF instead of LF in config.xml and .stignore on Windows
+* #8014: Send TLS SNI to relay server
+* #8021: Provide a way to preset GUI credentials with password hashing
+
+[1.19.0]
+* Update Syncthing to 1.19.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.19.0)
+* #8103: API: /rest/system/connections has misleading "total" entries
+* #7428: Add ignore patterns to folder defaults
+* #8090: Allow specifying ports in --generate
+
+[1.19.1]
+* Update Syncthing to 1.19.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.19.1)
+* #7850: junctionsAsDirs requires folder pause and resume to trigger
+* #7924: notify: File mode change events not emitted on MacOS/FSEvents watcher
+* #8083: Device ID should be read-only and "nearby devices" should be hidden when adding a new pending device
+* #8143: Behavior of discovery server doesn't match documentation
+* #8145: Folder ID not editable in add folder dialog
+* #7942: Improve error message about folder marker outside of folder
+* #8130: CLI: add command to print pending folders offered by specific device
+
+[1.19.2]
+* Update Syncthing to 1.19.2
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.19.2)
+* Make error message upon reaching the free space quota more clear
+
+[1.20.0]
+* Update Syncthing to 1.20.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.0)
+* #7855: Watching for changes using too many system resources on BSDs (kqueue)
+* #8020: Dangling symlink prevents filesystem watcher on Solaris
+* #8232: Missing include file endlessly spams log
+* #8258: The latest version does not support go1.18 compilation!!
+* #8261: TypeError: Cannot read properties of null (reading 'status') in the GUI after killing Syncthing
+* #8202: Indicate folders / devices where the remote end has not accepted sharing.
+* #8282: Change default log format to include date
+
+[1.20.1]
+* Update Syncthing to 1.20.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.1)
+* #8320: Spurious failure of new connections ("unknown (newer?) version of the protocol" etc)
+
+[1.20.2]
+* Update Syncthing to 1.20.2
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.2)
+* Fix use of old, renamed function in edit folder sharing tab.
+
+[1.20.3]
+* Update Syncthing to 1.20.3
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.3)
+* #8369: Shared device names are missing from "Edit Folder -> Sharing"
+* #8376: Chrome Autofill Breaks Authentication
+* #8386: Ignore patterns with wildcard and non-ASCII characters don't work as expected
+* #8393: Warn if two devices are introducers to each other
+
+[1.20.4]
+* Update Syncthing to 1.20.4
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.4)
+* #7458: Syncthing announces address of interface which is down
+* #8479: Panic in failure reporting
+* #8007: Support listing the discovered devices using the cli
+
+[1.21.0]
+* Update Syncthing to 1.22.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.22.0)
+* #2698: Sync extended file attributes on supported file systems
+* #7603: WebUI tooltip inconsistencies
+* #8506: macOS Monterey 12.5.1 aliases break after sync
+
+[1.21.1]
+* Update Syncthing to 1.22.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.22.1)
+* #8084: Scope ID should be filtered out of IPv6 addresses when using Remote GUI
+* #8569: Periodic connection losses to webui because docker image doesn't support upgrade
+* #8594: Extended attributes are only synced one way
+
+[1.21.2]
+* Update base image to 4.0.0
+
+[1.22.0]
+* Update Syncthing to 1.23.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.0)
+* #8572: Incorrect rescan interval on auto accepted encrypted folder
+* #8646: Perhaps the list of devices contains empty elements
+* #8686: Properly indicate whether a connection is "LAN" or not in the GUI
+
+[1.22.1]
+* Update Syncthing to 1.23.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.1)
+* #8325: "accept: function not implemented" after upgrading to syncthing v1.20.1
+
+[1.22.2]
+* Update Syncthing to 1.23.2
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.2)
+* #8749: Relay listener does not restart sometimes
+* #8660: GUI editor for xattr filter patterns
+* #8781: gui: Remove duplicate Spanish translation
+
+[1.22.3]
+* Update Syncthing to 1.23.3
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.3)
+* #5408: Selection of time in versions GUI not possible without editing the string inside the textfield
+* #8277: Mutual encrypted sharing doesn't work (both sides with password)
+* #8556: Increased file size when sharing between encrypted devices
+* #8599: Key generation at connect time is slow for encrypted connections
+* #7859: Allow sub-second watcher delay (use case: remote development)
+* #8828: cmd/stdiscosrv: TestDatabaseGetSet flake
+
+[1.22.4]
+* Update Syncthing to 1.23.4
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.4)
+* lib/syncthing: Handle successful global migration (fixes #8851) (#8852)
+* lib/syncthing: Handle successfull global migration (fixes #8851)
+
+[1.22.5]
+* Update Syncthing to 1.23.5
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.5)
+* gui: Avoid code generating HTML (#8923)
+
+[1.22.6]
+* Update Syncthing to 1.23.6
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.6)
+
+[1.22.7]
+* Update Syncthing to 1.23.7
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.7)
+* #6597: setLowPriority should not increase process priority when already lower (in Windows)
+* #7698: ursrv: unrealistic uptime data, likely due to unset RTC (1970-01-01)
+* #8958: Extended attribute filter editor should be enabled when "send extended attributes" is checked
+* #8967: Shared With list ends with comma on 1 device
+* #9001: relaysrv crash after some weeks of operation
+* #8890: Do not autoexpand tilde sign (~) to an absolute home directory path
+* #8957: Add environment variables for --home, --conf, and --data
+* #8968: Error for Windows invalid file names should indicate the invalid character or name part
+* #8983: Integrate govulncheck
+
+[1.23.0]
+* Update Syncthing to 1.24.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.25.0)
+* #8274: Usage report transport type is wrong for QUIC
+* #8482: Discovery server keeps duplicate entries
+* #9019: Web GUI loses config changes when doing multiple modifications (e.g. on slow hardware or remotely)
+* #9112: panic: counter cannot decrease in value
+* #9123: Hashed passwords via API are hashed again
+* #141: Use multiple simultaneous TCP connections
+* #5607: Move footer links to header
+
+[1.24.0]
+* Update base image to 4.2.0
+
+[1.25.0]
+* Update Syncthing to 1.26.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.26.0)
+* #9106: Posting config with invalid versioner type causes panic
+* #9120: Deduplicated files on Windows aren't treated as regular files any more (Go 1.21)
+* #9133: Syncthing Docker container fails to start if underlying filesystem doesn't support chown
+* #9143: traefik no longer url escape X-Forwarded-Tls-Client-Cert header
+* #9149: Favicon is stuck in notify state
+* #4137: Use a real login screen + sessions instead of HTTP basic auth
+
+[1.25.1]
+* Update Syncthing to 1.26.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.26.1)
+
+[1.25.2]
+* Update Syncthing to 1.27.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.27.1)
+* #9253: Permission error on folder causes "connection error" dialog when opening folder editor
+* #9269: panic: nil pointer dereference in (*indexHandlerRegistry).startLocked
+* #9274: Missing lock in DeviceStatistics ("fatal error: concurrent map read and map write")
+

CloudronManifest.json

@@ -5,7 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Decentralized file synchronization",
-  "version": "1.11.0",
+  "version": "1.25.2",
+  "upstreamVersion": "1.27.1",
   "healthCheckPath": "/healthcheck",
   "httpPort": 8000,
   "addons": {
@@ -27,13 +28,13 @@
     "storage",
     "sync"
   ],
-  "minBoxVersion": "5.3.0",
+  "minBoxVersion": "7.1.2",
   "forumUrl": "https://forum.cloudron.io/category/56/syncthing",
-  "documentationUrl": "https://cloudron.io/documentation/apps/syncthing/",
+  "documentationUrl": "https://docs.cloudron.io/apps/syncthing/",
   "mediaLinks": [
-    "https://cloudron-app-screenshots.s3.amazonaws.com/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/1.png",
+    "https://screenshots.cloudron.io/net.syncthing.cloudronapp2/1.png",
-    "https://cloudron-app-screenshots.s3.amazonaws.com/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/2.png",
+    "https://screenshots.cloudron.io/net.syncthing.cloudronapp2/2.png",
-    "https://cloudron-app-screenshots.s3.amazonaws.com/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/3.png"
+    "https://screenshots.cloudron.io/net.syncthing.cloudronapp2/3.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md"
 }

DESCRIPTION.md

@@ -1,5 +1,3 @@
-This app packages Syncthing <upstream>1.9.0</upstream>.
-
 Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
 
 ### Features

Dockerfile

@@ -1,10 +1,10 @@
-FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
+FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
-
-ARG VERSION=1.9.0
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
+ARG VERSION=1.27.1
+
 RUN wget https://github.com/syncthing/syncthing/releases/download/v${VERSION}/syncthing-linux-amd64-v${VERSION}.tar.gz -O - | tar -xz -C /app/code --strip-components=1
 
 # add supervisor configs

POSTINSTALL.md

@@ -1,7 +1,7 @@
 This app is pre-setup with an admin account. The initial credentials are:
 
-**Username**: admin <br/>
+**Username**: admin<br/>
-**Password**: changeme <br/>
+**Password**: changeme<br/>
 
 Please change the admin password immediately.
 

start.sh

@@ -26,4 +26,4 @@ sed -e 's,<gui .*>,<gui enabled="true" tls="false" debugging="false">,' -i /app/
 chown -R cloudron:cloudron /app/data /run/syncthing
 
 echo "Starting supervisor"
-exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i GitLab
+exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i syncthing

test/package.json

@@ -9,13 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^85.0.0",
+    "chromedriver": "^119.0.1",
     "expect.js": "^0.3.1",
-    "mkdirp": "^1.0.4",
+    "mocha": "^10.2.0",
-    "mocha": "^8.1.3",
+    "selenium-webdriver": "^4.16.0",
-    "rimraf": "^3.0.2",
+    "superagent": "^8.1.2"
-    "selenium-server-standalone-jar": "^3.141.59",
-    "selenium-webdriver": "^3.6.0",
-    "superagent": "^6.1.0"
   }
 }

test/test.js

@@ -1,144 +1,87 @@
 #!/usr/bin/env node
 
-'use strict';
+/* jshint esversion: 8 */
-
 /* global describe */
 /* global before */
 /* global after */
 /* global it */
+/* global xit */
+
+'use strict';
 
 require('chromedriver');
 
-var execSync = require('child_process').execSync,
+const execSync = require('child_process').execSync,
     expect = require('expect.js'),
     superagent = require('superagent'),
     path = require('path'),
-    webdriver = require('selenium-webdriver');
+    timers = require('timers/promises'),
-
+    { Builder, By, until } = require('selenium-webdriver'),
-var by = require('selenium-webdriver').By,
+    { Options } = require('selenium-webdriver/chrome');
-    until = require('selenium-webdriver').until,
-    Key = require('selenium-webdriver').Key,
-    Builder = require('selenium-webdriver').Builder;
 
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    var server, browser = new Builder().forBrowser('chrome').build();
+    const LOCATION = 'test';
-    var username = 'admin', password = 'changeme';
+    const TEST_TIMEOUT = 30000;
+    const FOLDER = 'xmf'; // keep this small. long folder names fail in automation, not sure why
+    const SYNC_PORT = 22001;
+    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
-    before(function (done) {
+    let browser, app;
-        var seleniumJar= require('selenium-server-standalone-jar');
+    const username = 'admin', password = 'changeme';
-        var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
-        server = new SeleniumServer(seleniumJar.path, { port: 4444 });
-        server.start();
 
-        done();
+    before(function () {
+        browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
     });
 
-    after(function (done) {
+    after(function () {
         browser.quit();
-        server.stop();
-        done();
     });
 
-    var LOCATION = 'test';
-    var TEST_TIMEOUT = 30000;
-    var FOLDER = 'xmf'; // keep this small. long folder names fail in automation, not sure why
-    var SYNC_PORT = 22001;
-    var EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
-
-    var app;
-
     function getAppInfo() {
-        var inspect = JSON.parse(execSync('cloudron inspect'));
+        const inspect = JSON.parse(execSync('cloudron inspect'));
-        app = inspect.apps.filter(function (a) { return a.location === LOCATION || a.location === LOCATION + '2'; })[0];
+        app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
         expect(app).to.be.an('object');
     }
 
-    function pageLoaded() {
+    async function waitForElement(elem) {
-        return browser.wait(until.titleMatches(/[0-9a-f]{12} \| Syncthing/), TEST_TIMEOUT);
+        await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
+        await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
     }
 
-    function visible(selector) {
+    async function login() {
-        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
+        await browser.manage().deleteAllCookies();
-            return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
+        await browser.get('https://' + app.fqdn);
-        });
+        await waitForElement(By.id('user'));
+        await browser.findElement(By.id('user')).sendKeys(username);
+        await browser.findElement(By.id('password')).sendKeys(password);
+        await browser.findElement(By.xpath('//button[@type="submit"]')).click();
+        await waitForElement(By.xpath('//span[text()="Actions"]'));
     }
 
-    function invalidPassword(callback) {
+    async function loadPage() {
-        superagent.get('https://' + app.fqdn).auth(username, password + 'x').end(function (error, result) {
+        await browser.get('https://' + app.fqdn);
-            expect(result.status).to.eql(401);
+        await waitForElement(By.xpath('//span[text()="Actions"]'));
-
-            callback();
-        });
     }
 
-    function loadPage(callback) {
+    async function addFolder() {
-        browser.manage().deleteAllCookies().then(function () {
+        await browser.get('https://' + app.fqdn);
-            return browser.sleep(10000);
+        await browser.findElement(By.css('[ng-click*=addFolder]')).click();
-        }).then(function() {
+        await waitForElement(By.id('folderPath'));
-            return browser.get('https://' + username + ':' + encodeURIComponent(password) + '@' + app.fqdn).then(function () {
+        await browser.sleep(4000); // wait more, not sure why this is needed
-                return browser.get('https://' + app.fqdn);
+        await browser.findElement(By.id('folderLabel')).sendKeys(FOLDER);
-            });
+        await browser.sleep(4000); // without this sometimes only part of the folder name gets through
-        }).then(function () {
+        await browser.findElement(By.css('[ng-click*=saveFolder]')).click();
-            return pageLoaded();
+        await browser.wait(until.elementLocated(By.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
-        }).then(function () {
+        await browser.sleep(4000);
-            callback();
-        });
     }
 
-    function addFolder(callback) {
+    async function checkFolder() {
-        browser.get('https://' + app.fqdn).then(function () {
+        await browser.get('https://' + app.fqdn);
-            return browser.findElement(by.css('[ng-click*=addFolder]')).click();
+        await browser.sleep(5000);
-        }).then(function () {
+        await browser.get('https://' + app.fqdn);
-            return visible(by.id('folderPath'));
+        await browser.wait(until.elementLocated(By.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
-        }).then(function () {
-            return browser.sleep(4000); // wait more, not sure why this is needed
-        }).then(function() {
-            return browser.findElement(by.id('folderLabel')).sendKeys(FOLDER);
-        }).then(function () {
-            return browser.sleep(4000); // without this sometimes only part of the folder name gets through
-        }).then(function() {
-            return browser.findElement(by.css('[ng-click*=saveFolder]')).click();
-        }).then(function() {
-            return browser.wait(until.elementLocated(by.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
-        }).then(function () {
-            return browser.sleep(4000);
-        }).then(function() {
-            callback();
-        });
-    }
-
-    function checkFolder(callback) {
-        browser.get('https://' + app.fqdn).then(function () {
-            return browser.wait(until.elementLocated(by.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
-    }
-
-    function removeFolder(callback) {
-        browser.get('https://' + app.fqdn).then(function () {
-            return pageLoaded();
-        }).then(function() {
-            return browser.findElement(by.css('#folders button')).click();
-        }).then(function () {
-            return browser.sleep(3000); //No way to check for visibility of angular-js components
-        }).then(function () {
-            return browser.findElement(by.css('#folder-0 button[ng-click*=editFolder]')).click();
-        }).then(function () {
-            return browser.sleep(3000); //No way to check for visibility of angular-js components
-        }).then(function () {
-            return browser.findElement(by.xpath('//button[@data-target="#remove-folder-confirmation"]')).click();
-        }).then(function () {
-            return browser.sleep(3000); //No way to check for visibility of angular-js components
-        }).then(function () {
-            return browser.findElement(by.css('[ng-click*=deleteFolder]')).click();
-        }).then(function () {
-            return browser.sleep(3000); //This needs to run for some time
-        }).then(function () {
-            callback();
-        });
     }
 
     xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
@@ -146,49 +89,56 @@ describe('Application life cycle test', function () {
     it('install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, EXEC_ARGS); });
     it('can get app information', getAppInfo);
 
-    it('fails with invalid password', invalidPassword);
+    it('can login', login);
     it('can load page', loadPage);
     it('can add folder', addFolder);
 
-    it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
+    it('backup app', async function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
-    it('restore app', function () { execSync('cloudron restore --app ' + app.id, EXEC_ARGS); });
+    it('restore app', async function () {
+        await browser.get('about:blank');
+        execSync('cloudron restore --app ' + app.id, EXEC_ARGS);
+        await timers.setTimeout(5000);
+    });
 
+    it('can login', login);
     it('can load page', loadPage);
     it('can check folder', checkFolder);
 
-    it('move to different location', function (done) {
+    it('move to different location', async function () {
-        // ensure we don't hit NXDOMAIN in the mean time
+        await browser.get('about:blank');
-        browser.get('about:blank').then(function () {
+        execSync(`cloudron configure --location ${LOCATION}2 --app ${app.id}`, EXEC_ARGS);
-            execSync(`cloudron configure --location ${LOCATION}2 --app ${app.id}`, EXEC_ARGS);
+        await timers.setTimeout(5000);
-            done();
-        });
     });
     it('can get app information', getAppInfo);
 
+    it('can login', login);
     it('can load page', loadPage);
     it('can check folder', checkFolder);
-    it('can remove folder', removeFolder);
 
-    it('uninstall app', function (done) {
+    it('uninstall app', async function () {
-        browser.get('about:blank').then(function () {
+        await browser.get('about:blank');
-            execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
-            done();
-        });
     });
 
     // test update
-    it('can install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --appstore-id net.syncthing.cloudronapp2 --location ' + LOCATION, EXEC_ARGS); });
+    it('can install app', async function () {
+        execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --appstore-id net.syncthing.cloudronapp2 --location ' + LOCATION, EXEC_ARGS);
+        await timers.setTimeout(30000);
+    });
     it('can get app information', getAppInfo);
+    it('can login', login);
     it('can load page', loadPage);
     it('can add folder', addFolder);
-    it('can update', function () { execSync('cloudron update --app ' + LOCATION, EXEC_ARGS); });
+    it('can update', async function () {
-    it('wait for app to startup fully', function (done) { setTimeout(done, 10000); });
+        await browser.get('about:blank');
+        execSync('cloudron update --app ' + LOCATION, EXEC_ARGS);
+        await timers.setTimeout(30000);
+    });
+    it('can login', login);
     it('can check folder', checkFolder);
 
-    it('uninstall app', function (done) {
+    it('uninstall app', async function () {
-        browser.get('about:blank').then(function () {
+        await browser.get('about:blank');
-            execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
-            done();
-        });
     });
 });