mirror of
https://git.cloudron.io/cloudron/freshrss-app
synced 2025-09-16 18:29:07 +00:00
Compare commits
45 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
de811a5b95 | ||
|
067a448120 | ||
|
99eb91f995 | ||
|
68c5a8f6c6 | ||
|
90af4fc830 | ||
|
15f30af4bb | ||
|
5ac482c1c4 | ||
|
38fa58f1c1 | ||
|
4a1c4f7eab | ||
|
cf05842d11 | ||
|
04647d32c3 | ||
|
b983a26b44 | ||
|
91f91bd18e | ||
|
4a64ac2219 | ||
|
2911418f1e | ||
|
9194eb2a61 | ||
|
0d31e89741 | ||
|
ca2eecb0fb | ||
|
5bdce48281 | ||
|
ecd914b78f | ||
|
924a98f8da | ||
|
b977f0cfe1 | ||
|
94f42678bd | ||
|
4a9ce49f7e | ||
|
9eb5c48ec8 | ||
|
81ac195aa3 | ||
|
6b58760334 | ||
|
441807c5ec | ||
|
ea99b7c4ba | ||
|
f236000d0d | ||
|
00b67c9e3f | ||
|
eea79146f9 | ||
|
30c116edad | ||
|
7f9c1f91eb | ||
|
48ca54d300 | ||
|
c70b70d6b0 | ||
|
7c098a3236 | ||
|
3338db16f0 | ||
|
2c8ed386ca | ||
|
81bd749001 | ||
|
4f96317a75 | ||
|
f5dc0cef24 | ||
|
143d4a80b9 | ||
|
50172402be | ||
|
7935b892bd |
132
CHANGELOG.md
132
CHANGELOG.md
@@ -295,3 +295,135 @@
|
||||
* Soft require Apache 2.4+ (but repair minimal compatibility with Apache 2.2)
|
||||
* Upgraded extensions require FreshRSS 1.23.0+ Extensions#181
|
||||
|
||||
[1.20.1]
|
||||
* Update FreshRSS to 1.23.1
|
||||
* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.23.0)
|
||||
* Fix crash regression with the option Max number of tags shown #5978
|
||||
* 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
|
||||
|
||||
[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
|
||||
|
||||
[1.23.0]
|
||||
* Update FreshRSS to 1.25.0
|
||||
* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.25.0)
|
||||
* Features
|
||||
* Bug fixing
|
||||
* API
|
||||
* Compatibility
|
||||
* Deployment
|
||||
* SimplePie
|
||||
* Security
|
||||
* UI
|
||||
* Extensions
|
||||
* I18n
|
||||
* Misc.
|
||||
|
||||
[1.24.0]
|
||||
* Update FreshRSS to 1.26.0
|
||||
* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.26.0)
|
||||
* Add order-by options to sort articles by received date (existing, default), publication date, title, link, random
|
||||
* Allow searching in all feeds, also feeds only visible at category level with &get=A, and also those archived with &get=Z
|
||||
* UI accessible from user-query view
|
||||
* New shortcuts for adding user labels to articles
|
||||
* Several improvements and bug fixes
|
||||
|
||||
[1.24.1]
|
||||
* Update FreshRSS to 1.26.1
|
||||
* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.26.1)
|
||||
* Fix back-compatibility with cURL 7.51 (we require cURL 7.52+ for `CURLPROXY_HTTPS`)
|
||||
* Add cURL version to page about system information
|
||||
* Fix regression with cURL HTTP headers breaking conditional HTTP requests
|
||||
* Fix regression with saving states of user queries
|
||||
* Fix regression with dynamic OPML
|
||||
* Fix update of the users last activity on login action
|
||||
* Fix setting category option *Maximum number of articles to keep per feed*
|
||||
* Fix priority field when processing a new feed from an extension
|
||||
* Use case-insensitive sort for categories
|
||||
* Improve dark mode of *Origine* theme
|
||||
|
||||
[1.25.0]
|
||||
* Update base image to 5.0.0
|
||||
|
||||
[1.25.1]
|
||||
* Update FreshRSS to 1.26.2
|
||||
* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.26.2)
|
||||
* Implement JSON string concatenation with & operator [#7414](https://github.com/FreshRSS/FreshRSS/pull/7414)
|
||||
* Support multiple JSON fragments in HTML+XPath+JSON mode [#7369](https://github.com/FreshRSS/FreshRSS/pull/7369)
|
||||
* Fix escaping of tag search [#7468](https://github.com/FreshRSS/FreshRSS/pull/7468)
|
||||
* Fix CLI parsing of Boolean flags [#7430](https://github.com/FreshRSS/FreshRSS/pull/7430)
|
||||
* Fix API for labels with slash [#7437](https://github.com/FreshRSS/FreshRSS/pull/7437)
|
||||
* Fix support for feeds with XML preamble + DTD [#7515](https://github.com/FreshRSS/FreshRSS/pull/7515), [simplepie#914](https://github.com/simplepie/simplepie/pull/914)
|
||||
* Disallow `<iframe srcdoc="">` [#7494](https://github.com/FreshRSS/FreshRSS/pull/7494), [CVE-2025-32015](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-wgrq-mcwc-8f8v)
|
||||
* Disallow `<button formaction="">` [#7506](https://github.com/FreshRSS/FreshRSS/pull/7506)
|
||||
* Improve favicons hash to avoid favicon pollution [#7505](https://github.com/FreshRSS/FreshRSS/pull/7505), [CVE-2025-46339](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-8f79-3q3w-43c4)
|
||||
* Add `Content-Security-Policy` HTTP headers to favicons [#7471](https://github.com/FreshRSS/FreshRSS/pull/7471), [CVE-2025-31136](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-f6r4-jrvc-cfmr)
|
||||
|
||||
[1.25.2]
|
||||
* Update FreshRSS to 1.26.3
|
||||
* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.26.3)
|
||||
* Keep sort and order criteria during navigation [#​7585](https://github.com/FreshRSS/FreshRSS/pull/7585)
|
||||
* Add info about `PDO::ATTR_CLIENT_VERSION` (relevant for MySQL / MariaDB with obsolete driver) [#​7591](https://github.com/FreshRSS/FreshRSS/pull/7591)
|
||||
* Fix SQL request for user labels with custom sort (affecting PostgreSQL) [#​7588](https://github.com/FreshRSS/FreshRSS/pull/7588)
|
||||
* Fix regression for favicon in GReader and Fever APIs [#​7573](https://github.com/FreshRSS/FreshRSS/pull/7573)
|
||||
* Fix newest articles (within last second) not shown [#​7577](https://github.com/FreshRSS/FreshRSS/pull/7577)
|
||||
* Fix duplicate HTTP header for POST [#​7556](https://github.com/FreshRSS/FreshRSS/pull/7556)
|
||||
* Fix important articles on reader view [#​7602](https://github.com/FreshRSS/FreshRSS/pull/7602)
|
||||
* Fix remove last share method [#​7613](https://github.com/FreshRSS/FreshRSS/pull/7613)
|
||||
* Fix API handling of default category [#​7610](https://github.com/FreshRSS/FreshRSS/pull/7610)
|
||||
* Fix user self-deletion [#​7626](https://github.com/FreshRSS/FreshRSS/pull/7626)
|
||||
|
||||
[1.26.0]
|
||||
* Update FreshRSS to 1.27.0
|
||||
* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.27.0)
|
||||
* Implement support for HTTP `429 Too Many Requests` and `503 Service Unavailable`, obey `Retry-After` [#​7760](https://github.com/FreshRSS/FreshRSS/pull/7760)
|
||||
* Add sort by category title, or by feed title [#​7702](https://github.com/FreshRSS/FreshRSS/pull/7702)
|
||||
* Add search operator `c:` for categories like `c:23,34` or `!c:45,56` [#​7696](https://github.com/FreshRSS/FreshRSS/pull/7696)
|
||||
* Custom feed favicons [#​7646](https://github.com/FreshRSS/FreshRSS/pull/7646), [#​7704](https://github.com/FreshRSS/FreshRSS/pull/7704), [#​7717](https://github.com/FreshRSS/FreshRSS/pull/7717), [#​7792](https://github.com/FreshRSS/FreshRSS/pull/7792)
|
||||
* Rework fetch favicons for fewer HTTP requests [#​7767](https://github.com/FreshRSS/FreshRSS/pull/7767)
|
||||
* Add more unicity criteria based on title and/or content [#​7789](https://github.com/FreshRSS/FreshRSS/pull/7789)
|
||||
* Automatically restore user configuration from backup [#​7682](https://github.com/FreshRSS/FreshRSS/pull/7682)
|
||||
* API add support for states in `s` parameter of `streamId` [#​7695](https://github.com/FreshRSS/FreshRSS/pull/7695)
|
||||
* Improve sharing via Print [#​7728](https://github.com/FreshRSS/FreshRSS/pull/7728)
|
||||
* Redirect to the login page from bookmarklet instead of 403 [#​7782](https://github.com/FreshRSS/FreshRSS/pull/7782)
|
||||
|
||||
|
@@ -5,14 +5,16 @@
|
||||
"description": "file://DESCRIPTION.md",
|
||||
"changelog": "file://CHANGELOG.md",
|
||||
"tagline": "RSS feed reader",
|
||||
"version": "1.20.0-1",
|
||||
"upstreamVersion": "1.23.0",
|
||||
"version": "1.26.0",
|
||||
"upstreamVersion": "1.27.0",
|
||||
"healthCheckPath": "/",
|
||||
"httpPort": 8000,
|
||||
"addons": {
|
||||
"localstorage": {},
|
||||
"mysql": {},
|
||||
"oidc": { "loginRedirectUri": "/i/oidc/" },
|
||||
"oidc": {
|
||||
"loginRedirectUri": "/i/oidc/"
|
||||
},
|
||||
"scheduler": {
|
||||
"update_feeds": {
|
||||
"schedule": "*/1 * * * *",
|
||||
@@ -20,17 +22,35 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"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/",
|
||||
"documentationUrl": "https://cloudron.io/documentation/packages/freshrss/",
|
||||
"optionalSso": true
|
||||
}
|
||||
|
26
Dockerfile
26
Dockerfile
@@ -1,16 +1,18 @@
|
||||
FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
|
||||
FROM cloudron/base:5.0.0@sha256:04fd70dbd8ad6149c19de39e35718e024417c3e01dc9c6637eaf4a41ec4e596c
|
||||
|
||||
RUN apt-get update && apt-get install --no-install-recommends -y libapache2-mod-auth-openidc && rm -rf /var/cache/apt /var/lib/apt/lists
|
||||
|
||||
RUN mkdir -p /app/code
|
||||
WORKDIR /app/code
|
||||
|
||||
ARG VERSION=1.23.0
|
||||
RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1 && \
|
||||
# renovate: datasource=github-releases depName=FreshRSS/FreshRSS versioning=semver
|
||||
ARG FRESHRSS_VERSION=1.27.0
|
||||
|
||||
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)
|
||||
RUN wget https://github.com/FreshRSS/Extensions/archive/8af0d55265ffa03de22ee62b2ae175b3cb038a3c.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
|
||||
RUN wget https://github.com/FreshRSS/Extensions/archive/a82e080a1e68eb34539959a852fc5e800b7346dd.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
|
||||
|
||||
@@ -27,15 +29,15 @@ RUN a2enmod headers expires deflate mime dir rewrite setenvif auth_openidc
|
||||
|
||||
RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
|
||||
|
||||
RUN crudini --set /etc/php/8.1/apache2/php.ini PHP upload_max_filesize 64M && \
|
||||
crudini --set /etc/php/8.1/apache2/php.ini PHP post_max_size 64M && \
|
||||
crudini --set /etc/php/8.1/apache2/php.ini PHP memory_limit 64M && \
|
||||
crudini --set /etc/php/8.1/apache2/php.ini Session session.save_path /run/php/session && \
|
||||
crudini --set /etc/php/8.1/apache2/php.ini Session session.gc_probability 1 && \
|
||||
crudini --set /etc/php/8.1/apache2/php.ini Session session.gc_divisor 100
|
||||
RUN crudini --set /etc/php/8.3/apache2/php.ini PHP upload_max_filesize 64M && \
|
||||
crudini --set /etc/php/8.3/apache2/php.ini PHP post_max_size 64M && \
|
||||
crudini --set /etc/php/8.3/apache2/php.ini PHP memory_limit 64M && \
|
||||
crudini --set /etc/php/8.3/apache2/php.ini Session session.save_path /run/php/session && \
|
||||
crudini --set /etc/php/8.3/apache2/php.ini Session session.gc_probability 1 && \
|
||||
crudini --set /etc/php/8.3/apache2/php.ini Session session.gc_divisor 100
|
||||
|
||||
RUN ln -s /app/data/php.ini /etc/php/8.1/apache2/conf.d/99-cloudron.ini && \
|
||||
ln -s /app/data/php.ini /etc/php/8.1/cli/conf.d/99-cloudron.ini
|
||||
RUN ln -s /app/data/php.ini /etc/php/8.3/apache2/conf.d/99-cloudron.ini && \
|
||||
ln -s /app/data/php.ini /etc/php/8.3/cli/conf.d/99-cloudron.ini
|
||||
|
||||
ADD start.sh /app/code/start.sh
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -36,6 +36,9 @@ ServerName %{HTTP_HOST}
|
||||
|
||||
|
||||
<IfDefine OIDC_ENABLED>
|
||||
|
||||
# CLOUDRON_OIDC_PROVIDER_NAME is not supported
|
||||
|
||||
OIDCProviderMetadataURL ${CLOUDRON_OIDC_DISCOVERY_URL}
|
||||
OIDCClientID ${CLOUDRON_OIDC_CLIENT_ID}
|
||||
OIDCClientSecret ${CLOUDRON_OIDC_CLIENT_SECRET}
|
||||
|
4
renovate.json5
Normal file
4
renovate.json5
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": ["local>devops/renovator//default.renovate.json5"]
|
||||
}
|
2
start.sh
2
start.sh
@@ -54,7 +54,7 @@ php cli/reconfigure.php ${extra_args} --base_url "https://${CLOUDRON_APP_DOMAIN}
|
||||
--disable_update
|
||||
|
||||
echo "==> Setting permissions"
|
||||
chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt
|
||||
chown -R www-data:www-data /run/php /app/data /tmp/log_api.txt
|
||||
|
||||
echo "==> Starting apache"
|
||||
APACHE_CONFDIR="" source /etc/apache2/envvars
|
||||
|
3033
test/package-lock.json
generated
3033
test/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,10 +9,10 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"chromedriver": "^120.0.1",
|
||||
"chromedriver": "^139.0.1",
|
||||
"expect.js": "^0.3.1",
|
||||
"mocha": "^10.2.0",
|
||||
"selenium-webdriver": "^4.16.0",
|
||||
"superagent": "^8.1.2"
|
||||
"mocha": "^11.7.1",
|
||||
"selenium-webdriver": "^4.35.0",
|
||||
"superagent": "^10.2.3"
|
||||
}
|
||||
}
|
||||
|
64
test/test.js
64
test/test.js
@@ -1,11 +1,6 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/* jshint esversion: 8 */
|
||||
/* global describe */
|
||||
/* global before */
|
||||
/* global after */
|
||||
/* global it */
|
||||
/* global xit */
|
||||
/* global it, xit, describe, before, after, afterEach */
|
||||
|
||||
'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 });
|
||||
if (process.env.HEADLESS) options.addArguments('headless');
|
||||
|
||||
browser = new Builder().forBrowser('chrome').setChromeOptions(options).build();
|
||||
const chromeOptions = new Options().windowSize({ width: 1280, height: 1024 });
|
||||
if (process.env.CI) chromeOptions.addArguments('no-sandbox', 'disable-dev-shm-usage', 'headless');
|
||||
browser = new Builder().forBrowser('chrome').setChromeOptions(chromeOptions).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];
|
||||
@@ -77,15 +84,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 browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username);
|
||||
await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password);
|
||||
await browser.sleep(2000);
|
||||
await browser.findElement(By.xpath('//button[@type="submit" and contains(text(), "Sign in")]')).click();
|
||||
await browser.sleep(2000);
|
||||
await waitForElement(By.id('inputUsername'));
|
||||
await browser.findElement(By.id('inputUsername')).sendKeys(username);
|
||||
await browser.findElement(By.id('inputPassword')).sendKeys(password);
|
||||
await browser.findElement(By.id('loginSubmitButton')).click();
|
||||
|
||||
athenticated_by_oidc = true;
|
||||
}
|
||||
@@ -94,7 +98,7 @@ describe('Application life cycle test', function () {
|
||||
}
|
||||
|
||||
async function logout() {
|
||||
var logout_btn = By.xpath('//li/a[@class="signout"]');
|
||||
var logout_btn = By.xpath('//li/*[contains(@class,"signout")]');
|
||||
|
||||
await browser.get('https://' + app.fqdn);
|
||||
await waitForElement(By.id('stream'));
|
||||
@@ -112,16 +116,24 @@ describe('Application life cycle test', function () {
|
||||
await waitForElement(By.xpath('//input[@name="url_rss"]'));
|
||||
await browser.findElement(By.xpath('//input[@name="url_rss"]')).sendKeys(url);
|
||||
await browser.findElement(By.xpath('//form[@id="add_rss"]//button[text()="Add"]')).click();
|
||||
await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
|
||||
await waitForElement(By.xpath('//div[@id="notification" and contains(@class, "good")]'));
|
||||
}
|
||||
|
||||
async function addUser(username, password) {
|
||||
async function addUser(username, password, relogin = true) {
|
||||
await browser.get(`${baseUrl()}/i/?c=user&a=manage`);
|
||||
|
||||
if (relogin) {
|
||||
// needs a relogin for admin confirmation
|
||||
await waitForElement(By.id('passwordPlain'));
|
||||
await browser.findElement(By.id('passwordPlain')).sendKeys(admin_password);
|
||||
await browser.findElement(By.id('loginButton')).click();
|
||||
}
|
||||
|
||||
await waitForElement(By.id('new_user_name'));
|
||||
await browser.findElement(By.id('new_user_name')).sendKeys(username);
|
||||
await browser.findElement(By.id('new_user_passwordPlain')).sendKeys(password);
|
||||
await browser.findElement(By.xpath('//button[text()="Create"]')).click();
|
||||
await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
|
||||
await waitForElement(By.xpath('//div[@id="notification" and contains(@class, "good")]'));
|
||||
}
|
||||
|
||||
async function enableApi() {
|
||||
@@ -172,8 +184,8 @@ describe('Application life cycle test', function () {
|
||||
|
||||
it('can get app information', getAppInfo);
|
||||
|
||||
it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default-user ${USERNAME}"`); });
|
||||
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 subscribe', addSubscription);
|
||||
it('can enable API', enableApi);
|
||||
it('can check configuration', checkApiConfiguration);
|
||||
@@ -211,13 +223,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 +237,7 @@ describe('Application life cycle test', function () {
|
||||
expect(app).to.be.an('object');
|
||||
});
|
||||
|
||||
it('can add users', addUser.bind(null, 'test', admin_password, false));
|
||||
it('subscription exists', subscriptionExists);
|
||||
it('can get static extension file', getStaticExtensionFile);
|
||||
|
||||
|
Reference in New Issue
Block a user