Compare commits

...

4 Commits

Author SHA1 Message Date
Johannes Zellner
5d93801795 Bump version 2024-07-30 18:43:47 +02:00
Johannes Zellner
f8682e43af Fixup tests 2024-07-30 18:43:15 +02:00
Johannes Zellner
290ecd7fb9 Update test deps 2024-07-30 18:23:39 +02:00
Johannes Zellner
26aeb33d0e Update to 1.111.1 2024-07-30 18:23:28 +02:00
6 changed files with 87 additions and 69 deletions

View File

@@ -1259,3 +1259,7 @@
* Update Synapse to 1.111.0
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.111.0)
[1.97.1]
* Update Synapse to 1.111.1
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.111.1)

View File

@@ -5,8 +5,8 @@
"description": "file://DESCRIPTION.md",
"changelog": "file://CHANGELOG.md",
"tagline": "Secure & decentralized communication",
"version": "1.97.0",
"upstreamVersion": "1.111.0",
"version": "1.97.1",
"upstreamVersion": "1.111.1",
"healthCheckPath": "/",
"httpPort": 8008,
"memoryLimit": 536870912,

View File

@@ -9,7 +9,7 @@ RUN virtualenv -p python3 /app/code/env
ENV VIRTUAL_ENV=/app/code/env
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
ARG VERSION=1.111.0
ARG VERSION=1.111.1
# https://github.com/matrix-org/synapse-s3-storage-provider
ARG STORAGE_PROVIDER_VERSION=1beb6af95e1f5caedb8e6e7e1cc176cdb2106d37

70
test/package-lock.json generated
View File

@@ -9,12 +9,17 @@
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"chromedriver": "^126.0.4",
"chromedriver": "^127.0.0",
"expect.js": "^0.3.1",
"mocha": "^10.6.0",
"selenium-webdriver": "^4.22.0"
"mocha": "^10.7.0",
"selenium-webdriver": "^4.23.0"
}
},
"node_modules/@bazel/runfiles": {
"version": "5.8.1",
"resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-5.8.1.tgz",
"integrity": "sha512-NDdfpdQ6rZlylgv++iMn5FkObC/QlBQvipinGLSOguTYpRywmieOyJ29XHvUilspwTFSILWpoE9CqMGkHXug1g=="
},
"node_modules/@testim/chrome-version": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
@@ -241,9 +246,9 @@
}
},
"node_modules/chromedriver": {
"version": "126.0.4",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-126.0.4.tgz",
"integrity": "sha512-mIdJqdocfN/y9fl5BymIzM9WQLy64x078i5tS1jGFzbFAwXwXrj3zmA86Wf3R/hywPYpWqwXxFGBJHgqZTuGCA==",
"version": "127.0.0",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-127.0.0.tgz",
"integrity": "sha512-/Jla24iL0ly/EI7i/q0ukANkpAWvAkSHbvC7FtBZXFJXe6klH0n/XT56VSBcBYB1iMgWM8kPwqF8pb9gdqN9UA==",
"hasInstallScript": true,
"dependencies": {
"@testim/chrome-version": "^1.1.4",
@@ -919,9 +924,9 @@
}
},
"node_modules/mocha": {
"version": "10.6.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-10.6.0.tgz",
"integrity": "sha512-hxjt4+EEB0SA0ZDygSS015t65lJw/I2yRCS3Ae+SJ5FrbzrXgfYwJr96f0OvIXdj7h4lv/vLCrH3rkiuizFSvw==",
"version": "10.7.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.0.tgz",
"integrity": "sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==",
"dependencies": {
"ansi-colors": "^4.1.3",
"browser-stdout": "^1.3.1",
@@ -1175,13 +1180,14 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
"node_modules/selenium-webdriver": {
"version": "4.22.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.22.0.tgz",
"integrity": "sha512-GNbrkCHmy249ai885wgXqTfqL2lZnclUH/P8pwTDIqzyFxU3YhDiN7p/c9tMFA4NhgRdEBO2QCG+CWmG7xr/Mw==",
"version": "4.23.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.23.0.tgz",
"integrity": "sha512-DdvtInpnMt95Td8VApvmAw7oSydBD9twIRXqoMyRoGMvL1dAnMFxdrwnW6L0d/pF/uoNTjbVUarwGZ9wIGNStA==",
"dependencies": {
"@bazel/runfiles": "^5.8.1",
"jszip": "^3.10.1",
"tmp": "^0.2.3",
"ws": ">=8.16.0"
"ws": "^8.17.1"
},
"engines": {
"node": ">= 14.21.0"
@@ -1395,9 +1401,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"node_modules/ws": {
"version": "8.16.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
"integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
"version": "8.18.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"engines": {
"node": ">=10.0.0"
},
@@ -1483,6 +1489,11 @@
}
},
"dependencies": {
"@bazel/runfiles": {
"version": "5.8.1",
"resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-5.8.1.tgz",
"integrity": "sha512-NDdfpdQ6rZlylgv++iMn5FkObC/QlBQvipinGLSOguTYpRywmieOyJ29XHvUilspwTFSILWpoE9CqMGkHXug1g=="
},
"@testim/chrome-version": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
@@ -1652,9 +1663,9 @@
}
},
"chromedriver": {
"version": "126.0.4",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-126.0.4.tgz",
"integrity": "sha512-mIdJqdocfN/y9fl5BymIzM9WQLy64x078i5tS1jGFzbFAwXwXrj3zmA86Wf3R/hywPYpWqwXxFGBJHgqZTuGCA==",
"version": "127.0.0",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-127.0.0.tgz",
"integrity": "sha512-/Jla24iL0ly/EI7i/q0ukANkpAWvAkSHbvC7FtBZXFJXe6klH0n/XT56VSBcBYB1iMgWM8kPwqF8pb9gdqN9UA==",
"requires": {
"@testim/chrome-version": "^1.1.4",
"axios": "^1.6.7",
@@ -2124,9 +2135,9 @@
}
},
"mocha": {
"version": "10.6.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-10.6.0.tgz",
"integrity": "sha512-hxjt4+EEB0SA0ZDygSS015t65lJw/I2yRCS3Ae+SJ5FrbzrXgfYwJr96f0OvIXdj7h4lv/vLCrH3rkiuizFSvw==",
"version": "10.7.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.0.tgz",
"integrity": "sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==",
"requires": {
"ansi-colors": "^4.1.3",
"browser-stdout": "^1.3.1",
@@ -2327,13 +2338,14 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
"selenium-webdriver": {
"version": "4.22.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.22.0.tgz",
"integrity": "sha512-GNbrkCHmy249ai885wgXqTfqL2lZnclUH/P8pwTDIqzyFxU3YhDiN7p/c9tMFA4NhgRdEBO2QCG+CWmG7xr/Mw==",
"version": "4.23.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.23.0.tgz",
"integrity": "sha512-DdvtInpnMt95Td8VApvmAw7oSydBD9twIRXqoMyRoGMvL1dAnMFxdrwnW6L0d/pF/uoNTjbVUarwGZ9wIGNStA==",
"requires": {
"@bazel/runfiles": "^5.8.1",
"jszip": "^3.10.1",
"tmp": "^0.2.3",
"ws": ">=8.16.0"
"ws": "^8.17.1"
}
},
"serialize-javascript": {
@@ -2491,9 +2503,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"ws": {
"version": "8.16.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
"integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
"version": "8.18.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"requires": {}
},
"y18n": {

View File

@@ -9,9 +9,9 @@
"author": "",
"license": "ISC",
"dependencies": {
"chromedriver": "^126.0.4",
"chromedriver": "^127.0.0",
"expect.js": "^0.3.1",
"mocha": "^10.6.0",
"selenium-webdriver": "^4.22.0"
"mocha": "^10.7.0",
"selenium-webdriver": "^4.23.0"
}
}

View File

@@ -228,32 +228,32 @@ describe('Application life cycle test', function () {
xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
// // No SSO
// it('install app (no sso)', function () { execSync('cloudron install --no-sso --location ' + LOCATION, EXEC_ARGS); });
// it('can get app information', getAppInfo);
// it('check landing page', checkLandingPage);
// No SSO
it('install app (no sso)', function () { execSync('cloudron install --no-sso --location ' + LOCATION, EXEC_ARGS); });
it('can get app information', getAppInfo);
it('check landing page', checkLandingPage);
// it('can install element-web app (no sso)', function () { execSync('cloudron install --appstore-id im.riot.cloudronapp --location ' + ELEMENT_LOCATION, EXEC_ARGS); });
// it('update element-app config', updateSynapseConfig);
it('can install element-web app (no sso)', function () { execSync('cloudron install --appstore-id im.riot.cloudronapp --location ' + ELEMENT_LOCATION, EXEC_ARGS); });
it('update element-app config', updateSynapseConfig);
// it('can get Element app info', getElementAppInfo);
// it('can register new user', registerUser);
// it('create room', createRoom);
// it('can send message', sendMessage);
it('can get Element app info', getElementAppInfo);
it('can register new user', registerUser);
it('create room', createRoom);
it('can send message', sendMessage);
// it('can logout', logout);
it('can logout', logout);
// it('can login', login);
// it('check room', checkRoom);
// it('can logout', logout);
it('can login', login);
it('check room', checkRoom);
it('can logout', logout);
// it('can get app info', getAppInfo);
it('can get app info', getAppInfo);
// it('uninstall element-web app', async function () {
// await browser.get('about:blank');
// execSync(`cloudron uninstall --app ${ELEMENT_LOCATION}`, EXEC_ARGS);
// });
// it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
it('uninstall element-web app', async function () {
await browser.get('about:blank');
execSync(`cloudron uninstall --app ${ELEMENT_LOCATION}`, EXEC_ARGS);
});
it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
// SSO
it('install app (sso)', function () { execSync('cloudron install --location ' + LOCATION, EXEC_ARGS); });
@@ -268,26 +268,26 @@ describe('Application life cycle test', function () {
it('can send message', sendMessage);
it('can get app info', getAppInfo);
// it('can restart app', function () { execSync(`cloudron restart ${app.id}`); });
it('can restart app', function () { execSync(`cloudron restart ${app.id}`); });
// it('backup app', function () { execSync(`cloudron backup create --app ${app.id}`, EXEC_ARGS); });
it('backup app', function () { execSync(`cloudron backup create --app ${app.id}`, EXEC_ARGS); });
// it('can get Element app info', getElementAppInfo);
// it('is logged in', isLoggedIn);
// it('check room', checkRoom);
// it('can get app info', getAppInfo);
it('can get Element app info', getElementAppInfo);
it('is logged in', isLoggedIn);
it('check room', checkRoom);
it('can get app info', getAppInfo);
// it('restore app', async function () {
// const backups = JSON.parse(execSync(`cloudron backup list --raw --app ${app.id}`));
it('restore app', async function () {
const backups = JSON.parse(execSync(`cloudron backup list --raw --app ${app.id}`));
// await browser.get('about:blank');
// execSync(`cloudron uninstall --app ${app.id}`, EXEC_ARGS);
// execSync(`cloudron install --location ${LOCATION}`, EXEC_ARGS);
await browser.get('about:blank');
execSync(`cloudron uninstall --app ${app.id}`, EXEC_ARGS);
execSync(`cloudron install --location ${LOCATION}`, EXEC_ARGS);
// getAppInfo();
getAppInfo();
// execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, EXEC_ARGS);
// });
execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, EXEC_ARGS);
});
it('can get Element app info', getElementAppInfo);
it('is logged in', isLoggedIn);
@@ -323,6 +323,8 @@ describe('Application life cycle test', function () {
// test update
it('can install app for update', function () { execSync('cloudron install --appstore-id org.matrix.synapse --location ' + LOCATION, EXEC_ARGS); });
it('can install element-web app (update)', function () { execSync('cloudron install --appstore-id im.riot.cloudronapp --location ' + ELEMENT_LOCATION, EXEC_ARGS); });
it('can get app info', getAppInfo);
it('update element-app config', updateSynapseConfig);