Compare commits

...

3 Commits

Author SHA1 Message Date
Johannes Zellner
d589b1320b Bump version 2024-09-02 22:22:26 +02:00
Johannes Zellner
9c254a6c62 Update test deps 2024-09-02 21:40:24 +02:00
Johannes Zellner
82d1cc5b58 Update to 1.114.0 2024-09-02 21:40:16 +02:00
6 changed files with 110 additions and 106 deletions

View File

@@ -1271,3 +1271,7 @@
* Update Synapse to 1.113.0 * Update Synapse to 1.113.0
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.113.0) * [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.113.0)
[1.97.4]
* Update Synapse to 1.114.0
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.114.0)

View File

@@ -5,8 +5,8 @@
"description": "file://DESCRIPTION.md", "description": "file://DESCRIPTION.md",
"changelog": "file://CHANGELOG.md", "changelog": "file://CHANGELOG.md",
"tagline": "Secure & decentralized communication", "tagline": "Secure & decentralized communication",
"version": "1.97.3", "version": "1.97.4",
"upstreamVersion": "1.113.0", "upstreamVersion": "1.114.0",
"healthCheckPath": "/", "healthCheckPath": "/",
"httpPort": 8008, "httpPort": 8008,
"memoryLimit": 536870912, "memoryLimit": 536870912,

View File

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

64
test/package-lock.json generated
View File

@@ -9,10 +9,10 @@
"version": "1.0.0", "version": "1.0.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"chromedriver": "^127.0.2", "chromedriver": "^128.0.1",
"expect.js": "^0.3.1", "expect.js": "^0.3.1",
"mocha": "^10.7.3", "mocha": "^10.7.3",
"selenium-webdriver": "^4.23.0" "selenium-webdriver": "^4.24.0"
} }
}, },
"node_modules/@bazel/runfiles": { "node_modules/@bazel/runfiles": {
@@ -120,11 +120,11 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "1.6.7", "version": "1.7.7",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
"integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
"dependencies": { "dependencies": {
"follow-redirects": "^1.15.4", "follow-redirects": "^1.15.6",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"proxy-from-env": "^1.1.0" "proxy-from-env": "^1.1.0"
} }
@@ -246,13 +246,13 @@
} }
}, },
"node_modules/chromedriver": { "node_modules/chromedriver": {
"version": "127.0.2", "version": "128.0.1",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-127.0.2.tgz", "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-128.0.1.tgz",
"integrity": "sha512-mYfJ/8FqzsdFOs2rPiAI4y0suFnv78cRnzZK0MHdSfSIDeRPbqZz0rNX4lrXt14hXc9vqXa+a8cMxlrhWtXKSQ==", "integrity": "sha512-UmWqZXXAyuRa37pE+lnU46vJcCM/y0ddF015LHxycEOYfuqsK7k9ZxJuXCQNWbws9e7FAMQj/GJZT92WPgis0g==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@testim/chrome-version": "^1.1.4", "@testim/chrome-version": "^1.1.4",
"axios": "^1.6.7", "axios": "^1.7.4",
"compare-versions": "^6.1.0", "compare-versions": "^6.1.0",
"extract-zip": "^2.0.1", "extract-zip": "^2.0.1",
"proxy-agent": "^6.4.0", "proxy-agent": "^6.4.0",
@@ -529,9 +529,9 @@
} }
}, },
"node_modules/follow-redirects": { "node_modules/follow-redirects": {
"version": "1.15.5", "version": "1.15.6",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
"integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@@ -1180,14 +1180,14 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
}, },
"node_modules/selenium-webdriver": { "node_modules/selenium-webdriver": {
"version": "4.23.0", "version": "4.24.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.23.0.tgz", "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.24.0.tgz",
"integrity": "sha512-DdvtInpnMt95Td8VApvmAw7oSydBD9twIRXqoMyRoGMvL1dAnMFxdrwnW6L0d/pF/uoNTjbVUarwGZ9wIGNStA==", "integrity": "sha512-qrqoHhHPZuKLiz5VAQUxrn3ILs7/cYqn2/x96r35g5JjkLUjOS1lX+F+tEJKhRMlQ/MGJ+N1016JF5g2xZUFzw==",
"dependencies": { "dependencies": {
"@bazel/runfiles": "^5.8.1", "@bazel/runfiles": "^5.8.1",
"jszip": "^3.10.1", "jszip": "^3.10.1",
"tmp": "^0.2.3", "tmp": "^0.2.3",
"ws": "^8.17.1" "ws": "^8.18.0"
}, },
"engines": { "engines": {
"node": ">= 14.21.0" "node": ">= 14.21.0"
@@ -1573,11 +1573,11 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
}, },
"axios": { "axios": {
"version": "1.6.7", "version": "1.7.7",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
"integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
"requires": { "requires": {
"follow-redirects": "^1.15.4", "follow-redirects": "^1.15.6",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"proxy-from-env": "^1.1.0" "proxy-from-env": "^1.1.0"
} }
@@ -1663,12 +1663,12 @@
} }
}, },
"chromedriver": { "chromedriver": {
"version": "127.0.2", "version": "128.0.1",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-127.0.2.tgz", "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-128.0.1.tgz",
"integrity": "sha512-mYfJ/8FqzsdFOs2rPiAI4y0suFnv78cRnzZK0MHdSfSIDeRPbqZz0rNX4lrXt14hXc9vqXa+a8cMxlrhWtXKSQ==", "integrity": "sha512-UmWqZXXAyuRa37pE+lnU46vJcCM/y0ddF015LHxycEOYfuqsK7k9ZxJuXCQNWbws9e7FAMQj/GJZT92WPgis0g==",
"requires": { "requires": {
"@testim/chrome-version": "^1.1.4", "@testim/chrome-version": "^1.1.4",
"axios": "^1.6.7", "axios": "^1.7.4",
"compare-versions": "^6.1.0", "compare-versions": "^6.1.0",
"extract-zip": "^2.0.1", "extract-zip": "^2.0.1",
"proxy-agent": "^6.4.0", "proxy-agent": "^6.4.0",
@@ -1856,9 +1856,9 @@
"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==" "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="
}, },
"follow-redirects": { "follow-redirects": {
"version": "1.15.5", "version": "1.15.6",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
"integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==" "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
}, },
"form-data": { "form-data": {
"version": "4.0.0", "version": "4.0.0",
@@ -2338,14 +2338,14 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
}, },
"selenium-webdriver": { "selenium-webdriver": {
"version": "4.23.0", "version": "4.24.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.23.0.tgz", "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.24.0.tgz",
"integrity": "sha512-DdvtInpnMt95Td8VApvmAw7oSydBD9twIRXqoMyRoGMvL1dAnMFxdrwnW6L0d/pF/uoNTjbVUarwGZ9wIGNStA==", "integrity": "sha512-qrqoHhHPZuKLiz5VAQUxrn3ILs7/cYqn2/x96r35g5JjkLUjOS1lX+F+tEJKhRMlQ/MGJ+N1016JF5g2xZUFzw==",
"requires": { "requires": {
"@bazel/runfiles": "^5.8.1", "@bazel/runfiles": "^5.8.1",
"jszip": "^3.10.1", "jszip": "^3.10.1",
"tmp": "^0.2.3", "tmp": "^0.2.3",
"ws": "^8.17.1" "ws": "^8.18.0"
} }
}, },
"serialize-javascript": { "serialize-javascript": {

View File

@@ -9,9 +9,9 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"chromedriver": "^127.0.2", "chromedriver": "^128.0.1",
"expect.js": "^0.3.1", "expect.js": "^0.3.1",
"mocha": "^10.7.3", "mocha": "^10.7.3",
"selenium-webdriver": "^4.23.0" "selenium-webdriver": "^4.24.0"
} }
} }

View File

@@ -249,98 +249,98 @@ describe('Application life cycle test', function () {
xit('build app', function () { execSync('cloudron build', EXEC_ARGS); }); xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
// // No SSO // No SSO
// it('install app (no sso)', function () { execSync('cloudron install --no-sso --location ' + LOCATION, EXEC_ARGS); }); it('install app (no sso)', function () { execSync('cloudron install --no-sso --location ' + LOCATION, EXEC_ARGS); });
// it('can get app information', getAppInfo); it('can get app information', getAppInfo);
// it('check landing page', checkLandingPage); 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('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('update element-app config', updateSynapseConfig);
// it('can get Element app info', getElementAppInfo); it('can get Element app info', getElementAppInfo);
// it('can register new user', registerUser); it('can register new user', registerUser);
// it('create room', createRoom); it('create room', createRoom);
// it('can send message', sendMessage); it('can send message', sendMessage);
// it('can logout', logout); it('can logout', logout);
// it('can login', login); it('can login', login);
// it('check room', checkRoom); it('check room', checkRoom);
// it('can logout', logout); it('can logout', logout);
// it('can get app info', getAppInfo); it('can get app info', getAppInfo);
// it('uninstall element-web app', async function () { it('uninstall element-web app', async function () {
// await browser.get('about:blank'); await browser.get('about:blank');
// execSync(`cloudron uninstall --app ${ELEMENT_LOCATION}`, EXEC_ARGS); execSync(`cloudron uninstall --app ${ELEMENT_LOCATION}`, EXEC_ARGS);
// }); });
// it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); }); it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
// // SSO // SSO
// it('install app (sso)', function () { execSync('cloudron install --location ' + LOCATION, EXEC_ARGS); }); it('install app (sso)', function () { execSync('cloudron install --location ' + LOCATION, EXEC_ARGS); });
// it('can get app info', getAppInfo); it('can get app info', getAppInfo);
// it('can install element-web app (sso)', function () { execSync('cloudron install --appstore-id im.riot.cloudronapp --location ' + ELEMENT_LOCATION, EXEC_ARGS); }); it('can install element-web app (sso)', function () { execSync('cloudron install --appstore-id im.riot.cloudronapp --location ' + ELEMENT_LOCATION, EXEC_ARGS); });
// it('update element-app config', updateSynapseConfig); it('update element-app config', updateSynapseConfig);
// it('can get Element app info', getElementAppInfo); it('can get Element app info', getElementAppInfo);
// it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD)); it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
// it('create room', createRoom); it('create room', createRoom);
// it('can send message', sendMessage); it('can send message', sendMessage);
// it('can get app info', getAppInfo); 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('can get Element app info', getElementAppInfo);
// it('is logged in', isLoggedIn); it('is logged in', isLoggedIn);
// it('check room', checkRoom); it('check room', checkRoom);
// it('can get app info', getAppInfo); it('can get app info', getAppInfo);
// it('restore app', async function () { it('restore app', async function () {
// const backups = JSON.parse(execSync(`cloudron backup list --raw --app ${app.id}`)); const backups = JSON.parse(execSync(`cloudron backup list --raw --app ${app.id}`));
// await browser.get('about:blank'); await browser.get('about:blank');
// execSync(`cloudron uninstall --app ${app.id}`, EXEC_ARGS); execSync(`cloudron uninstall --app ${app.id}`, EXEC_ARGS);
// execSync(`cloudron install --location ${LOCATION}`, 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('can get Element app info', getElementAppInfo);
// it('is logged in', isLoggedIn); it('is logged in', isLoggedIn);
// it('check room', checkRoom); it('check room', checkRoom);
// it('can send message', sendMessage); it('can send message', sendMessage);
// it('can logout', logout); it('can logout', logout);
// it('can get app info', getAppInfo); it('can get app info', getAppInfo);
// it('move to different location', async function () { it('move to different location', async function () {
// browser.manage().deleteAllCookies(); browser.manage().deleteAllCookies();
// await browser.get('about:blank'); await browser.get('about:blank');
// execSync(`cloudron configure --location ${LOCATION}2`, EXEC_ARGS); execSync(`cloudron configure --location ${LOCATION}2`, EXEC_ARGS);
// getAppInfo(); getAppInfo();
// // wait when all services are up and running // wait when all services are up and running
// await sleep(15000); await sleep(15000);
// }); });
// it('update element-app config', updateSynapseConfig); it('update element-app config', updateSynapseConfig);
// it('can get Element app info', getElementAppInfo); it('can get Element app info', getElementAppInfo);
// it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD)); it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
// it('check room', checkRoom); it('check room', checkRoom);
// it('can send message', sendMessage); it('can send message', sendMessage);
// it('can logout', logout); it('can logout', logout);
// it('can get app info', getAppInfo); it('can get app info', getAppInfo);
// it('uninstall app', async function () { it('uninstall app', async function () {
// await browser.get('about:blank'); await browser.get('about:blank');
// execSync(`cloudron uninstall --app ${app.id}`, EXEC_ARGS); execSync(`cloudron uninstall --app ${app.id}`, EXEC_ARGS);
// }); });
// test update // test update
it('can install app for update', function () { execSync('cloudron install --appstore-id org.matrix.synapse --location ' + LOCATION, EXEC_ARGS); }); it('can install app for update', function () { execSync('cloudron install --appstore-id org.matrix.synapse --location ' + LOCATION, EXEC_ARGS); });