Version 1.14.2

CHANGELOG

@@ -108,3 +108,111 @@
 * Fix delay for individual mark-as-read actions #2332
 * Fix scroll functions in Edge #2337
 
+[1.6.2]
+* Update FreshRSS to 1.14.2
+* Fix minor code syntax warning in API #2362
+
+[1.6.3]
+* Update FreshRSS to 1.14.3
+* New configuration page for each category #2369
+* Update shortcut configuration page #2405
+* CSS style for printing #2149
+* Do not hide multiple <br /> tags #2437
+* Updated to jQuery 3.4.1 (only for statistics page) #2424
+
+[1.7.0]
+* Update FreshRSS to 1.15.0
+* New archiving method, including maximum number of articles per feed, and settings at feed, category, global levels #2335
+* New option to control category sort order #2592
+* New option to display article authors underneath the article title #2487
+* Add e-mail capability #2476, #2481
+* Ability to define default user settings in data/config-user.custom.php #2490
+* Including default feeds #2515
+* Allow recreating users if they still exist in database #2555
+* Add optional database connection URI parameters #2549, #2559
+* Allow longer articles with MySQL / MariaDB (up to 16MB compressed instead of 64kB) #2448
+* Add support for terms of service #2520
+* Add sharing with Lemmy #2510
+
+[1.7.1]
+* Update FreshRSS to 1.15.1
+
+[1.7.2]
+* Update FreshRSS to 1.15.2
+
+[1.7.3]
+* Update FreshRSS to 1.15.3
+
+[1.8.0]
+* Update FreshRSS to 1.16.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.16.0)
+* Allow multiple users to have administration rights #2096
+* Preview the CSS rule to retrieve full article content #2778
+* Improve CSS selector ordering in the full-text retrieval (lib_phpQuery) #2874
+* New search option !date: allowing to exclude any date interval #2869
+* New option to show all articles in the favourites view #2434
+* Allow feed to be actualized just after being truncated #2862
+* Fallback to showing a GUID when an article title is empty #2813
+
+[1.9.0]
+* Use latest base image 2.0.0
+
+[1.9.1]
+* Update FreshRSS to 1.16.2
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.16.1)
+* Add the possibility to filter by feed IDs #2892
+  * like f:123 more-search or multiple feed IDs like f:123,234,345 more-search or an exclusion like !f:456,789 more-search
+* Show users last activity date #2936
+* Ability to follow HTML redirections when retrieving full article content #2985
+
+[1.10.0]
+* Add forum url and update screenshot links
+
+[1.11.0]
+* Update FreshRSS to 1.17.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.17.0)
+* New tag management page #3121
+* New page to add feeds and categories #3027
+* Add a way to disable/enable users #3056
+* Fix special characters in user queries #3037
+* Hide feed credentials when adding a new feed #3099
+* Trim whitespace for feed passwords #3158
+* Updated PHPMailer library to 6.1.6 #3024
+* Add blogger.com to the default list of forced HTTPS #3088
+
+[1.12.0]
+* Update base image to v3
+* Update PHP to 7.4
+
+[1.13.0]
+* Update FreshRSS to 1.18.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.18.0)
+* Allow parallel requests #3096 - Much faster manual feeds refresh
+* Reload full article content when an article has changed #3506
+* New share article link to clipboard #3330
+* Improved OPML import of feeds with multiple categories #3286
+* Add a content action parameter to work with CSS selector #3453
+* New cURL options per feed: proxy, cookie, user-agent #3367, #3494, #3516
+* Do not import feeds causing database errors (e.g. due to conflicting HTTP redirections) ##3347
+
+[1.13.1]
+* Fix apache config to log the client IP
+
+[1.13.2]
+* Update FreshRSS to 1.18.1
+* Support standard HTTP 410 Gone by disabling (muting) gone feeds #3561
+* Supported by Newsboat 2.24+ #3574
+* Supported by RSS Guard #3627
+* Allow Unicode for shortcuts #3548
+
+[1.14.0]
+* Update FreshRSS to 1.19.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.19.0)
+
+[1.14.1]
+* Update FreshRSS to 1.19.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.19.1)
+
+[1.14.2]
+* Update apache configs
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.6.1",
+  "version": "1.14.2",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
@@ -14,26 +14,20 @@
     "scheduler": {
       "update_feeds": {
         "schedule": "*/1 * * * *",
-        "command": "/usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
+        "command": "echo '==> Run actualize script' && /usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
       }
     }
   },
-  "manifestVersion": 1,
+  "manifestVersion": 2,
   "website": "http://www.freshrss.org",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
-  "tags": [
+  "tags": [ "rss", "atom", "greader", "reader", "news", "feeds", "feedly" ],
-    "rss",
-    "atom",
-    "greader",
-    "reader",
-    "news",
-    "feeds"
-  ],
   "mediaLinks": [
-    "https://s3.amazonaws.com/cloudron-app-screenshots/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
+    "https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "2.0.0",
+  "minBoxVersion": "5.3.0",
+  "forumUrl": "https://forum.cloudron.io/category/27/freshrss",
   "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/"
 }

DESCRIPTION.md

@@ -1,4 +1,6 @@
-This app packages FreshRSS <upstream>1.14.1</upstream>.
+This app packages FreshRSS <upstream>1.19.1</upstream>.
+
+## About
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
 
@@ -6,12 +8,13 @@ It is at the same time lightweight, easy to work with, powerful and customizable
 
 It is a multi-user application with an anonymous reading mode. It supports PubSubHubbub for instant notifications from compatible Web sites. There is an API for (mobile) clients, and a Command-Line Interface. Finally, it supports extensions for further tuning.
 
-### Extensions
+## Extensions
+
 FreshRSS supports further customizations by adding extensions on top of its core functionality.
 See the [repository dedicated to those extensions](https://github.com/FreshRSS/Extensions).
 
 
-### Compatible clients
+## Compatible clients
 Any client supporting a Google Reader-like API. Selection:
 
 * Android
@@ -19,3 +22,6 @@ Any client supporting a Google Reader-like API. Selection:
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Open source, F-Droid)
 * Linux
 	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Open source)
+* Mac/iOS
+    * [Reeder](https://reederapp.com/)
+

Dockerfile

@@ -1,14 +1,15 @@
-FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
+FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.14.1.tar.gz | tar -zxvf - --strip-components=1
+ARG VERSION=1.19.1
+RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1
 
 RUN mv data data-orig && ln -s /app/data data
 
 # official extensions
-RUN wget https://github.com/FreshRSS/Extensions/archive/0812ee05c24c5610e4a9fefbef372d49dafb447f.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+RUN wget https://github.com/FreshRSS/Extensions/archive/1784092164139dc6961ba5cc5b920331b586acbc.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
     mv /app/code/extensions /app/code/extensions-orig && \
     ln -s /app/data/extensions /app/code/extensions
 
@@ -25,12 +26,15 @@ RUN a2enmod headers expires deflate mime dir rewrite setenvif
 
 RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
 
-RUN crudini --set /etc/php/7.2/apache2/php.ini PHP upload_max_filesize 64M && \
+RUN crudini --set /etc/php/7.4/apache2/php.ini PHP upload_max_filesize 64M && \
-    crudini --set /etc/php/7.2/apache2/php.ini PHP post_max_size 64M && \
+    crudini --set /etc/php/7.4/apache2/php.ini PHP post_max_size 64M && \
-    crudini --set /etc/php/7.2/apache2/php.ini PHP memory_limit 64M && \
+    crudini --set /etc/php/7.4/apache2/php.ini PHP memory_limit 64M && \
-    crudini --set /etc/php/7.2/apache2/php.ini Session session.save_path /run/php/session && \
+    crudini --set /etc/php/7.4/apache2/php.ini Session session.save_path /run/php/session && \
-    crudini --set /etc/php/7.2/apache2/php.ini Session session.gc_probability 1 && \
+    crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_probability 1 && \
-    crudini --set /etc/php/7.2/apache2/php.ini Session session.gc_divisor 100
+    crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_divisor 100
+
+RUN ln -s /app/data/php.ini /etc/php/7.4/apache2/conf.d/99-cloudron.ini && \
+    ln -s /app/data/php.ini /etc/php/7.4/cli/conf.d/99-cloudron.ini
 
 ADD start.sh /app/code/start.sh
 

POSTINSTALL.md

@@ -1,10 +1,7 @@
-This application does not integrate with Cloudron authentication.
+This app is pre-setup with an admin account. The initial credentials are:
+  
+**Username**: admin<br/>
+**Password**: changeme<br/>
 
-There is a preconfigured administrator account with the following credentials:
+Please change the admin password immediately.
 
-* Username: `admin`
-* Password: `changeme`
-
-(Please change that password on first login)
-
-You can create more accounts withing the app when logged in as administrator.

apache/freshrss.conf

@@ -1,18 +1,16 @@
+ServerName %{HTTP_HOST}
+
 <VirtualHost *:8000>
     DocumentRoot /app/code/p
     AllowEncodedSlashes On
 
-    ErrorLog /dev/stderr 
+    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
-    CustomLog /dev/stdout combined
+    CustomLog "|/bin/cat" proxy
+    ErrorLog "|/bin/cat"
 
     <Directory /app/code/p/>
         Options +FollowSymLinks
         AllowOverride All
         Require all granted
-
-        <IfModule mod_php7.c>
-            php_value memory_limit 64m
-        </IfModule>
-
     </Directory>
 </VirtualHost>

apache/mpm_prefork.conf

@@ -9,7 +9,7 @@
 	MaxSpareServers 3
 
     # Maximum number of servers at any given instant. Requests will be queued after this
-	MaxRequestWorkers	  6
+	MaxRequestWorkers	  10
 
     # Recycle process after handling these many requests. This protected against accidental memory leaks
 	MaxConnectionsPerChild   100

start.sh

@@ -9,16 +9,18 @@ if ! [ -f /app/data/.installed ]; then
     rsync -a /app/code/data-orig/ /app/data/
     php cli/do-install.php \
       --environment production --default_user admin \
-      --db-type mysql --db-host "${MYSQL_HOST}" \
+      --db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \
-      --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
+      --db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
-      --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+      --db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
       --disable_update
     php cli/create-user.php --user admin --password changeme --language en
-    php cli/actualize-user.php --user admin
     touch /app/data/.installed
     echo "==> Done."
 fi
 
+if [[ ! -f /app/data/php.ini ]]; then
+    echo -e "; Add custom PHP configuration in this file\n; Settings here are merged with the package's built-in php.ini\n\n" > /app/data/php.ini
+fi
 
 echo "==> Symlinking log file"
 rm -f /app/data/users/_/log_api.txt
@@ -33,19 +35,16 @@ for f in $(ls /app/code/extensions-orig); do
     cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
 done
 
-
 echo "==> Updating config file"
-php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}" \
+php cli/reconfigure.php --default_user admin --base_url "https://${CLOUDRON_APP_DOMAIN}" \
-    --db-type mysql --db-host "${MYSQL_HOST}" \
+    --db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \
-    --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
+    --db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
-    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+    --db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
     --disable_update
 
-
 echo "==> Setting permissions"
 chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt
 
-
 echo "==> Starting apache"
 APACHE_CONFDIR="" source /etc/apache2/envvars
 rm -f "${APACHE_PID_FILE}"

test/package.json

@@ -9,14 +9,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^2.38.3",
+    "chromedriver": "^97.0.0",
-    "ejs": "^2.4.2",
+    "ejs": "^3.1.6",
     "expect.js": "^0.3.1",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.4",
-    "mocha": "^2.5.3",
+    "mocha": "^9.1.3",
-    "rimraf": "^2.5.3",
+    "rimraf": "^3.0.2",
-    "selenium-server-standalone-jar": "^2.53.1",
+    "selenium-webdriver": "^4.1.0",
-    "selenium-webdriver": "^2.53.3",
+    "superagent": "^7.0.1"
-    "superagent": "^1.8.5"
   }
 }

test/test.js

@@ -1,5 +1,11 @@
 #!/usr/bin/env node
 
+/* jshint esversion: 8 */
+/* global describe */
+/* global before */
+/* global after */
+/* global it */
+
 'use strict';
 
 require('chromedriver');
@@ -8,50 +14,36 @@ var execSync = require('child_process').execSync,
     expect = require('expect.js'),
     path = require('path'),
     superagent = require('superagent'),
-    webdriver = require('selenium-webdriver');
+    { Builder, By, Key, until } = require('selenium-webdriver'),
-
+    { Options } = require('selenium-webdriver/chrome');
-var by = webdriver.By,
-    until = webdriver.until;
 
 var username = 'admin',
     password = 'changeme';
 
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-
-
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    var chrome = require('selenium-webdriver/chrome');
+    const LOCATION = 'test';
-    var server, browser = new chrome.Driver();
+    const TEST_TIMEOUT = 10000;
+    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
-    before(function (done) {
+    var browser, app;
-        var seleniumJar= require('selenium-server-standalone-jar');
-        var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
-        server = new SeleniumServer(seleniumJar.path, { port: 4444 });
-        server.start();
 
-        done();
+    before(function () {
+        const options = new Options().windowSize({ width: 1280, height: 1024 });
+        if (process.env.HEADLESS) options.addArguments('headless');
+
+        browser = new Builder().forBrowser('chrome').setChromeOptions(options).build();
     });
 
-    after(function (done) {
+    after(function () {
         browser.quit();
-        server.stop();
-        done();
     });
 
-    var LOCATION = 'test';
+    function getAppInfo() {
-    var TEST_TIMEOUT = 10000;
+        var inspect = JSON.parse(execSync('cloudron inspect'));
-    var app;
+        app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
-
+        expect(app).to.be.an('object');
-    function exists(selector) {
-        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT);
-    }
-
-    function visible(selector, callback) {
-        return exists(selector).then(function () {
-            return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
-        });
     }
 
     function baseUrl() {
@@ -59,121 +51,69 @@ describe('Application life cycle test', function () {
         return `https://${app.fqdn}`;
     }
 
-    // we do this because it perm redirects to /p/ in old versions
+    async function waitForElement(elem) {
-    function clearCache() {
+        await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
-        // https://stackoverflow.com/questions/49614217/selenium-clear-chrome-cache
+        await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
-        // defaut clearance is 1 hour of cache
-        return browser.get('chrome://settings/clearBrowserData').then(function () {
-            return visible(by.css('* /deep/ #clearBrowsingDataConfirm'));
-        }).then(function () {
-            return browser.findElement(by.css('* /deep/ #clearBrowsingDataConfirm')).click();
-        }).then(function () {
-            return browser.sleep(5000);
-        });
     }
 
-    function login(password, callback) {
+    async function login(password) {
-        clearCache().then(function () {
+        await browser.get('https://' + app.fqdn);
-            return browser.get('https://' + app.fqdn);
+        await waitForElement(By.id('loginButton'));
-        }).then(function () {
+        await browser.findElement(By.id('username')).sendKeys(username);
-            return visible(by.id('loginButton'));
+        await browser.findElement(By.id('passwordPlain')).sendKeys(password);
-        }).then(function () {
+        await browser.findElement(By.id('loginButton')).click();
-            return browser.findElement(by.id('username')).sendKeys(username);
+        await waitForElement(By.id('btn-subscription'));
-        }).then(function () {
-            return browser.findElement(by.id('passwordPlain')).sendKeys(password);
-        }).then(function () {
-            return browser.findElement(by.id('loginButton')).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.id('dropdown-configure')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
     }
 
-    function logout(callback) {
+    async function logout() {
-        var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
+        var logout_btn = By.xpath('//li/a[@class="signout"]');
 
-        browser.get('https://' + app.fqdn).then(function () {
+        await browser.get('https://' + app.fqdn);
-            return visible(by.id('stream'));
+        await waitForElement(By.id('stream'));
-        }).then(function () {
+        await browser.findElement(By.className('dropdown-toggle')).click();
-            return browser.findElement(by.className('dropdown-toggle')).click();
+        await waitForElement(logout_btn);
-        }).then(function () {
+        await browser.findElement(logout_btn).click();
-            return visible(logout_btn);
+        await waitForElement(By.id('loginButton'));
-        }).then(function () {
-            return browser.findElement(logout_btn).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
     }
 
-    function addSubscription(callback) {
+    async function addSubscription() {
-        var url = "https://cloudron.io/blog/rss.xml";
+        var url = 'https://blog.cloudron.io/rss/';
+        const addUrl = app.manifest.version === '1.10.0' ? `${baseUrl()}/i/?c=subscription` : `${baseUrl()}/i/?c=subscription&a=add`;
 
-        browser.get(`${baseUrl()}/i/?c=subscription`).then(function () {
+        await browser.get(addUrl);
-            return visible(by.xpath('//input[@name="url_rss"]'));
+        await waitForElement(By.xpath('//input[@name="url_rss"]'));
-        }).then(function () {
+        await browser.findElement(By.xpath('//input[@name="url_rss"]')).sendKeys(url);
-            return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
+        await browser.findElement(By.xpath('//form[@id="add_rss"]//button[text()="Add"]')).click();
-        }).then(function () {
+        await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
-            return browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
-        }).then(function () {
-            return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
-        }).then(function () {
-            callback();
-        });
     }
 
-    function addUser(password, callback) {
+    async function addUser(password) {
         var test_username = 'test';
 
-        browser.get(`${baseUrl()}/i/?c=user&a=manage`).then(function () {
+        await browser.get(`${baseUrl()}/i/?c=user&a=manage`);
-            return visible(by.id('new_user_name'));
+        await waitForElement(By.id('new_user_name'));
-        }).then(function () {
+        await browser.findElement(By.id('new_user_name')).sendKeys(test_username);
-            return browser.findElement(by.id('new_user_name')).sendKeys(test_username);
+        await browser.findElement(By.id('new_user_passwordPlain')).sendKeys(password);
-        }).then(function () {
+        await browser.findElement(By.xpath('//button[text()="Create"]')).click();
-            return browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
+        await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
-        }).then(function () {
-            return browser.findElement(by.xpath('//button[text()="Create"]')).click();
-        }).then(function () {
-            return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
-        }).then(function () {
-            callback();
-        });
     }
 
-    function enableApi(callback) {
+    async function enableApi() {
-        browser.get(`${baseUrl()}/i/?c=auth`).then(function () {
+        await browser.get(`${baseUrl()}/i/?c=auth`);
-            return browser.findElement(by.id('api_enabled')).click();
+        await waitForElement(By.id('api_enabled'));
-        }).then(function () {
+        await browser.findElement(By.id('api_enabled')).click();
-            return browser.findElement(by.xpath('//button[text()="Submit"]')).submit();
+        await browser.findElement(By.xpath('//button[text()="Submit"]')).click();
-        }).then(function () {
-            callback();
-        });
     }
 
-    function checkApiConfiguration(callback) {
+    async function checkApiConfiguration() {
-        browser.get(`${baseUrl()}/api/`).then(function () {
+        await browser.get(`${baseUrl()}/api/`);
-            return exists(by.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
+        await waitForElement(By.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
-        }).then(function () {
+        await waitForElement(By.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
-            return exists(by.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
-        }).then(function () {
-            callback();
-        });
     }
 
-    function getAppInfo() {
+    async function subscriptionExists() {
-        var inspect = JSON.parse(execSync('cloudron inspect'));
+        await browser.get(`${baseUrl()}/i/?get=c_1`);
-        app = inspect.apps.filter(function (a) { return a.location === LOCATION || a.location === LOCATION + '2'; })[0];
+        return waitForElement(By.xpath('//span[text()="Cloudron"]'));
-        expect(app).to.be.an('object');
-    }
-
-    function subscriptionExists(callback) {
-        browser.get(`${baseUrl()}/i/?get=c_1`).then(function () {
-            return visible(by.xpath('//a[text()="Cloudron.io"]'));
-        }).then(function () {
-            callback();
-        });
     }
 
     function getStaticExtensionFile(callback) {
@@ -187,13 +127,8 @@ describe('Application life cycle test', function () {
         });
     }
 
-    xit('build app', function () {
+    xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
-        execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+    it('install app', function () { execSync('cloudron install --location ' + LOCATION, EXEC_ARGS); });
-    });
-
-    it('install app', function () {
-        execSync('cloudron install --new --wait --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
 
     it('can get app information', getAppInfo);
 
@@ -206,12 +141,14 @@ describe('Application life cycle test', function () {
     it('can get static extension file', getStaticExtensionFile);
     it('can logout', logout);
 
-    it('backup app', function () {
+    it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
-        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' });
+        const backups = JSON.parse(execSync(`cloudron backup list --raw --app ${app.id}`));
+        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+        execSync('cloudron install --location ' + LOCATION, EXEC_ARGS);
+        getAppInfo();
+        execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, EXEC_ARGS);
     });
 
     it('can login', login.bind(null, password));
@@ -222,7 +159,7 @@ describe('Application life cycle test', function () {
 
     it('move to different location', function () {
         browser.manage().deleteAllCookies();
-        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');
@@ -234,14 +171,10 @@ describe('Application life cycle test', function () {
     it('can get static extension file', getStaticExtensionFile);
     it('can logout', logout);
 
-    it('uninstall app', function () {
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
 
     // test update
-    it('can install app', function () {
+    it('can install app', function () { execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
-        execSync('cloudron install --new --wait --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
 
     it('can get app information', getAppInfo);
     it('can login', login.bind(null, password));
@@ -249,7 +182,7 @@ describe('Application life cycle test', function () {
     it('can add users', addUser.bind(null, password));
 
     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);
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
         expect(app).to.be.an('object');
@@ -259,7 +192,5 @@ describe('Application life cycle test', function () {
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
 
-    it('uninstall app', function () {
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
 });