Update package version to 1.22.0

This reverts commit 9eb5c48ec8.

CHANGELOG.md

@@ -319,3 +319,28 @@
 * New button to export OMPL of a category
 * Many bug fixes
 
+[1.21.2]
+* Update FreshRSS to 1.24.2
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.24.2)
+* New global option to automatically add articles to favourites
+* New option to share articles from the article title line
+* Add core extensions, shipped by default: UserCSS and UserJS
+* Security: Force log out of users when they are disabled
+* Last version supporting PHP 7.4 and initial support for PHP 8.4+
+* Many bug and regression fixes
+
+[1.21.3]
+* Update FreshRSS to 1.24.3
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.24.3)
+* Fix mark-as-read from user query #6738
+* Fix regression for shortcut to move between categories #6741
+* Fix feed title option #6771
+* Fix XPath for HTML documents with broken root (used by CSS selectors to fetch full content) #6774
+* Fix UI regression in Mapco/Ansum themes #6740
+* Fix minor style bug with some themes #6746
+* Fix export of OPML information for date format of JSON and HTML+XPath feeds #6779
+* OpenID Connect better definition of session parameters #6730
+
+[1.22.0]
+* checklist added to CloudronManifest
+

CloudronManifest.json

@@ -5,14 +5,16 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "RSS feed reader",
-  "version": "1.21.1",
+  "version": "1.22.0",
-  "upstreamVersion": "1.24.1",
+  "upstreamVersion": "1.24.3",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
     "localstorage": {},
     "mysql": {},
-    "oidc": { "loginRedirectUri": "/i/oidc/" },
+    "oidc": {
+      "loginRedirectUri": "/i/oidc/"
+    },
     "scheduler": {
       "update_feeds": {
         "schedule": "*/1 * * * *",
@@ -20,16 +22,34 @@
       }
     }
   },
+  "checklist": {
+    "change-default-password": {
+      "sso": false,
+      "message": "Change the default admin password"
+    },
+    "create-admin": {
+      "sso": true,
+      "message": "On first visit, sign in using the built-in Cloudron authentication and then make the user administrator by running: `php cli/reconfigure.php --default_user YOUR_USERNAME`"
+    }
+  },
   "manifestVersion": 2,
   "website": "http://www.freshrss.org",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
-  "tags": [ "rss", "atom", "greader", "reader", "news", "feeds", "feedly" ],
+  "tags": [
+    "rss",
+    "atom",
+    "greader",
+    "reader",
+    "news",
+    "feeds",
+    "feedly"
+  ],
   "mediaLinks": [
     "https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "7.5.1",
+  "minBoxVersion": "8.1.0",
   "forumUrl": "https://forum.cloudron.io/category/27/freshrss",
   "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/",
   "optionalSso": true

Dockerfile

@@ -5,8 +5,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y libapache2-mod-
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.24.1
+# renovate: datasource=github-releases depName=FreshRSS/FreshRSS versioning=semver
-RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1 && \
+ARG FRESHRSS_VERSION=1.24.3
+
+RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz | tar -zxvf - --strip-components=1 && \
     mv data data-orig && ln -s /app/data data
 
 # official extensions (https://github.com/FreshRSS/Extensions/commits/master)

POSTINSTALL.md

@@ -1,16 +1,7 @@
-<sso>
-On first visit, sign in using the built-in Cloudron authentication and then make the user administrator
-by running:
-```
-php cli/reconfigure.php --default_user YOUR_USERNAME
-```
-</sso>
-
 <nosso>
 This app is pre-setup with an admin account. The initial credentials are:
   
 **Username**: admin<br/>
 **Password**: changeme<br/>
 
-Please change the admin password immediately.
 </nosso>

renovate.json5

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": ["local>devops/renovator//default.renovate.json5"]
+}

test/package-lock.json

@@ -9,13 +9,18 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^125.0.3",
+        "chromedriver": "^128.0.1",
         "expect.js": "^0.3.1",
-        "mocha": "^10.4.0",
+        "mocha": "^10.7.3",
-        "selenium-webdriver": "^4.21.0",
+        "selenium-webdriver": "^4.24.0",
-        "superagent": "^9.0.2"
+        "superagent": "^10.1.0"
       }
     },
+    "node_modules/@bazel/runfiles": {
+      "version": "5.8.1",
+      "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-5.8.1.tgz",
+      "integrity": "sha512-NDdfpdQ6rZlylgv++iMn5FkObC/QlBQvipinGLSOguTYpRywmieOyJ29XHvUilspwTFSILWpoE9CqMGkHXug1g=="
+    },
     "node_modules/@testim/chrome-version": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
@@ -69,9 +74,9 @@
       }
     },
     "node_modules/ansi-colors": {
-      "version": "4.1.1",
+      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "engines": {
         "node": ">=6"
       }
@@ -129,9 +134,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/axios": {
-      "version": "1.7.2",
+      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+      "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -262,13 +267,13 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "125.0.3",
+      "version": "128.0.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-125.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-128.0.1.tgz",
-      "integrity": "sha512-Qzuk5Wian2o3EVGjtbz6V/jv+pT/AV9246HbG6kUljZXXjsKZLZxqJC+kHR3qEh/wdv4EJD0YwAOWV72v9hogw==",
+      "integrity": "sha512-UmWqZXXAyuRa37pE+lnU46vJcCM/y0ddF015LHxycEOYfuqsK7k9ZxJuXCQNWbws9e7FAMQj/GJZT92WPgis0g==",
       "hasInstallScript": true,
       "dependencies": {
         "@testim/chrome-version": "^1.1.4",
-        "axios": "^1.6.7",
+        "axios": "^1.7.4",
         "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
         "proxy-agent": "^6.4.0",
@@ -466,9 +471,9 @@
       }
     },
     "node_modules/diff": {
-      "version": "5.0.0",
+      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -1192,30 +1197,30 @@
       }
     },
     "node_modules/mocha": {
-      "version": "10.4.0",
+      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
-      "integrity": "sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==",
+      "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
       "dependencies": {
-        "ansi-colors": "4.1.1",
+        "ansi-colors": "^4.1.3",
-        "browser-stdout": "1.3.1",
+        "browser-stdout": "^1.3.1",
-        "chokidar": "3.5.3",
+        "chokidar": "^3.5.3",
-        "debug": "4.3.4",
+        "debug": "^4.3.5",
-        "diff": "5.0.0",
+        "diff": "^5.2.0",
-        "escape-string-regexp": "4.0.0",
+        "escape-string-regexp": "^4.0.0",
-        "find-up": "5.0.0",
+        "find-up": "^5.0.0",
-        "glob": "8.1.0",
+        "glob": "^8.1.0",
-        "he": "1.2.0",
+        "he": "^1.2.0",
-        "js-yaml": "4.1.0",
+        "js-yaml": "^4.1.0",
-        "log-symbols": "4.1.0",
+        "log-symbols": "^4.1.0",
-        "minimatch": "5.0.1",
+        "minimatch": "^5.1.6",
-        "ms": "2.1.3",
+        "ms": "^2.1.3",
-        "serialize-javascript": "6.0.0",
+        "serialize-javascript": "^6.0.2",
-        "strip-json-comments": "3.1.1",
+        "strip-json-comments": "^3.1.1",
-        "supports-color": "8.1.1",
+        "supports-color": "^8.1.1",
-        "workerpool": "6.2.1",
+        "workerpool": "^6.5.1",
-        "yargs": "16.2.0",
+        "yargs": "^16.2.0",
-        "yargs-parser": "20.2.4",
+        "yargs-parser": "^20.2.9",
-        "yargs-unparser": "2.0.0"
+        "yargs-unparser": "^2.0.0"
       },
       "bin": {
         "_mocha": "bin/_mocha",
@@ -1226,9 +1231,9 @@
       }
     },
     "node_modules/mocha/node_modules/debug": {
-      "version": "4.3.4",
+      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -1257,17 +1262,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mocha/node_modules/minimatch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/mocha/node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -1541,22 +1535,23 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.21.0",
+      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.24.0.tgz",
-      "integrity": "sha512-WaEJHZjOWNth1QG5FEpxpREER0qptZBMonFU6GtAqdCNLJVxbtC3E7oS/I/+Q1sf1W032Wg0Ebk+m46lANOXyQ==",
+      "integrity": "sha512-qrqoHhHPZuKLiz5VAQUxrn3ILs7/cYqn2/x96r35g5JjkLUjOS1lX+F+tEJKhRMlQ/MGJ+N1016JF5g2xZUFzw==",
       "dependencies": {
+        "@bazel/runfiles": "^5.8.1",
         "jszip": "^3.10.1",
         "tmp": "^0.2.3",
-        "ws": ">=8.16.0"
+        "ws": "^8.18.0"
       },
       "engines": {
         "node": ">= 14.21.0"
       }
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.0",
+      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -1684,9 +1679,9 @@
       }
     },
     "node_modules/superagent": {
-      "version": "9.0.2",
+      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.1.0.tgz",
-      "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==",
+      "integrity": "sha512-JMmik7PbnXGlq7g528Gi6apHbVbTz2vrE3du6fuG4kIPSb2PnLoSOPvfjKn8aQYuJcBWAKW6ZG90qPPsE5jZxQ==",
       "dependencies": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.4",
@@ -1776,9 +1771,9 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "node_modules/workerpool": {
-      "version": "6.2.1",
+      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
-      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA=="
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
@@ -1842,9 +1837,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/ws": {
-      "version": "8.17.0",
+      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -1887,9 +1882,9 @@
       }
     },
     "node_modules/yargs-parser": {
-      "version": "20.2.4",
+      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "engines": {
         "node": ">=10"
       }
@@ -1970,6 +1965,11 @@
     }
   },
   "dependencies": {
+    "@bazel/runfiles": {
+      "version": "5.8.1",
+      "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-5.8.1.tgz",
+      "integrity": "sha512-NDdfpdQ6rZlylgv++iMn5FkObC/QlBQvipinGLSOguTYpRywmieOyJ29XHvUilspwTFSILWpoE9CqMGkHXug1g=="
+    },
     "@testim/chrome-version": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
@@ -2014,9 +2014,9 @@
       }
     },
     "ansi-colors": {
-      "version": "4.1.1",
+      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="
     },
     "ansi-styles": {
       "version": "4.3.0",
@@ -2059,9 +2059,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "axios": {
-      "version": "1.7.2",
+      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+      "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
       "requires": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -2151,12 +2151,12 @@
       }
     },
     "chromedriver": {
-      "version": "125.0.3",
+      "version": "128.0.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-125.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-128.0.1.tgz",
-      "integrity": "sha512-Qzuk5Wian2o3EVGjtbz6V/jv+pT/AV9246HbG6kUljZXXjsKZLZxqJC+kHR3qEh/wdv4EJD0YwAOWV72v9hogw==",
+      "integrity": "sha512-UmWqZXXAyuRa37pE+lnU46vJcCM/y0ddF015LHxycEOYfuqsK7k9ZxJuXCQNWbws9e7FAMQj/GJZT92WPgis0g==",
       "requires": {
         "@testim/chrome-version": "^1.1.4",
-        "axios": "^1.6.7",
+        "axios": "^1.7.4",
         "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
         "proxy-agent": "^6.4.0",
@@ -2303,9 +2303,9 @@
       }
     },
     "diff": {
-      "version": "5.0.0",
+      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A=="
     },
     "emoji-regex": {
       "version": "8.0.0",
@@ -2798,36 +2798,36 @@
       }
     },
     "mocha": {
-      "version": "10.4.0",
+      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
-      "integrity": "sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==",
+      "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
       "requires": {
-        "ansi-colors": "4.1.1",
+        "ansi-colors": "^4.1.3",
-        "browser-stdout": "1.3.1",
+        "browser-stdout": "^1.3.1",
-        "chokidar": "3.5.3",
+        "chokidar": "^3.5.3",
-        "debug": "4.3.4",
+        "debug": "^4.3.5",
-        "diff": "5.0.0",
+        "diff": "^5.2.0",
-        "escape-string-regexp": "4.0.0",
+        "escape-string-regexp": "^4.0.0",
-        "find-up": "5.0.0",
+        "find-up": "^5.0.0",
-        "glob": "8.1.0",
+        "glob": "^8.1.0",
-        "he": "1.2.0",
+        "he": "^1.2.0",
-        "js-yaml": "4.1.0",
+        "js-yaml": "^4.1.0",
-        "log-symbols": "4.1.0",
+        "log-symbols": "^4.1.0",
-        "minimatch": "5.0.1",
+        "minimatch": "^5.1.6",
-        "ms": "2.1.3",
+        "ms": "^2.1.3",
-        "serialize-javascript": "6.0.0",
+        "serialize-javascript": "^6.0.2",
-        "strip-json-comments": "3.1.1",
+        "strip-json-comments": "^3.1.1",
-        "supports-color": "8.1.1",
+        "supports-color": "^8.1.1",
-        "workerpool": "6.2.1",
+        "workerpool": "^6.5.1",
-        "yargs": "16.2.0",
+        "yargs": "^16.2.0",
-        "yargs-parser": "20.2.4",
+        "yargs-parser": "^20.2.9",
-        "yargs-unparser": "2.0.0"
+        "yargs-unparser": "^2.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.4",
+          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
           "requires": {
             "ms": "2.1.2"
           },
@@ -2844,14 +2844,6 @@
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
         },
-        "minimatch": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        },
         "ms": {
           "version": "2.1.3",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -3058,19 +3050,20 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "selenium-webdriver": {
-      "version": "4.21.0",
+      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.24.0.tgz",
-      "integrity": "sha512-WaEJHZjOWNth1QG5FEpxpREER0qptZBMonFU6GtAqdCNLJVxbtC3E7oS/I/+Q1sf1W032Wg0Ebk+m46lANOXyQ==",
+      "integrity": "sha512-qrqoHhHPZuKLiz5VAQUxrn3ILs7/cYqn2/x96r35g5JjkLUjOS1lX+F+tEJKhRMlQ/MGJ+N1016JF5g2xZUFzw==",
       "requires": {
+        "@bazel/runfiles": "^5.8.1",
         "jszip": "^3.10.1",
         "tmp": "^0.2.3",
-        "ws": ">=8.16.0"
+        "ws": "^8.18.0"
       }
     },
     "serialize-javascript": {
-      "version": "6.0.0",
+      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "requires": {
         "randombytes": "^2.1.0"
       }
@@ -3163,9 +3156,9 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
     "superagent": {
-      "version": "9.0.2",
+      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.1.0.tgz",
-      "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==",
+      "integrity": "sha512-JMmik7PbnXGlq7g528Gi6apHbVbTz2vrE3du6fuG4kIPSb2PnLoSOPvfjKn8aQYuJcBWAKW6ZG90qPPsE5jZxQ==",
       "requires": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.4",
@@ -3234,9 +3227,9 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "workerpool": {
-      "version": "6.2.1",
+      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
-      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA=="
     },
     "wrap-ansi": {
       "version": "7.0.0",
@@ -3284,9 +3277,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "8.17.0",
+      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "requires": {}
     },
     "y18n": {
@@ -3339,9 +3332,9 @@
       }
     },
     "yargs-parser": {
-      "version": "20.2.4",
+      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
     },
     "yargs-unparser": {
       "version": "2.0.0",

test/package.json

@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^125.0.3",
+    "chromedriver": "^128.0.1",
     "expect.js": "^0.3.1",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.3",
-    "selenium-webdriver": "^4.21.0",
+    "selenium-webdriver": "^4.24.0",
-    "superagent": "^9.0.2"
+    "superagent": "^10.1.0"
   }
 }

test/test.js

@@ -1,11 +1,6 @@
 #!/usr/bin/env node
 
-/* jshint esversion: 8 */
+/* global it, xit, describe, before, after, afterEach */
-/* global describe */
-/* global before */
-/* global after */
-/* global it */
-/* global xit */
 
 'use strict';
 
@@ -13,6 +8,7 @@ require('chromedriver');
 
 const execSync = require('child_process').execSync,
     expect = require('expect.js'),
+    fs = require('fs'),
     path = require('path'),
     superagent = require('superagent'),
     { Builder, By, Key, until } = require('selenium-webdriver'),
@@ -28,7 +24,7 @@ if (!process.env.USERNAME || !process.env.PASSWORD) {
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    const LOCATION = 'test';
+    const LOCATION = process.env.LOCATION || 'test';
     const TEST_TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 10000;
     const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
@@ -39,16 +35,27 @@ describe('Application life cycle test', function () {
     let athenticated_by_oidc = false;
 
     before(function () {
-        const options = new Options().windowSize({ width: 1280, height: 1024 });
+        const chromeOptions = new Options().windowSize({ width: 1280, height: 1024 });
-        if (process.env.HEADLESS) options.addArguments('headless');
+        if (process.env.CI) chromeOptions.addArguments('no-sandbox', 'disable-dev-shm-usage', 'headless');
-
+        browser = new Builder().forBrowser('chrome').setChromeOptions(chromeOptions).build();
-        browser = new Builder().forBrowser('chrome').setChromeOptions(options).build();
+        if (!fs.existsSync('./screenshots')) fs.mkdirSync('./screenshots');
     });
 
     after(function () {
         browser.quit();
     });
 
+    afterEach(async function () {
+        if (!process.env.CI || !app) return;
+
+        const currentUrl = await browser.getCurrentUrl();
+        if (!currentUrl.includes(app.domain)) return;
+        expect(this.currentTest.title).to.be.a('string');
+
+        const screenshotData = await browser.takeScreenshot();
+        fs.writeFileSync(`./screenshots/${new Date().getTime()}-${this.currentTest.title.replaceAll(' ', '_')}.png`, screenshotData, 'base64');
+    });
+
     function getAppInfo() {
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];