Version 1.1.2

CHANGELOG

@@ -43,3 +43,13 @@
 
 [1.0.0]
 * Fix issue where static extension assets were not served
+
+[1.1.0]
+* Update FreshRSS to 1.11.0
+
+[1.1.1]
+* Update FreshRSS to to 1.11.1
+
+[1.1.2]
+* Update FreshRSS to 1.11.2
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.10.2</upstream>.
+This app packages FreshRSS <upstream>1.11.2</upstream>.
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
 

Dockerfile

@@ -4,18 +4,15 @@ RUN apt-get update \
     && apt-get -y install php php-curl php-gmp php-intl php-mbstring php-xml php-zip \
        libapache2-mod-php mysql-client php-mysql
 
-ENV EXTENSIONS_VERSION b63f55d6fdd8e93da846bb741c3fed12d50909be
-
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-# contains fix for extensions_path (see #2)
-RUN curl -L https://github.com/cloudron-io/FreshRSS/archive/d56d8f31bd0e1f73e91ab9130a25fa0121cfd086.tar.gz | tar -zxvf - --strip-components=1
+RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.11.2.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/${EXTENSIONS_VERSION}.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+RUN wget https://github.com/FreshRSS/Extensions/archive/2d0358e75961cbfcac7c2cbe09b098905ff67803.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
 

test/test.js

@@ -45,79 +45,83 @@ describe('Application life cycle test', function () {
     var TEST_TIMEOUT = 10000;
     var app;
 
-    function exists(selector, callback) {
-        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
-            callback();
-        });
+    function exists(selector) {
+        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT);
     }
 
     function visible(selector, callback) {
-        exists(selector, function () {
-            browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT).then(function () {
-                callback();
-            });
+        return exists(selector).then(function () {
+            return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
         });
     }
 
     function login(callback) {
-        browser.manage().deleteAllCookies();
-        browser.get('https://' + app.fqdn);
-
-        visible(by.id('loginButton'), function () {
-            browser.findElement(by.id('username')).sendKeys(username);
-            browser.findElement(by.id('passwordPlain')).sendKeys(password);
-            browser.findElement(by.id('loginButton')).click();
-            browser.wait(until.elementLocated(by.id('dropdown-configure')), TEST_TIMEOUT).then(function () { callback(); });
+        browser.manage().deleteAllCookies().then(function () {
+            return browser.get('https://' + app.fqdn);
+        }).then(function () {
+            return visible(by.id('loginButton'));
+        }).then(function () {
+            return browser.findElement(by.id('username')).sendKeys(username);
+        }).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) {
         var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
 
-        browser.get('https://' + app.fqdn);
-
-        visible(by.id('stream'), function () {
-            browser.findElement(by.className('dropdown-toggle')).click();
-            visible(logout_btn, function () {
-                browser.findElement(logout_btn).click();
-
-                browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT).then(function () { callback(); });
-            });
+        browser.get('https://' + app.fqdn).then(function () {
+            return visible(by.id('stream'));
+        }).then(function () {
+            return browser.findElement(by.className('dropdown-toggle')).click();
+        }).then(function () {
+            return visible(logout_btn);
+        }).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) {
         var url = "https://cloudron.io/blog/rss.xml";
 
-        browser.get('https://' + app.fqdn);
-
-        visible(by.id('stream'), function () {
-            browser.findElement(by.xpath('//a[@href=".?c=subscription"]')).click();
-            visible(by.id('add_rss'), function () {
-                browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
-                browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
-                visible(by.xpath('//div[@id="notification" and @class="notification good"]'), function() { callback(); });
-            });
+        browser.get(`https://${app.fqdn}/p/i/?c=subscription`).then(function () {
+            return visible(by.xpath('//input[@name="url_rss"]'));
+        }).then(function () {
+            return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
+        }).then(function () {
+            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(callback) {
         var test_username = 'test';
-        var manage_users_btn = by.xpath('//a[@href=".?c=user&a=manage"]');
 
-        browser.get('https://' + app.fqdn);
-
-        visible(by.id('stream'), function () {
-            browser.findElement(by.className('dropdown-toggle')).click();
-            visible(manage_users_btn, function () {
-                browser.findElement(manage_users_btn).click();
-                visible(by.id('new_user_name'), function () {
-                    browser.findElement(by.id('new_user_name')).sendKeys(test_username);
-                    browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
-                    browser.findElement(by.xpath('//form[@action=".?c=user&a=create"]/div/div/button[@type="submit"]')).click();
-                    visible(by.xpath('//div[@id="notification" and @class="notification good"]'), function() { callback(); });
-                });
-            });
+        browser.get(`https://${app.fqdn}/p/i/?c=user&a=manage`).then(function () {
+            return visible(by.id('new_user_name'));
+        }).then(function () {
+            return browser.findElement(by.id('new_user_name')).sendKeys(test_username);
+        }).then(function () {
+            return browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
+        }).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();
         });
     }
 
@@ -125,13 +129,17 @@ describe('Application life cycle test', function () {
         browser.get('https://' + app.fqdn + '/p/i/?c=auth').then(function () {
             return browser.findElement(by.id('api_enabled')).click();
         }).then(function () {
-            return browser.findElement(by.xpath('//form[@action=".?c=auth"]')).submit();
-        }).then(callback);
+            return browser.findElement(by.xpath('//button[text()="Submit"]')).submit();
+        }).then(function () {
+            callback();
+        });
     }
 
     function checkApiConfiguration(callback) {
         browser.get('https://' + app.fqdn + '/p/api/greader.php/check%2Fcompatibility').then(function () {
-            exists(by.xpath('//pre[text()="PASS"]'), callback);
+            return exists(by.xpath('//pre[text()="PASS"]'));
+        }).then(function () {
+            callback();
         });
     }
 
@@ -142,9 +150,11 @@ describe('Application life cycle test', function () {
     }
 
     function subscriptionExists(callback) {
-        browser.get('https://' + app.fqdn + '/p/i/?get=c_1');
-
-        visible(by.xpath('//a[text()="Cloudron.io"]'), callback);
+        browser.get('https://' + app.fqdn + '/p/i/?get=c_1').then(function () {
+            return visible(by.xpath('//a[text()="Cloudron.io"]'));
+        }).then(function () {
+            callback();
+        });
     }
 
     function getStaticExtensionFile(callback) {