Fixup tests

CHANGELOG.md

@@ -278,3 +278,20 @@
 [1.19.0]
 * Implement OIDC login
 
+[1.19.1]
+* Update FreshRSS to 1.22.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.22.1)
+* Fix regression in extensions translations (i18n)
+* Better identification of proxied client IP
+
+[1.20.0]
+* Update FreshRSS to 1.23.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.23.0)
+* New Important feeds group in the main view, with corresponding new priority level for feeds #5782
+* Entries from important feeds are not marked as read during scroll, during focus, nor during Mark all as read
+* Add filter actions (auto mark as read) at category level and at global levels #5942
+* Increase SQL fields length to maximum possible #5788, #5570
+* Many bug fixes
+* Soft require Apache 2.4+ (but repair minimal compatibility with Apache 2.2)
+* Upgraded extensions require FreshRSS 1.23.0+ Extensions#181
+

CloudronManifest.json

@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "RSS feed reader",
-  "version": "1.19.0",
+  "version": "1.20.0",
-  "upstreamVersion": "1.22.0",
+  "upstreamVersion": "1.23.0",
   "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.22.0
+ARG VERSION=1.22.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-lock.json

@@ -9,17 +9,17 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^118.0.1",
+        "chromedriver": "^120.0.1",
         "expect.js": "^0.3.1",
         "mocha": "^10.2.0",
-        "selenium-webdriver": "^4.14.0",
+        "selenium-webdriver": "^4.16.0",
         "superagent": "^8.1.2"
       }
     },
     "node_modules/@testim/chrome-version": {
-      "version": "1.1.3",
+      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
-      "integrity": "sha512-g697J3WxV/Zytemz8aTuKjTGYtta9+02kva3C1xc7KXB8GdbfE1akGJIsZLyY/FSh2QrnE+fiB7vmWU3XNcb6A=="
+      "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g=="
     },
     "node_modules/@types/node": {
       "version": "15.12.2",
@@ -97,9 +97,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/axios": {
-      "version": "1.5.1",
+      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -217,18 +217,18 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "118.0.1",
+      "version": "120.0.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-118.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-120.0.1.tgz",
-      "integrity": "sha512-GlGfyRE47IuSJnuadIiDy89EMDMQFBVWxUmiclLJKzQhFsiWAtcIr/mNOxjljZdsw9IwIOQEkrB9wympKYFPLw==",
+      "integrity": "sha512-ETTJlkibcAmvoKsaEoq2TFqEsJw18N0O9gOQZX6Uv/XoEiOV8p+IZdidMeIRYELWJIgCZESvlOx5d1QVnB4v0w==",
       "hasInstallScript": true,
       "dependencies": {
-        "@testim/chrome-version": "^1.1.3",
+        "@testim/chrome-version": "^1.1.4",
-        "axios": "^1.4.0",
+        "axios": "^1.6.0",
-        "compare-versions": "^6.0.0",
+        "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^1.1.0",
-        "tcp-port-used": "^1.0.1"
+        "tcp-port-used": "^1.0.2"
       },
       "bin": {
         "chromedriver": "bin/chromedriver"
@@ -1214,9 +1214,9 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.14.0",
+      "version": "4.16.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.16.0.tgz",
-      "integrity": "sha512-637rs8anqMKHbWxcBZpyG3Gcs+rBUtAUiqk0O/knUqH4Paj3MFUZrz88/pVGOLNryEVy2z92fZomT8p1ENl1gA==",
+      "integrity": "sha512-IbqpRpfGE7JDGgXHJeWuCqT/tUqnLvZ14csSwt+S8o4nJo3RtQoE9VR4jB47tP/A8ArkYsh/THuMY6kyRP6kuA==",
       "dependencies": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.1",
@@ -1569,9 +1569,9 @@
   },
   "dependencies": {
     "@testim/chrome-version": {
-      "version": "1.1.3",
+      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
-      "integrity": "sha512-g697J3WxV/Zytemz8aTuKjTGYtta9+02kva3C1xc7KXB8GdbfE1akGJIsZLyY/FSh2QrnE+fiB7vmWU3XNcb6A=="
+      "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g=="
     },
     "@types/node": {
       "version": "15.12.2",
@@ -1634,9 +1634,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "axios": {
-      "version": "1.5.1",
+      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -1719,17 +1719,17 @@
       }
     },
     "chromedriver": {
-      "version": "118.0.1",
+      "version": "120.0.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-118.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-120.0.1.tgz",
-      "integrity": "sha512-GlGfyRE47IuSJnuadIiDy89EMDMQFBVWxUmiclLJKzQhFsiWAtcIr/mNOxjljZdsw9IwIOQEkrB9wympKYFPLw==",
+      "integrity": "sha512-ETTJlkibcAmvoKsaEoq2TFqEsJw18N0O9gOQZX6Uv/XoEiOV8p+IZdidMeIRYELWJIgCZESvlOx5d1QVnB4v0w==",
       "requires": {
-        "@testim/chrome-version": "^1.1.3",
+        "@testim/chrome-version": "^1.1.4",
-        "axios": "^1.4.0",
+        "axios": "^1.6.0",
-        "compare-versions": "^6.0.0",
+        "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^1.1.0",
-        "tcp-port-used": "^1.0.1"
+        "tcp-port-used": "^1.0.2"
       }
     },
     "cliui": {
@@ -2434,9 +2434,9 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "selenium-webdriver": {
-      "version": "4.14.0",
+      "version": "4.16.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.16.0.tgz",
-      "integrity": "sha512-637rs8anqMKHbWxcBZpyG3Gcs+rBUtAUiqk0O/knUqH4Paj3MFUZrz88/pVGOLNryEVy2z92fZomT8p1ENl1gA==",
+      "integrity": "sha512-IbqpRpfGE7JDGgXHJeWuCqT/tUqnLvZ14csSwt+S8o4nJo3RtQoE9VR4jB47tP/A8ArkYsh/THuMY6kyRP6kuA==",
       "requires": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.1",

test/package.json

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

test/test.js

@@ -214,8 +214,8 @@ describe('Application life cycle test', function () {
     it('can install app', function () { execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
 
     it('can get app information', getAppInfo);
-    // it can be changed to loginOIDC in the nextrelease
+    it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
-    it('can login', login.bind(null, admin_username, admin_password));
+    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));
 
@@ -226,7 +226,6 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     });
 
-    it('can login', login.bind(null, admin_username, admin_password));
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);