mirror of
https://git.cloudron.io/cloudron/freshrss-app
synced 2025-09-16 18:29:07 +00:00
Compare commits
56 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
71c8fc4d11 | ||
|
da0021a5cf | ||
|
271c2d6970 | ||
|
3ded9d692d | ||
|
0628b34f0d | ||
|
5956ca2427 | ||
|
d26b15cb7b | ||
|
960dac68a8 | ||
|
af468d1d87 | ||
|
b880200be3 | ||
|
22902c3d2e | ||
|
03f5d712f5 | ||
|
d40f9e7743 | ||
|
7dcfa53551 | ||
|
5bd5d7b110 | ||
|
ec9442f848 | ||
|
9e4a5f9e36 | ||
|
ed20cdd07e | ||
|
6225bc047b | ||
|
e799c21f6d | ||
|
8dc3edfc17 | ||
|
318d222f55 | ||
|
56500a9e8b | ||
|
4a8a9646d6 | ||
|
6b2b05cf7e | ||
|
c124139059 | ||
|
067a7c1c02 | ||
|
58ae3feab3 | ||
|
dbfedb515a | ||
|
213e1e740f | ||
|
9ca04c0e8c | ||
|
defd83eef0 | ||
|
9407501f0a | ||
|
f379cd7721 | ||
|
5e5336cfba | ||
|
7bba9af744 | ||
|
fff81ead59 | ||
|
e8690400c9 | ||
|
852944cb8f | ||
|
94ccfe149e | ||
|
01e3d7ad53 | ||
|
c89fca80bc | ||
|
3594901aee | ||
|
5bb5fae5c8 | ||
|
2bc2cf8292 | ||
|
8a318646c6 | ||
|
81724b280f | ||
|
808727e951 | ||
|
8a3030ac83 | ||
|
e21660b91e | ||
|
5e479d4936 | ||
|
9aa88ae21a | ||
|
62182d519b | ||
|
cbc8866253 | ||
|
753a9fb251 | ||
|
28ae86b5f8 |
102
CHANGELOG
102
CHANGELOG
@@ -41,3 +41,105 @@
|
|||||||
* Better apache configs
|
* Better apache configs
|
||||||
* Update extensions
|
* Update extensions
|
||||||
|
|
||||||
|
[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
|
||||||
|
|
||||||
|
[1.2.0]
|
||||||
|
* Use latest base image
|
||||||
|
|
||||||
|
[1.3.0]
|
||||||
|
* Update FreshRSS to 1.12.0
|
||||||
|
* Features
|
||||||
|
* Ability to add labels (custom tags) to articles #928
|
||||||
|
* Handle article tags containing spaces, as well as comma-separated tags #2023
|
||||||
|
* Handle authors containing spaces, as well as comma or semi-colon separated authors #2025
|
||||||
|
* Searches by tag, author, etc. accept Unicode characters #2025
|
||||||
|
* New option to disable cache for feeds with invalid HTTP caching #2052
|
||||||
|
* UI
|
||||||
|
* New theme Swage #2069
|
||||||
|
* Click on authors to initiate a search by author #2025
|
||||||
|
* Fix CSS for button alignments in older Chrome versions #2020
|
||||||
|
* Security
|
||||||
|
* Improved flow for password change (avoid error 403) #2056
|
||||||
|
* Allow dot . in username (best to avoid, though) #2061
|
||||||
|
* Performance
|
||||||
|
* Remove some counterproductive preload / prefetch rules #2040
|
||||||
|
* Improved fast flush (earlier transfer, fetching of resources, and rendering) #2045
|
||||||
|
|
||||||
|
[1.4.0]
|
||||||
|
* Update FreshRSS to 1.13.0
|
||||||
|
* [Full changelog](https://github.com/FreshRSS/FreshRSS/blob/1.13.0/CHANGELOG.md)
|
||||||
|
* Improvements to the Google Reader API #2093
|
||||||
|
* Support for Vienna RSS (client for Mac OS X) #2091
|
||||||
|
* Ability to import XML files exported from Tiny-Tiny-RSS #2079
|
||||||
|
* Ability to show all the feeds that have a warning #2146
|
||||||
|
* Share with Pinboard #1972
|
||||||
|
|
||||||
|
[1.5.0]
|
||||||
|
* Fix security issue where root directory was exposed
|
||||||
|
* Enable mod rewrite for mobile apps like FeedMe to work
|
||||||
|
|
||||||
|
[1.5.1]
|
||||||
|
* Update FreshRSS to 1.13.1
|
||||||
|
|
||||||
|
[1.6.0]
|
||||||
|
* Update FreshRSS to 1.14.0
|
||||||
|
* Update extensions to 0812ee05c24c
|
||||||
|
|
||||||
|
[1.6.1]
|
||||||
|
* Update FreshRSS to 1.14.1
|
||||||
|
* Fix load more articles when using ascending order #2314
|
||||||
|
* Fix the use of arrow keyboard keys for shortcuts #2316
|
||||||
|
* Fix control+click or middle-click for opening articles in a background tab #2310
|
||||||
|
* Fix the naming of the option to unfold categories #2307
|
||||||
|
* Fix shortcut problem when using unfolded articles #2328
|
||||||
|
* Fix auto-hiding articles #2323
|
||||||
|
* Fix scroll functions with Edge #2337
|
||||||
|
* Fix drop-down menu warning #2353
|
||||||
|
* Fix delay for individual mark-as-read actions #2332
|
||||||
|
* Fix scroll functions in Edge #2337
|
||||||
|
|
||||||
|
[1.6.2]
|
||||||
|
* Update FreshRSS to 1.14.2
|
||||||
|
* Fix minor code syntax warning in API #2362
|
||||||
|
|
||||||
|
[1.6.3]
|
||||||
|
* Update FreshRSS to 1.14.3
|
||||||
|
* New configuration page for each category #2369
|
||||||
|
* Update shortcut configuration page #2405
|
||||||
|
* CSS style for printing #2149
|
||||||
|
* Do not hide multiple <br /> tags #2437
|
||||||
|
* Updated to jQuery 3.4.1 (only for statistics page) #2424
|
||||||
|
|
||||||
|
[1.7.0]
|
||||||
|
* Update FreshRSS to 1.15.0
|
||||||
|
* New archiving method, including maximum number of articles per feed, and settings at feed, category, global levels #2335
|
||||||
|
* New option to control category sort order #2592
|
||||||
|
* New option to display article authors underneath the article title #2487
|
||||||
|
* Add e-mail capability #2476, #2481
|
||||||
|
* Ability to define default user settings in data/config-user.custom.php #2490
|
||||||
|
* Including default feeds #2515
|
||||||
|
* Allow recreating users if they still exist in database #2555
|
||||||
|
* Add optional database connection URI parameters #2549, #2559
|
||||||
|
* Allow longer articles with MySQL / MariaDB (up to 16MB compressed instead of 64kB) #2448
|
||||||
|
* Add support for terms of service #2520
|
||||||
|
* Add sharing with Lemmy #2510
|
||||||
|
|
||||||
|
[1.7.1]
|
||||||
|
* Update FreshRSS to 1.15.1
|
||||||
|
|
||||||
|
[1.7.2]
|
||||||
|
* Update FreshRSS to 1.15.2
|
||||||
|
|
||||||
|
[1.7.3]
|
||||||
|
* Update FreshRSS to 1.15.3
|
||||||
|
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
"description": "file://DESCRIPTION.md",
|
"description": "file://DESCRIPTION.md",
|
||||||
"changelog": "file://CHANGELOG",
|
"changelog": "file://CHANGELOG",
|
||||||
"tagline": "RSS feed reader",
|
"tagline": "RSS feed reader",
|
||||||
"version": "0.10.0",
|
"version": "1.7.3",
|
||||||
"healthCheckPath": "/",
|
"healthCheckPath": "/",
|
||||||
"httpPort": 8000,
|
"httpPort": 8000,
|
||||||
"addons": {
|
"addons": {
|
||||||
@@ -33,5 +33,7 @@
|
|||||||
"mediaLinks": [
|
"mediaLinks": [
|
||||||
"https://s3.amazonaws.com/cloudron-app-screenshots/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
|
"https://s3.amazonaws.com/cloudron-app-screenshots/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
|
||||||
],
|
],
|
||||||
"postInstallMessage": "file://POSTINSTALL.md"
|
"postInstallMessage": "file://POSTINSTALL.md",
|
||||||
|
"minBoxVersion": "2.0.0",
|
||||||
|
"documentationUrl": "https://cloudron.io/documentation/apps/freshrss/"
|
||||||
}
|
}
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
This app packages FreshRSS <upstream>1.10.2</upstream>.
|
This app packages FreshRSS <upstream>1.15.3</upstream>.
|
||||||
|
|
||||||
FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
|
FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
|
||||||
|
|
||||||
|
41
Dockerfile
41
Dockerfile
@@ -1,28 +1,17 @@
|
|||||||
FROM cloudron/base:0.10.0
|
FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
|
||||||
|
|
||||||
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 VERSION 1.10.2
|
|
||||||
ENV EXTENSIONS_VERSION b63f55d6fdd8e93da846bb741c3fed12d50909be
|
|
||||||
|
|
||||||
RUN mkdir -p /app/code
|
RUN mkdir -p /app/code
|
||||||
WORKDIR /app/code
|
WORKDIR /app/code
|
||||||
|
|
||||||
RUN wget "https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz" -O - \
|
ARG VERSION=1.15.3
|
||||||
| tar -xz --strip-components=1
|
RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1
|
||||||
|
|
||||||
RUN mv data data-orig && ln -s /app/data data
|
RUN mv data data-orig && ln -s /app/data data
|
||||||
|
|
||||||
# official extensions
|
# official extensions
|
||||||
ADD change-ttrss-file-path.patch /app/code/change-ttrss-file-path.patch
|
RUN wget https://github.com/FreshRSS/Extensions/archive/cd390eb8d1c950bbefacc986da700959c2bddd37.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
|
||||||
RUN wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - \
|
mv /app/code/extensions /app/code/extensions-orig && \
|
||||||
| tar -xz --strip-components=1 -C /app/code/extensions \
|
ln -s /app/data/extensions /app/code/extensions
|
||||||
&& patch -p0 -d /app/code < /app/code/change-ttrss-file-path.patch \
|
|
||||||
&& mv /app/code/extensions /app/code/extensions-orig \
|
|
||||||
&& ln -s /app/data/extensions /app/code/extensions \
|
|
||||||
&& ln -s /app/data/extensions/ttrss.php /app/code/p/api/ttrss.php
|
|
||||||
|
|
||||||
# configure apache
|
# configure apache
|
||||||
RUN rm /etc/apache2/sites-enabled/*
|
RUN rm /etc/apache2/sites-enabled/*
|
||||||
@@ -33,18 +22,16 @@ RUN a2disconf other-vhosts-access-log
|
|||||||
ADD apache/freshrss.conf /etc/apache2/sites-enabled/freshrss.conf
|
ADD apache/freshrss.conf /etc/apache2/sites-enabled/freshrss.conf
|
||||||
RUN echo "Listen 8000" > /etc/apache2/ports.conf
|
RUN echo "Listen 8000" > /etc/apache2/ports.conf
|
||||||
|
|
||||||
RUN a2enmod headers expires
|
RUN a2enmod headers expires deflate mime dir rewrite setenvif
|
||||||
|
|
||||||
RUN rm -rf /var/lib/php \
|
RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
|
||||||
&& ln -s /run/php /var/lib/php \
|
|
||||||
&& mkdir -p /run/php/session
|
|
||||||
|
|
||||||
RUN crudini --set /etc/php/7.0/apache2/php.ini PHP upload_max_filesize 64M && \
|
RUN crudini --set /etc/php/7.2/apache2/php.ini PHP upload_max_filesize 64M && \
|
||||||
crudini --set /etc/php/7.0/apache2/php.ini PHP post_max_size 64M && \
|
crudini --set /etc/php/7.2/apache2/php.ini PHP post_max_size 64M && \
|
||||||
crudini --set /etc/php/7.0/apache2/php.ini PHP memory_limit 64M && \
|
crudini --set /etc/php/7.2/apache2/php.ini PHP memory_limit 64M && \
|
||||||
crudini --set /etc/php/7.0/apache2/php.ini Session session.save_path /run/php/session && \
|
crudini --set /etc/php/7.2/apache2/php.ini Session session.save_path /run/php/session && \
|
||||||
crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_probability 1 && \
|
crudini --set /etc/php/7.2/apache2/php.ini Session session.gc_probability 1 && \
|
||||||
crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_divisor 100
|
crudini --set /etc/php/7.2/apache2/php.ini Session session.gc_divisor 100
|
||||||
|
|
||||||
ADD start.sh /app/code/start.sh
|
ADD start.sh /app/code/start.sh
|
||||||
|
|
||||||
|
@@ -3,7 +3,7 @@ This application does not integrate with Cloudron authentication.
|
|||||||
There is a preconfigured administrator account with the following credentials:
|
There is a preconfigured administrator account with the following credentials:
|
||||||
|
|
||||||
* Username: `admin`
|
* Username: `admin`
|
||||||
* Password: `password`
|
* Password: `changeme`
|
||||||
|
|
||||||
(Please change that password on first login)
|
(Please change that password on first login)
|
||||||
|
|
||||||
|
15
README.md
15
README.md
@@ -34,3 +34,18 @@ npm install
|
|||||||
PATH=$PATH:node_modules/.bin mocha --bail test.js
|
PATH=$PATH:node_modules/.bin mocha --bail test.js
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Debugging
|
||||||
|
|
||||||
|
|
||||||
|
* Update your data/config.php with the following, to get more debugging information:
|
||||||
|
|
||||||
|
```
|
||||||
|
'environment' => 'development',
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
* Check your logs:
|
||||||
|
* Web server / PHP logs
|
||||||
|
* FreshRSS API log in ./data/users/_/log_api.txt
|
||||||
|
* FreshRSS logs in ./data/users/you/log.txt
|
||||||
|
|
||||||
|
@@ -1,11 +1,11 @@
|
|||||||
<VirtualHost *:8000>
|
<VirtualHost *:8000>
|
||||||
DocumentRoot /app/code
|
DocumentRoot /app/code/p
|
||||||
AllowEncodedSlashes On
|
AllowEncodedSlashes On
|
||||||
|
|
||||||
ErrorLog /dev/stderr
|
ErrorLog /dev/stderr
|
||||||
CustomLog /dev/stdout combined
|
CustomLog /dev/stdout combined
|
||||||
|
|
||||||
<Directory /app/code/>
|
<Directory /app/code/p/>
|
||||||
Options +FollowSymLinks
|
Options +FollowSymLinks
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
Require all granted
|
Require all granted
|
||||||
|
@@ -1,21 +0,0 @@
|
|||||||
diff -ru extensions-orig/xExtension-TTRSS_API/extension.php extensions/xExtension-TTRSS_API/extension.php
|
|
||||||
--- extensions-orig/xExtension-TTRSS_API/extension.php 2016-12-15 10:24:17.000000000 +0000
|
|
||||||
+++ extensions/xExtension-TTRSS_API/extension.php 2017-02-18 13:06:59.640761922 +0000
|
|
||||||
@@ -9,7 +9,7 @@
|
|
||||||
public function install() {
|
|
||||||
$filename = 'ttrss.php';
|
|
||||||
$file_source = join_path($this->getPath(), $filename);
|
|
||||||
- $path_destination = join_path(PUBLIC_PATH, 'api');
|
|
||||||
+ $path_destination = '/app/data/extensions';
|
|
||||||
$file_destination = join_path($path_destination, $filename);
|
|
||||||
|
|
||||||
if (!is_writable($path_destination)) {
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
|
|
||||||
public function uninstall() {
|
|
||||||
$filename = 'ttrss.php';
|
|
||||||
- $file_destination = join_path(PUBLIC_PATH, 'api', $filename);
|
|
||||||
+ $file_destination = join_path('/app/data/extensions', $filename);
|
|
||||||
|
|
||||||
if (file_exists($file_destination) && !unlink($file_destination)) {
|
|
||||||
return 'API file cannot be removed';
|
|
48
start.sh
48
start.sh
@@ -2,52 +2,46 @@
|
|||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
mkdir -p /run/php/sessions
|
mkdir -p /run/php/session
|
||||||
|
|
||||||
if ! [ -f /app/data/.installed ]; then
|
if ! [ -f /app/data/.installed ]; then
|
||||||
echo "Fresh installation, setting up..."
|
echo "==> Fresh installation, setting up..."
|
||||||
rsync -a /app/code/data-orig/ /app/data/
|
rsync -a /app/code/data-orig/ /app/data/
|
||||||
php cli/do-install.php \
|
php cli/do-install.php \
|
||||||
--environment production --default_user admin \
|
--environment production --default_user admin \
|
||||||
--db-type mysql --db-host "${MYSQL_HOST}" \
|
--db-type mysql --db-host "${MYSQL_HOST}" \
|
||||||
--db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
|
--db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
|
||||||
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
|
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
|
||||||
--disable_update
|
--disable_update
|
||||||
php cli/create-user.php --user admin --password password --language en
|
php cli/create-user.php --user admin --password changeme --language en
|
||||||
php cli/actualize-user.php --user admin
|
touch /app/data/.installed
|
||||||
touch /app/data/.installed
|
echo "==> Done."
|
||||||
echo "Done."
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "==> Symlinking log file"
|
||||||
echo "Symlinking log file"
|
|
||||||
rm -f /app/data/users/_/log_api.txt
|
rm -f /app/data/users/_/log_api.txt
|
||||||
touch /tmp/log_api.txt
|
touch /tmp/log_api.txt
|
||||||
ln -s /tmp/log_api.txt /app/data/users/_/log_api.txt
|
ln -s /tmp/log_api.txt /app/data/users/_/log_api.txt
|
||||||
|
|
||||||
|
# We have to copy instead of symlinking extensions (see #2)
|
||||||
echo "Symlinking packaged extensions"
|
echo "==> Copying packaged extensions"
|
||||||
mkdir -p /app/data/extensions
|
mkdir -p /app/data/extensions
|
||||||
for f in $(ls /app/code/extensions-orig); do
|
for f in $(ls /app/code/extensions-orig); do
|
||||||
if ! [ -e "/app/data/extensions/$f" ]; then
|
rm -rf "/app/data/extensions/$f"
|
||||||
ln -s "/app/code/extensions-orig/$f" "/app/data/extensions/$f"
|
cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo "==> Updating config file"
|
||||||
echo "Updating config file"
|
php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}" \
|
||||||
php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}/p" \
|
|
||||||
--db-type mysql --db-host "${MYSQL_HOST}" \
|
--db-type mysql --db-host "${MYSQL_HOST}" \
|
||||||
--db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
|
--db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
|
||||||
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
|
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
|
||||||
--disable_update
|
--disable_update
|
||||||
|
|
||||||
|
echo "==> Setting permissions"
|
||||||
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"
|
||||||
echo "Starting apache"
|
|
||||||
APACHE_CONFDIR="" source /etc/apache2/envvars
|
APACHE_CONFDIR="" source /etc/apache2/envvars
|
||||||
rm -f "${APACHE_PID_FILE}"
|
rm -f "${APACHE_PID_FILE}"
|
||||||
exec /usr/sbin/apache2 -DFOREGROUND
|
exec /usr/sbin/apache2 -DFOREGROUND
|
||||||
|
@@ -17,6 +17,6 @@
|
|||||||
"rimraf": "^2.5.3",
|
"rimraf": "^2.5.3",
|
||||||
"selenium-server-standalone-jar": "^2.53.1",
|
"selenium-server-standalone-jar": "^2.53.1",
|
||||||
"selenium-webdriver": "^2.53.3",
|
"selenium-webdriver": "^2.53.3",
|
||||||
"superagent": "^1.4.0"
|
"superagent": "^1.8.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
181
test/test.js
181
test/test.js
@@ -7,14 +7,14 @@ require('chromedriver');
|
|||||||
var execSync = require('child_process').execSync,
|
var execSync = require('child_process').execSync,
|
||||||
expect = require('expect.js'),
|
expect = require('expect.js'),
|
||||||
path = require('path'),
|
path = require('path'),
|
||||||
|
superagent = require('superagent'),
|
||||||
webdriver = require('selenium-webdriver');
|
webdriver = require('selenium-webdriver');
|
||||||
|
|
||||||
var by = webdriver.By,
|
var by = webdriver.By,
|
||||||
until = webdriver.until;
|
until = webdriver.until;
|
||||||
|
|
||||||
var username = 'admin',
|
var username = 'admin',
|
||||||
password = 'password';
|
password = 'changeme';
|
||||||
|
|
||||||
|
|
||||||
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
|
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
|
||||||
|
|
||||||
@@ -44,93 +44,119 @@ describe('Application life cycle test', function () {
|
|||||||
var TEST_TIMEOUT = 10000;
|
var TEST_TIMEOUT = 10000;
|
||||||
var app;
|
var app;
|
||||||
|
|
||||||
function exists(selector, callback) {
|
function exists(selector) {
|
||||||
return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
|
return browser.wait(until.elementLocated(selector), TEST_TIMEOUT);
|
||||||
callback();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function visible(selector, callback) {
|
function visible(selector, callback) {
|
||||||
exists(selector, function () {
|
return exists(selector).then(function () {
|
||||||
browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT).then(function () {
|
return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
|
||||||
callback();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function login(callback) {
|
function baseUrl() {
|
||||||
browser.manage().deleteAllCookies();
|
if (app.manifest.version === '1.4.0') return `https://${app.fqdn}/p`;
|
||||||
browser.get('https://' + app.fqdn);
|
return `https://${app.fqdn}`;
|
||||||
|
}
|
||||||
|
|
||||||
visible(by.id('loginButton'), function () {
|
// we do this because it perm redirects to /p/ in old versions
|
||||||
browser.findElement(by.id('username')).sendKeys(username);
|
function clearCache() {
|
||||||
browser.findElement(by.id('passwordPlain')).sendKeys(password);
|
// https://stackoverflow.com/questions/49614217/selenium-clear-chrome-cache
|
||||||
browser.findElement(by.id('loginButton')).click();
|
// defaut clearance is 1 hour of cache
|
||||||
browser.wait(until.elementLocated(by.id('dropdown-configure')), TEST_TIMEOUT).then(function () { callback(); });
|
return browser.get('chrome://settings/clearBrowserData').then(function () {
|
||||||
|
return visible(by.css('* /deep/ #clearBrowsingDataConfirm'));
|
||||||
|
}).then(function () {
|
||||||
|
return browser.findElement(by.css('* /deep/ #clearBrowsingDataConfirm')).click();
|
||||||
|
}).then(function () {
|
||||||
|
return browser.sleep(5000);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function login(password, callback) {
|
||||||
|
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) {
|
function logout(callback) {
|
||||||
var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
|
var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
|
||||||
|
|
||||||
browser.get('https://' + app.fqdn);
|
browser.get('https://' + app.fqdn).then(function () {
|
||||||
|
return visible(by.id('stream'));
|
||||||
visible(by.id('stream'), function () {
|
}).then(function () {
|
||||||
browser.findElement(by.className('dropdown-toggle')).click();
|
return browser.findElement(by.className('dropdown-toggle')).click();
|
||||||
visible(logout_btn, function () {
|
}).then(function () {
|
||||||
browser.findElement(logout_btn).click();
|
return visible(logout_btn);
|
||||||
|
}).then(function () {
|
||||||
browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT).then(function () { callback(); });
|
return browser.findElement(logout_btn).click();
|
||||||
});
|
}).then(function () {
|
||||||
|
return browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT);
|
||||||
|
}).then(function () {
|
||||||
|
callback();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function addSubscription(callback) {
|
function addSubscription(callback) {
|
||||||
var url = "https://cloudron.io/blog/rss.xml";
|
var url = "https://cloudron.io/blog/rss.xml";
|
||||||
|
|
||||||
browser.get('https://' + app.fqdn);
|
browser.get(`${baseUrl()}/i/?c=subscription`).then(function () {
|
||||||
|
return visible(by.xpath('//input[@name="url_rss"]'));
|
||||||
visible(by.id('stream'), function () {
|
}).then(function () {
|
||||||
browser.findElement(by.xpath('//a[@href=".?c=subscription"]')).click();
|
return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
|
||||||
visible(by.id('add_rss'), function () {
|
}).then(function () {
|
||||||
browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
|
return browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
|
||||||
browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
|
}).then(function () {
|
||||||
visible(by.xpath('//div[@id="notification" and @class="notification good"]'), function() { callback(); });
|
return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
|
||||||
});
|
}).then(function () {
|
||||||
|
callback();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function addUser(callback) {
|
function addUser(password, callback) {
|
||||||
var test_username = 'test';
|
var test_username = 'test';
|
||||||
var manage_users_btn = by.xpath('//a[@href=".?c=user&a=manage"]');
|
|
||||||
|
|
||||||
browser.get('https://' + app.fqdn);
|
browser.get(`${baseUrl()}/i/?c=user&a=manage`).then(function () {
|
||||||
|
return visible(by.id('new_user_name'));
|
||||||
visible(by.id('stream'), function () {
|
}).then(function () {
|
||||||
browser.findElement(by.className('dropdown-toggle')).click();
|
return browser.findElement(by.id('new_user_name')).sendKeys(test_username);
|
||||||
visible(manage_users_btn, function () {
|
}).then(function () {
|
||||||
browser.findElement(manage_users_btn).click();
|
return browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
|
||||||
visible(by.id('new_user_name'), function () {
|
}).then(function () {
|
||||||
browser.findElement(by.id('new_user_name')).sendKeys(test_username);
|
return browser.findElement(by.xpath('//button[text()="Create"]')).click();
|
||||||
browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
|
}).then(function () {
|
||||||
browser.findElement(by.xpath('//form[@action=".?c=user&a=create"]/div/div/button[@type="submit"]')).click();
|
return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
|
||||||
visible(by.xpath('//div[@id="notification" and @class="notification good"]'), function() { callback(); });
|
}).then(function () {
|
||||||
});
|
callback();
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function enableApi(callback) {
|
function enableApi(callback) {
|
||||||
browser.get('https://' + app.fqdn + '/p/i/?c=auth').then(function () {
|
browser.get(`${baseUrl()}/i/?c=auth`).then(function () {
|
||||||
return browser.findElement(by.id('api_enabled')).click();
|
return browser.findElement(by.id('api_enabled')).click();
|
||||||
}).then(function () {
|
}).then(function () {
|
||||||
return browser.findElement(by.xpath('//form[@action=".?c=auth"]')).submit();
|
return browser.findElement(by.xpath('//button[text()="Submit"]')).submit();
|
||||||
}).then(callback);
|
}).then(function () {
|
||||||
|
callback();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function checkApiConfiguration(callback) {
|
function checkApiConfiguration(callback) {
|
||||||
browser.get('https://' + app.fqdn + '/p/api/greader.php/check%2Fcompatibility').then(function () {
|
browser.get(`${baseUrl()}/api/`).then(function () {
|
||||||
exists(by.xpath('//pre[text()="PASS"]'), callback);
|
return exists(by.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
|
||||||
|
}).then(function () {
|
||||||
|
return exists(by.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
|
||||||
|
}).then(function () {
|
||||||
|
callback();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -141,9 +167,22 @@ describe('Application life cycle test', function () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function subscriptionExists(callback) {
|
function subscriptionExists(callback) {
|
||||||
browser.get('https://' + app.fqdn + '/p/i/?get=c_1');
|
browser.get(`${baseUrl()}/i/?get=c_1`).then(function () {
|
||||||
|
return visible(by.xpath('//a[text()="Cloudron.io"]'));
|
||||||
|
}).then(function () {
|
||||||
|
callback();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
visible(by.xpath('//a[text()="Cloudron.io"]'), callback);
|
function getStaticExtensionFile(callback) {
|
||||||
|
superagent.get(`${baseUrl()}/ext.php?f=xExtension-StickyFeeds/static/script.js&t=js`)
|
||||||
|
.buffer(true)
|
||||||
|
.end(function (err, res) {
|
||||||
|
expect(err).to.be(null);
|
||||||
|
expect(res.status).to.be(200);
|
||||||
|
expect(res.text).to.contain('sticky_feeds'); // relies on the buffer flag above
|
||||||
|
callback();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
xit('build app', function () {
|
xit('build app', function () {
|
||||||
@@ -151,17 +190,18 @@ describe('Application life cycle test', function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('install app', function () {
|
it('install app', function () {
|
||||||
execSync('cloudron install --new --wait --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can get app information', getAppInfo);
|
it('can get app information', getAppInfo);
|
||||||
|
|
||||||
it('can login', login);
|
it('can login', login.bind(null, password));
|
||||||
it('can subscribe', addSubscription);
|
it('can subscribe', addSubscription);
|
||||||
it('can add users', addUser);
|
it('can add users', addUser.bind(null, password));
|
||||||
it('can enable API', enableApi);
|
it('can enable API', enableApi);
|
||||||
it('can check configuration', checkApiConfiguration);
|
it('can check configuration', checkApiConfiguration);
|
||||||
it('subscription exists', subscriptionExists);
|
it('subscription exists', subscriptionExists);
|
||||||
|
it('can get static extension file', getStaticExtensionFile);
|
||||||
it('can logout', logout);
|
it('can logout', logout);
|
||||||
|
|
||||||
it('backup app', function () {
|
it('backup app', function () {
|
||||||
@@ -172,22 +212,24 @@ describe('Application life cycle test', function () {
|
|||||||
execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can login', login);
|
it('can login', login.bind(null, password));
|
||||||
it('can check configuration', checkApiConfiguration);
|
it('can check configuration', checkApiConfiguration);
|
||||||
it('subscription exists', subscriptionExists);
|
it('subscription exists', subscriptionExists);
|
||||||
|
it('can get static extension file', getStaticExtensionFile);
|
||||||
it('can logout', logout);
|
it('can logout', logout);
|
||||||
|
|
||||||
it('move to different location', function () {
|
it('move to different location', function () {
|
||||||
browser.manage().deleteAllCookies();
|
browser.manage().deleteAllCookies();
|
||||||
execSync('cloudron configure --wait --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
var inspect = JSON.parse(execSync('cloudron inspect'));
|
var inspect = JSON.parse(execSync('cloudron inspect'));
|
||||||
app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
|
app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
|
||||||
expect(app).to.be.an('object');
|
expect(app).to.be.an('object');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can login', login);
|
it('can login', login.bind(null, password));
|
||||||
it('can check configuration', checkApiConfiguration);
|
it('can check configuration', checkApiConfiguration);
|
||||||
it('subscription exists', subscriptionExists);
|
it('subscription exists', subscriptionExists);
|
||||||
|
it('can get static extension file', getStaticExtensionFile);
|
||||||
it('can logout', logout);
|
it('can logout', logout);
|
||||||
|
|
||||||
it('uninstall app', function () {
|
it('uninstall app', function () {
|
||||||
@@ -196,23 +238,24 @@ describe('Application life cycle test', function () {
|
|||||||
|
|
||||||
// test update
|
// test update
|
||||||
it('can install app', function () {
|
it('can install app', function () {
|
||||||
execSync('cloudron install --new --wait --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can get app information', getAppInfo);
|
it('can get app information', getAppInfo);
|
||||||
it('can login', login);
|
it('can login', login.bind(null, password));
|
||||||
it('can subscribe', addSubscription);
|
it('can subscribe', addSubscription);
|
||||||
it('can add users', addUser);
|
it('can add users', addUser.bind(null, password));
|
||||||
|
|
||||||
it('can update', function () {
|
it('can update', function () {
|
||||||
execSync('cloudron install --wait --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
execSync('cloudron update --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
var inspect = JSON.parse(execSync('cloudron inspect'));
|
var inspect = JSON.parse(execSync('cloudron inspect'));
|
||||||
app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
|
app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
|
||||||
expect(app).to.be.an('object');
|
expect(app).to.be.an('object');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can login', login);
|
it('can login', login.bind(null, password));
|
||||||
it('subscription exists', subscriptionExists);
|
it('subscription exists', subscriptionExists);
|
||||||
|
it('can get static extension file', getStaticExtensionFile);
|
||||||
|
|
||||||
it('uninstall app', function () {
|
it('uninstall app', function () {
|
||||||
execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
|
Reference in New Issue
Block a user