Bump version

CHANGELOG.md

@@ -302,3 +302,20 @@
 * Fix crash regression when enabling extensions defined by old FreshRSS installations #5979
 * Fix crash regression during export when using MySQL #5988
 * More robust assignment of categories to feeds #5986
+
+[1.21.0]
+* Update FreshRSS to 1.24.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.24.0)
+* New shareable user query mechanism to share lists of articles by HTML, RSS, OPML
+* New CLI for database backup & restore
+* New JSON scraping mode to consume JSON data and JSON Feeds
+* New support for HTTP POST
+* New option to automatically add labels to incoming articles
+* New button to download a feed configuration as OPML
+
+[1.21.1]
+* Update FreshRSS to 1.24.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.24.1)
+* New button to export OMPL of a category
+* Many bug fixes
+

CloudronManifest.json

@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "RSS feed reader",
-  "version": "1.20.1",
+  "version": "1.21.1",
-  "upstreamVersion": "1.23.1",
+  "upstreamVersion": "1.24.1",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {

Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y libapache2-mod-
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.23.1
+ARG VERSION=1.24.1
 RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1 && \
     mv data data-orig && ln -s /app/data data
 

test/package.json

@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^120.0.1",
+    "chromedriver": "^125.0.3",
     "expect.js": "^0.3.1",
-    "mocha": "^10.2.0",
+    "mocha": "^10.4.0",
-    "selenium-webdriver": "^4.16.0",
+    "selenium-webdriver": "^4.21.0",
-    "superagent": "^8.1.2"
+    "superagent": "^9.0.2"
   }
 }

test/test.js

@@ -77,15 +77,12 @@ describe('Application life cycle test', function () {
     async function loginOIDC(username, password) {
         browser.manage().deleteAllCookies();
         await browser.get(`https://${app.fqdn}/i/`);
-        await browser.sleep(6000);
 
         if (!athenticated_by_oidc) {
-            await waitForElement(By.xpath('//input[@name="username"]'));
+            await waitForElement(By.id('inputUsername'));
-            await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username);
+            await browser.findElement(By.id('inputUsername')).sendKeys(username);
-            await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password);
+            await browser.findElement(By.id('inputPassword')).sendKeys(password);
-            await browser.sleep(2000);
+            await browser.findElement(By.id('loginSubmitButton')).click();
-            await browser.findElement(By.xpath('//button[@type="submit" and contains(text(), "Sign in")]')).click();
-            await browser.sleep(2000);
 
             athenticated_by_oidc = true;
         }
@@ -173,7 +170,7 @@ describe('Application life cycle test', function () {
     it('can get app information', getAppInfo);
 
     it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
-    it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default_user ${USERNAME}"`); });
+    it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default-user ${USERNAME}"`); });
     it('can subscribe', addSubscription);
     it('can enable API', enableApi);
     it('can check configuration', checkApiConfiguration);
@@ -211,13 +208,12 @@ describe('Application life cycle test', function () {
     it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
 
     // test update
-    it('can install app', function () { execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
+    it('can install app for update', function () { execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
 
     it('can get app information', getAppInfo);
     it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
-    it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default_user ${USERNAME}"`); });
+    it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default-user ${USERNAME}"`); });
     it('can subscribe', addSubscription);
-    it('can add users', addUser.bind(null, 'test', admin_password));
 
     it('can update', function () {
         execSync('cloudron update --app ' + app.id, EXEC_ARGS);
@@ -226,6 +222,7 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     });
 
+    it('can add users', addUser.bind(null, 'test', admin_password));
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);