mirror of
https://git.cloudron.io/cloudron/syncthing-app
synced 2025-09-13 08:19:09 +00:00
Compare commits
74 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
f9b26a945c | ||
|
86edd041dc | ||
|
2969543a92 | ||
|
81417754cc | ||
|
f0f126d774 | ||
|
293ff36607 | ||
|
ea40502236 | ||
|
df82aa0431 | ||
|
d1a847a12b | ||
|
313b4beeec | ||
|
9d1858500b | ||
|
fe61a708f1 | ||
|
71b18b17be | ||
|
2cebdea6a6 | ||
|
bdf8642472 | ||
|
69b36eb6af | ||
|
504d758112 | ||
|
dfd2b058ec | ||
|
f00e65442b | ||
|
02eacdc619 | ||
|
7effe3834e | ||
|
d9b68bec93 | ||
|
a5f275e817 | ||
|
ddc1727671 | ||
|
21dfd65456 | ||
|
c8e0d8aece | ||
|
77908fb319 | ||
|
ac8201d0fd | ||
|
b0d566645a | ||
|
5d87c13269 | ||
|
f3a6a74028 | ||
|
29d09bf7bd | ||
|
0a69ac3577 | ||
|
ab8a2af60d | ||
|
1416ab42fd | ||
|
36e9f3d435 | ||
|
f32e5162a7 | ||
|
2263288b5d | ||
|
58ca4d15bd | ||
|
f1b0fc4097 | ||
|
cb832e1c5d | ||
|
64a6e8bbf6 | ||
|
7f64910521 | ||
|
f84cc9fc51 | ||
|
558c36e859 | ||
|
11ce073fa4 | ||
|
52c22f57a9 | ||
|
be49e77f9d | ||
|
b00ace5472 | ||
|
107c1abf30 | ||
|
c4f75bc16d | ||
|
d0a965f323 | ||
|
2f7eed47c2 | ||
|
ef295ffb0b | ||
|
0a1c5ceed2 | ||
|
23f4e2abd9 | ||
|
af1a53e0ca | ||
|
8ba346c847 | ||
|
1f12c096f8 | ||
|
5358d94cb0 | ||
|
eb3c1d27dc | ||
|
7d9d8049d0 | ||
|
ac1fe56e47 | ||
|
dc08b5314d | ||
|
46177b5ad6 | ||
|
def7b55560 | ||
|
a13b1dcdaf | ||
|
3b9ef649d8 | ||
|
fb8bb68aa8 | ||
|
f62a05aa0b | ||
|
20046fe36c | ||
|
6dbe2e26a7 | ||
|
97d8f69a5e | ||
|
419b00c215 |
179
CHANGELOG
179
CHANGELOG
@@ -145,3 +145,182 @@
|
||||
[1.6.3]
|
||||
* Update Syncthing to 1.3.4
|
||||
|
||||
[1.7.0]
|
||||
* Update Syncthing to 1.4.0
|
||||
|
||||
[1.7.1]
|
||||
* Update Syncthing to 1.4.1
|
||||
|
||||
[1.7.2]
|
||||
* Update Syncthing to 1.4.2
|
||||
|
||||
[1.8.0]
|
||||
* Update Syncthing to 1.5.0
|
||||
* Update to new Cloudron base image
|
||||
|
||||
[1.9.0]
|
||||
* Update Syncthing to 1.6.1
|
||||
|
||||
[1.10.0]
|
||||
* Update Syncthing to 1.7.1
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.7.0)
|
||||
* #6552: panic: Stop called more than once on ... created by nat.Service
|
||||
* #6564: Closing an already removed connection causes GUI error message
|
||||
* #6646: Misleading error message when to be deleted dir contains receive-only changes
|
||||
* #6653: panic: nil pointer dereference in leveldb.(*DB).isClosed()
|
||||
|
||||
[1.11.0]
|
||||
* Update Syncthing to 1.9.0
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.9.0)
|
||||
* Offline nodes after drive replacement automatically heal and join back into the cluster, refer #10416
|
||||
* Listing improvements with parallel disk.Walk calls across many nodes, refer #10420
|
||||
* certs now supports multiple domains for TLS termination, refer #10207
|
||||
* Context now passed around at storage layer for future context support, refer #10321
|
||||
|
||||
[1.12.0]
|
||||
* Update Syncthing to 1.11.1
|
||||
* #6880: fatal error: concurrent map iteration and map write
|
||||
* #6917: Reconsider db check on upgrade
|
||||
* #6930: Can't add new folder with versioning enabled, Cleanup Interval field lacks default value
|
||||
* #6940: TypeError: Object doesn't support property or method 'startsWith' in IE 11 / Windows 7
|
||||
* #6943: Missing strings for translation
|
||||
* #6961: Accounting issue with receive-only deleted files causing spurious 95% completion for remote devices
|
||||
* #6968: Very slow scans on Windows in 1.9.0
|
||||
* #6972: Deleting a folder containing a symlink results in a permanently out of sync on windows
|
||||
* #6973: given name "syncthingxxx.tmp" differs from name in filesystem "syncthingXXX.tmp"
|
||||
* #4277: Announce internal and external address to the global discovery service, encrypted
|
||||
* #6734: Consider moving configuration to a proto contract
|
||||
* #6928: Announce LAN addresses to global discovery
|
||||
|
||||
[1.12.1]
|
||||
* Update Syncthing to 1.12.0
|
||||
* #5360: Dangling symlink prevents filesystem watcher on FreeBSD
|
||||
* #6664: Panic due to internal folder context used on exported methods
|
||||
* #7063: panic: runtime error: invalid memory address or nil pointer dereference
|
||||
* #7077: GUI stuck with "id is not defined" error when trying to ignore non-existent folder
|
||||
* #7098: File deletions are not being synced in newly shared folders
|
||||
* #6540: Config PATCH/PUT/DELETE API
|
||||
* #7099: Add a html message to GUI when javascript is disabled
|
||||
* #7108: Certificate for relaysrv with better naming
|
||||
|
||||
[1.13.0]
|
||||
* Update base image to v3
|
||||
|
||||
[1.14.0]
|
||||
* Update Syncthing to 1.14.0
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.14.0)
|
||||
|
||||
[1.15.0]
|
||||
* Update Syncthing to 1.15.0
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.15.0)
|
||||
|
||||
[1.15.1]
|
||||
* Update Syncthing to 1.15.1
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.15.1)
|
||||
|
||||
[1.16.0]
|
||||
* Update Syncthing to 1.16.0
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.16.0)
|
||||
|
||||
[1.16.1]
|
||||
* Update Syncthing to 1.16.1
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.16.1)
|
||||
|
||||
[1.17.0]
|
||||
* Update Syncthing to 1.17.0
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.17.0)
|
||||
|
||||
[1.18.0]
|
||||
* Update Syncthing to 1.18.0
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.0)
|
||||
|
||||
[1.18.1]
|
||||
* Update Syncthing to 1.18.1
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.1)
|
||||
|
||||
[1.18.2]
|
||||
* Update Syncthing to 1.18.2
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.2)
|
||||
* #7827: The error message "given name ... differs from filesystem name ..." does not help users to resolve the issue
|
||||
* #7893: Updating ignores blocks GUI when IO slots are unavailable
|
||||
|
||||
[1.18.3]
|
||||
* Update Syncthing to 1.18.3
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.3)
|
||||
|
||||
[1.18.4]
|
||||
* Update Syncthing to 1.18.4
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.4)
|
||||
* #7991: Encryption trailer not updated on shortcut
|
||||
* #7994: Index "out of sync with reality" on receive-encrypted folder
|
||||
* #8000: stdiscosrv + strelaysrv systemd services not restarting on upgrade
|
||||
* #8012: Not retrying to sync when a new connection is established
|
||||
|
||||
[1.18.5]
|
||||
* Update Syncthing to 1.18.5
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.5)
|
||||
* Update base image to 3.2.0
|
||||
* #7715: Deleted encrypted files don't show up as locally changed in web UI
|
||||
* #7115: Use CRLF instead of LF in config.xml and .stignore on Windows
|
||||
* #8014: Send TLS SNI to relay server
|
||||
* #8021: Provide a way to preset GUI credentials with password hashing
|
||||
|
||||
[1.19.0]
|
||||
* Update Syncthing to 1.19.0
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.19.0)
|
||||
* #8103: API: /rest/system/connections has misleading "total" entries
|
||||
* #7428: Add ignore patterns to folder defaults
|
||||
* #8090: Allow specifying ports in --generate
|
||||
|
||||
[1.19.1]
|
||||
* Update Syncthing to 1.19.1
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.19.1)
|
||||
* #7850: junctionsAsDirs requires folder pause and resume to trigger
|
||||
* #7924: notify: File mode change events not emitted on MacOS/FSEvents watcher
|
||||
* #8083: Device ID should be read-only and "nearby devices" should be hidden when adding a new pending device
|
||||
* #8143: Behavior of discovery server doesn't match documentation
|
||||
* #8145: Folder ID not editable in add folder dialog
|
||||
* #7942: Improve error message about folder marker outside of folder
|
||||
* #8130: CLI: add command to print pending folders offered by specific device
|
||||
|
||||
[1.19.2]
|
||||
* Update Syncthing to 1.19.2
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.19.2)
|
||||
* Make error message upon reaching the free space quota more clear
|
||||
|
||||
[1.20.0]
|
||||
* Update Syncthing to 1.20.0
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.0)
|
||||
* #7855: Watching for changes using too many system resources on BSDs (kqueue)
|
||||
* #8020: Dangling symlink prevents filesystem watcher on Solaris
|
||||
* #8232: Missing include file endlessly spams log
|
||||
* #8258: The latest version does not support go1.18 compilation!!
|
||||
* #8261: TypeError: Cannot read properties of null (reading 'status') in the GUI after killing Syncthing
|
||||
* #8202: Indicate folders / devices where the remote end has not accepted sharing.
|
||||
* #8282: Change default log format to include date
|
||||
|
||||
[1.20.1]
|
||||
* Update Syncthing to 1.20.1
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.1)
|
||||
* #8320: Spurious failure of new connections ("unknown (newer?) version of the protocol" etc)
|
||||
|
||||
[1.20.2]
|
||||
* Update Syncthing to 1.20.2
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.2)
|
||||
* Fix use of old, renamed function in edit folder sharing tab.
|
||||
|
||||
[1.20.3]
|
||||
* Update Syncthing to 1.20.3
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.3)
|
||||
* #8369: Shared device names are missing from "Edit Folder -> Sharing"
|
||||
* #8376: Chrome Autofill Breaks Authentication
|
||||
* #8386: Ignore patterns with wildcard and non-ASCII characters don't work as expected
|
||||
* #8393: Warn if two devices are introducers to each other
|
||||
|
||||
[1.20.4]
|
||||
* Update Syncthing to 1.20.4
|
||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.4)
|
||||
* #7458: Syncthing announces address of interface which is down
|
||||
* #8479: Panic in failure reporting
|
||||
* #8007: Support listing the discovered devices using the cli
|
||||
|
||||
|
@@ -5,7 +5,8 @@
|
||||
"description": "file://DESCRIPTION.md",
|
||||
"changelog": "file://CHANGELOG",
|
||||
"tagline": "Decentralized file synchronization",
|
||||
"version": "1.6.3",
|
||||
"version": "1.20.4",
|
||||
"upstreamVersion": "1.20.4",
|
||||
"healthCheckPath": "/healthcheck",
|
||||
"httpPort": 8000,
|
||||
"addons": {
|
||||
@@ -27,12 +28,13 @@
|
||||
"storage",
|
||||
"sync"
|
||||
],
|
||||
"minBoxVersion": "4.1.4",
|
||||
"documentationUrl": "https://cloudron.io/documentation/apps/syncthing/",
|
||||
"minBoxVersion": "7.1.2",
|
||||
"forumUrl": "https://forum.cloudron.io/category/56/syncthing",
|
||||
"documentationUrl": "https://docs.cloudron.io/apps/syncthing/",
|
||||
"mediaLinks": [
|
||||
"https://s3.amazonaws.com/cloudron-app-screenshots/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/1.png",
|
||||
"https://s3.amazonaws.com/cloudron-app-screenshots/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/2.png",
|
||||
"https://s3.amazonaws.com/cloudron-app-screenshots/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/3.png"
|
||||
"https://screenshots.cloudron.io/net.syncthing.cloudronapp2/1.png",
|
||||
"https://screenshots.cloudron.io/net.syncthing.cloudronapp2/2.png",
|
||||
"https://screenshots.cloudron.io/net.syncthing.cloudronapp2/3.png"
|
||||
],
|
||||
"postInstallMessage": "file://POSTINSTALL.md"
|
||||
}
|
||||
|
@@ -1,5 +1,3 @@
|
||||
This app packages Syncthing <upstream>1.3.4</upstream>.
|
||||
|
||||
Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
|
||||
|
||||
### Features
|
||||
|
15
Dockerfile
15
Dockerfile
@@ -1,17 +1,16 @@
|
||||
FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
|
||||
|
||||
ARG VERSION=1.3.4
|
||||
RUN mkdir -p /app/code \
|
||||
&& wget https://github.com/syncthing/syncthing/releases/download/v${VERSION}/syncthing-linux-amd64-v${VERSION}.tar.gz -O - \
|
||||
| tar -xz -C /app/code --strip-components=1
|
||||
FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
|
||||
|
||||
RUN mkdir -p /app/code
|
||||
WORKDIR /app/code
|
||||
|
||||
ARG VERSION=1.20.4
|
||||
|
||||
RUN wget https://github.com/syncthing/syncthing/releases/download/v${VERSION}/syncthing-linux-amd64-v${VERSION}.tar.gz -O - | tar -xz -C /app/code --strip-components=1
|
||||
|
||||
# add supervisor configs
|
||||
ADD supervisor/* /etc/supervisor/conf.d/
|
||||
RUN ln -sf /run/syncthing/supervisord.log /var/log/supervisor/supervisord.log
|
||||
|
||||
ADD nginx.conf /app/code/nginx.conf
|
||||
ADD start.sh /app/code/start.sh
|
||||
ADD nginx.conf start.sh /app/code/
|
||||
|
||||
CMD [ "/app/code/start.sh" ]
|
||||
|
@@ -1,8 +1,7 @@
|
||||
Use the following credentials for initial setup:
|
||||
This app is pre-setup with an admin account. The initial credentials are:
|
||||
|
||||
`username`: admin
|
||||
**Username**: admin<br/>
|
||||
**Password**: changeme<br/>
|
||||
|
||||
`password`: changeme
|
||||
|
||||
**Please change the admin password on first login**
|
||||
Please change the admin password immediately.
|
||||
|
||||
|
6
start.sh
6
start.sh
@@ -5,11 +5,11 @@ set -eu
|
||||
mkdir -p /app/data/config /app/data/folders /run/syncthing
|
||||
|
||||
# if this if the first run, generate a useful config
|
||||
if [ ! -f /app/data/config/config.xml ]; then
|
||||
if [[ ! -f /app/data/config/config.xml ]]; then
|
||||
echo "=> Generating config"
|
||||
STNODEFAULTFOLDER=1 /app/code/syncthing --generate="/app/data/config"
|
||||
|
||||
# The password value was determined by reading config.xml and setting value in the GUI
|
||||
# The password value (changeme) was determined by reading config.xml and setting value in the GUI
|
||||
# urAccepted is 0 for not decided, -1 for no reporting
|
||||
xmlstarlet ed --inplace \
|
||||
--subnode "//configuration/gui" -t elem -n user -v "admin" \
|
||||
@@ -26,4 +26,4 @@ sed -e 's,<gui .*>,<gui enabled="true" tls="false" debugging="false">,' -i /app/
|
||||
chown -R cloudron:cloudron /app/data /run/syncthing
|
||||
|
||||
echo "Starting supervisor"
|
||||
exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i GitLab
|
||||
exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i syncthing
|
||||
|
3514
test/package-lock.json
generated
3514
test/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,14 +9,10 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"chromedriver": "^79.0.0",
|
||||
"ejs": "^3.0.1",
|
||||
"chromedriver": "^103.0.0",
|
||||
"expect.js": "^0.3.1",
|
||||
"mkdirp": "^0.5.1",
|
||||
"mocha": "^7.0.0",
|
||||
"rimraf": "^3.0.0",
|
||||
"selenium-server-standalone-jar": "^3.141.59",
|
||||
"selenium-webdriver": "^3.6.0",
|
||||
"superagent": "^5.2.1"
|
||||
"mocha": "^10.0.0",
|
||||
"selenium-webdriver": "^4.3.1",
|
||||
"superagent": "^8.0.0"
|
||||
}
|
||||
}
|
||||
|
172
test/test.js
172
test/test.js
@@ -1,67 +1,52 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/* jshint esversion: 8 */
|
||||
/* global describe */
|
||||
/* global before */
|
||||
/* global after */
|
||||
/* global it */
|
||||
|
||||
'use strict';
|
||||
|
||||
require('chromedriver');
|
||||
|
||||
var execSync = require('child_process').execSync,
|
||||
const execSync = require('child_process').execSync,
|
||||
expect = require('expect.js'),
|
||||
superagent = require('superagent'),
|
||||
path = require('path'),
|
||||
webdriver = require('selenium-webdriver');
|
||||
|
||||
var by = require('selenium-webdriver').By,
|
||||
until = require('selenium-webdriver').until,
|
||||
Key = require('selenium-webdriver').Key,
|
||||
Builder = require('selenium-webdriver').Builder;
|
||||
|
||||
var accessKey = 'admin',
|
||||
secretKey = 'secretkey';
|
||||
|
||||
var bucket_prefix = 'bucket',
|
||||
bucket_id = 0,
|
||||
bucket;
|
||||
|
||||
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
|
||||
{ Builder, By, Key, until } = require('selenium-webdriver'),
|
||||
{ Options } = require('selenium-webdriver/chrome');
|
||||
|
||||
describe('Application life cycle test', function () {
|
||||
this.timeout(0);
|
||||
|
||||
var server, browser = new Builder().forBrowser('chrome').build();
|
||||
var username = 'admin', password = 'changeme';
|
||||
|
||||
before(function (done) {
|
||||
var seleniumJar= require('selenium-server-standalone-jar');
|
||||
var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
|
||||
server = new SeleniumServer(seleniumJar.path, { port: 4444 });
|
||||
server.start();
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
after(function (done) {
|
||||
browser.quit();
|
||||
server.stop();
|
||||
done();
|
||||
});
|
||||
|
||||
var LOCATION = 'test';
|
||||
var TEST_TIMEOUT = 30000;
|
||||
var FOLDER = 'xmf'; // keep this small. long folder names fail in automation, not sure why
|
||||
var SYNC_PORT = 22001;
|
||||
var EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
|
||||
|
||||
var browser;
|
||||
var app;
|
||||
var username = 'admin', password = 'changeme';
|
||||
|
||||
function installApp() {
|
||||
execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||
before(function () {
|
||||
browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
|
||||
});
|
||||
|
||||
after(function () {
|
||||
browser.quit();
|
||||
});
|
||||
|
||||
function getAppInfo() {
|
||||
var inspect = JSON.parse(execSync('cloudron inspect'));
|
||||
app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
|
||||
expect(app).to.be.an('object');
|
||||
}
|
||||
|
||||
function pageLoaded() {
|
||||
return browser.wait(until.titleMatches(/[0-9a-f]{12} \| Syncthing/), TEST_TIMEOUT);
|
||||
}
|
||||
|
||||
function visible(selector) {
|
||||
return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
|
||||
return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
|
||||
function waitForElement(elem) {
|
||||
return browser.wait(until.elementLocated(elem), TEST_TIMEOUT).then(function () {
|
||||
return browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -75,11 +60,17 @@ describe('Application life cycle test', function () {
|
||||
|
||||
function loadPage(callback) {
|
||||
browser.manage().deleteAllCookies().then(function () {
|
||||
return browser.sleep(5000);
|
||||
}).then(function() {
|
||||
return browser.get('https://' + username + ':' + encodeURIComponent(password) + '@' + app.fqdn).then(function () {
|
||||
return browser.get('https://' + app.fqdn);
|
||||
});
|
||||
}).then(function () {
|
||||
return pageLoaded();
|
||||
return browser.sleep(5000);
|
||||
}).then(function () {
|
||||
return browser.get('https://' + app.fqdn);
|
||||
}).then(function () {
|
||||
return waitForElement(By.xpath('//span[text()="Actions"]'));
|
||||
}).then(function () {
|
||||
callback();
|
||||
});
|
||||
@@ -87,19 +78,19 @@ describe('Application life cycle test', function () {
|
||||
|
||||
function addFolder(callback) {
|
||||
browser.get('https://' + app.fqdn).then(function () {
|
||||
return browser.findElement(by.css('[ng-click*=addFolder]')).click();
|
||||
return browser.findElement(By.css('[ng-click*=addFolder]')).click();
|
||||
}).then(function () {
|
||||
return visible(by.id('folderPath'));
|
||||
return waitForElement(By.id('folderPath'));
|
||||
}).then(function () {
|
||||
return browser.sleep(4000); // wait more, not sure why this is needed
|
||||
}).then(function() {
|
||||
return browser.findElement(by.id('folderLabel')).sendKeys(FOLDER);
|
||||
return browser.findElement(By.id('folderLabel')).sendKeys(FOLDER);
|
||||
}).then(function () {
|
||||
return browser.sleep(4000); // without this sometimes only part of the folder name gets through
|
||||
}).then(function() {
|
||||
return browser.findElement(by.css('[ng-click*=saveFolder]')).click();
|
||||
return browser.findElement(By.css('[ng-click*=saveFolder]')).click();
|
||||
}).then(function() {
|
||||
return browser.wait(until.elementLocated(by.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
|
||||
return browser.wait(until.elementLocated(By.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
|
||||
}).then(function () {
|
||||
return browser.sleep(4000);
|
||||
}).then(function() {
|
||||
@@ -109,29 +100,33 @@ describe('Application life cycle test', function () {
|
||||
|
||||
function checkFolder(callback) {
|
||||
browser.get('https://' + app.fqdn).then(function () {
|
||||
return browser.wait(until.elementLocated(by.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
|
||||
}).then(function () {
|
||||
return browser.sleep(5000);
|
||||
}).then(function () {
|
||||
return browser.get('https://' + app.fqdn);
|
||||
}).then(function () {
|
||||
return browser.wait(until.elementLocated(By.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
|
||||
}).then(function () {
|
||||
callback();
|
||||
});
|
||||
}
|
||||
|
||||
function removeFolder(callback) {
|
||||
browser.get('https://' + app.fqdn).then(function () {
|
||||
return pageLoaded();
|
||||
return waitForElement(By.xpath('//span[text()="Actions"]'));
|
||||
}).then(function() {
|
||||
return browser.findElement(by.css('#folders button')).click();
|
||||
return browser.findElement(By.css('#folders button')).click();
|
||||
}).then(function () {
|
||||
return browser.sleep(3000); //No way to check for visibility of angular-js components
|
||||
}).then(function () {
|
||||
return browser.findElement(by.css('#folder-0 button[ng-click*=editFolder]')).click();
|
||||
return browser.findElement(By.css('#folder-0 button[ng-click*=editFolder]')).click();
|
||||
}).then(function () {
|
||||
return browser.sleep(3000); //No way to check for visibility of angular-js components
|
||||
}).then(function () {
|
||||
return browser.findElement(by.xpath('//button[@data-target="#remove-folder-confirmation"]')).click();
|
||||
return browser.findElement(By.xpath('//button[@data-target="#remove-folder-confirmation"]')).click();
|
||||
}).then(function () {
|
||||
return browser.sleep(3000); //No way to check for visibility of angular-js components
|
||||
}).then(function () {
|
||||
return browser.findElement(by.css('[ng-click*=deleteFolder]')).click();
|
||||
return browser.findElement(By.css('[ng-click*=deleteFolder]')).click();
|
||||
}).then(function () {
|
||||
return browser.sleep(3000); //This needs to run for some time
|
||||
}).then(function () {
|
||||
@@ -139,65 +134,64 @@ describe('Application life cycle test', function () {
|
||||
});
|
||||
}
|
||||
|
||||
xit('build app', function () {
|
||||
execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||
});
|
||||
function wait (done) {
|
||||
setTimeout(done, 10000);
|
||||
}
|
||||
|
||||
it('install app', installApp);
|
||||
xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
|
||||
|
||||
it('can get app information', function () {
|
||||
var inspect = JSON.parse(execSync('cloudron inspect'));
|
||||
it('install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, EXEC_ARGS); });
|
||||
it('can get app information', getAppInfo);
|
||||
|
||||
app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
|
||||
|
||||
expect(app).to.be.an('object');
|
||||
});
|
||||
it('wait', wait);
|
||||
|
||||
it('fails with invalid password', invalidPassword);
|
||||
it('can load page', loadPage);
|
||||
it('can add folder', addFolder);
|
||||
|
||||
it('backup app', function () {
|
||||
execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||
it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
|
||||
it('restore app', async function () {
|
||||
await browser.get('about:blank');
|
||||
execSync('cloudron restore --app ' + app.id, EXEC_ARGS);
|
||||
});
|
||||
|
||||
it('restore app', function () {
|
||||
execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||
});
|
||||
it('wait', wait);
|
||||
|
||||
it('can load page', loadPage);
|
||||
it('can check folder', checkFolder);
|
||||
|
||||
it('move to different location', function () {
|
||||
browser.manage().deleteAllCookies();
|
||||
execSync('cloudron configure --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||
var inspect = JSON.parse(execSync('cloudron inspect'));
|
||||
app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
|
||||
expect(app).to.be.an('object');
|
||||
it('move to different location', async function () {
|
||||
await browser.get('about:blank');
|
||||
execSync(`cloudron configure --location ${LOCATION}2 --app ${app.id}`, EXEC_ARGS);
|
||||
});
|
||||
it('can get app information', getAppInfo);
|
||||
|
||||
it('wait', wait);
|
||||
|
||||
it('can load page', loadPage);
|
||||
it('can check folder', checkFolder);
|
||||
it('can remove folder', removeFolder);
|
||||
|
||||
it('uninstall app', function () {
|
||||
execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||
it('uninstall app', async function () {
|
||||
await browser.get('about:blank');
|
||||
execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
|
||||
});
|
||||
|
||||
// test update
|
||||
it('can install app', function () {
|
||||
execSync('cloudron install --appstore-id net.syncthing.cloudronapp2 --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||
var inspect = JSON.parse(execSync('cloudron inspect'));
|
||||
app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
|
||||
expect(app).to.be.an('object');
|
||||
});
|
||||
it('can install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --appstore-id net.syncthing.cloudronapp2 --location ' + LOCATION, EXEC_ARGS); });
|
||||
it('can get app information', getAppInfo);
|
||||
it('wait', wait);
|
||||
it('can load page', loadPage);
|
||||
it('can add folder', addFolder);
|
||||
it('can update', function () {
|
||||
execSync('cloudron update --app ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||
it('can update', async function () {
|
||||
await browser.get('about:blank');
|
||||
execSync('cloudron update --app ' + LOCATION, EXEC_ARGS);
|
||||
});
|
||||
it('wait', wait);
|
||||
it('can check folder', checkFolder);
|
||||
it('uninstall app', function () {
|
||||
execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||
|
||||
it('uninstall app', async function () {
|
||||
await browser.get('about:blank');
|
||||
execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
|
||||
});
|
||||
});
|
||||
|
Reference in New Issue
Block a user