Compare commits

...

43 Commits

Author SHA1 Message Date
Package Updates
5f17b33dbc Update package version to 1.99.0 2024-11-13 17:35:41 +00:00
Renovate Bot
0a64acf236 chore(deps): update dependency element-hq/synapse to v1.119.0
| datasource      | package            | from    | to      |
| --------------- | ------------------ | ------- | ------- |
| github-releases | element-hq/synapse | 1.117.0 | 1.119.0 |
2024-11-13 16:17:44 +00:00
Girish Ramakrishnan
1b20ba1a1a Update renovate.json5 2024-11-04 17:09:48 +00:00
Girish Ramakrishnan
16414ae13c Add renovate.json5 2024-11-04 17:02:43 +00:00
Girish Ramakrishnan
55935f194f Delete renovate.json 2024-11-04 16:56:38 +00:00
Girish Ramakrishnan
7cbe157dbd Delete .gitlab-ci.yml 2024-11-04 08:37:39 +00:00
Girish Ramakrishnan
46f25d776d Version 1.98.1 2024-10-15 20:02:07 +02:00
Girish Ramakrishnan
1e9400ab2e Version 1.98.0 2024-10-15 20:01:29 +02:00
Renovate Bot
c8b81a87b3 chore(deps): update dependency matrix-org/synapse-s3-storage-provider to v1.5.0 2024-10-15 17:07:42 +00:00
Renovate Bot
337178cbe3 chore(deps): update dependency element-hq/synapse to v1.117.0 2024-10-15 16:21:57 +00:00
Girish Ramakrishnan
417ccb1b90 update tests 2024-10-15 18:21:42 +02:00
Girish Ramakrishnan
bd139e7e51 uninstall element 2024-10-15 18:00:47 +02:00
Girish Ramakrishnan
1fd50ed537 proceed with reset here 2024-10-15 17:33:46 +02:00
Girish Ramakrishnan
fbcbe82562 unsure when reset comes in 2024-10-15 17:20:17 +02:00
Girish Ramakrishnan
0796c63cfc have separate app objects 2024-10-15 17:11:36 +02:00
Girish Ramakrishnan
57a7c5a874 removed login by mistake 2024-10-15 17:00:04 +02:00
Girish Ramakrishnan
564422747a more test fixing 2024-10-15 16:56:23 +02:00
Girish Ramakrishnan
540e8b955a uninstall any previous element 2024-10-15 16:35:05 +02:00
Girish Ramakrishnan
d80249d454 Fix test 2024-10-15 16:31:20 +02:00
Renovate Bot
144d1169ec chore(deps): add renovate.json 2024-10-15 14:14:56 +00:00
Girish Ramakrishnan
f5ebcedfa3 Update renovate for s3 2024-10-15 14:13:43 +00:00
Girish Ramakrishnan
647e78afd2 Add renovate 2024-10-15 14:11:31 +00:00
Girish Ramakrishnan
b255387cde add files for ci 2024-10-15 16:09:15 +02:00
Johannes Zellner
7976cc122d Bump version 2024-10-02 17:46:05 +02:00
Johannes Zellner
a2709eebdb Update test deps 2024-10-02 17:14:42 +02:00
Johannes Zellner
3018681164 Update to 1.116.0 2024-10-02 17:14:29 +02:00
Girish Ramakrishnan
800e8f667e add element to tag list 2024-09-23 10:06:46 +02:00
Johannes Zellner
1363bab648 Bump version 2024-09-18 12:44:07 +02:00
Johannes Zellner
6099885ae5 Update test deps 2024-09-18 11:56:09 +02:00
Johannes Zellner
638ba056a0 Update to 1.115.0 2024-09-18 11:56:02 +02:00
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
Johannes Zellner
c3238ff948 Bump version 2024-08-14 09:14:39 +02:00
Johannes Zellner
b8e3320d41 Update test deps 2024-08-14 09:00:05 +02:00
Johannes Zellner
e8a420f8e0 Update to 1.113.0 2024-08-14 08:59:29 +02:00
Johannes Zellner
8857f033f5 Bump version 2024-07-31 13:28:56 +02:00
Johannes Zellner
15151c92e0 Update test deps 2024-07-31 10:51:22 +02:00
Johannes Zellner
0ec5205865 Update to 1.112.0 2024-07-31 10:51:16 +02:00
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
7 changed files with 256 additions and 147 deletions

View File

@@ -1259,3 +1259,60 @@
* Update Synapse to 1.111.0 * Update Synapse to 1.111.0
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.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)
[1.97.2]
* Update Synapse to 1.112.0
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.112.0)
[1.97.3]
* Update Synapse to 1.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)
[1.97.5]
* Update Synapse to 1.115.0
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.115.0)
[1.97.6]
* Update Synapse to 1.116.0
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.116.0)
[1.98.0]
* Update Synapse to 1.118.0
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.118.0)
[1.98.1]
* Update S3 Storage Provider to 1.5.0
[1.99.0]
* Update synapse to 1.119.0
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.118.0)
* Support [MSC4151](https://github.com/matrix-org/matrix-spec-proposals/pull/4151)'s stable report room API. ([#​17374](https://github.com/element-hq/synapse/issues/17374))
* Add experimental support for [MSC4222](https://github.com/matrix-org/matrix-spec-proposals/pull/4222) (Adding `state_after` to sync v2). ([#​17888](https://github.com/element-hq/synapse/issues/17888))
* Fix bug with sliding sync where `$LAZY`-loading room members would not return `required_state` membership in incremental syncs. ([#​17809](https://github.com/element-hq/synapse/issues/17809))
* Check if user has membership in a room before tagging it. Contributed by Lama Alosaimi. ([#​17839](https://github.com/element-hq/synapse/issues/17839))
* Fix a bug in the admin redact endpoint where the background task would not run if a worker was specified in
* Fix bug where some presence and typing timeouts can expire early. ([#​17850](https://github.com/element-hq/synapse/issues/17850))
* Fix detection when the built Rust library was outdated when using source installations. ([#​17861](https://github.com/element-hq/synapse/issues/17861))
* Fix a long-standing bug in Synapse which could cause one-time keys to be issued in the incorrect order, causing message decryption failures. ([#​17903](https://github.com/element-hq/synapse/pull/17903))
* Fix experimental support for [MSC4222](https://github.com/matrix-org/matrix-spec-proposals/pull/4222) (Adding `state_after` to sync v2) where we would return the full state on incremental syncs when using lazy loaded members and there were no new events in the timeline. ([#​17915](https://github.com/element-hq/synapse/pull/17915))
* Remove support for python 3.8. ([#​17908](https://github.com/element-hq/synapse/issues/17908))
* Add a test for downloading and thumbnailing a CMYK JPEG. ([#​17786](https://github.com/element-hq/synapse/issues/17786))
* Refactor database calls to remove `Generator` usage. ([#​17813](https://github.com/element-hq/synapse/issues/17813), [#​17814](https://github.com/element-hq/synapse/issues/17814), [#​17815](https://github.com/element-hq/synapse/issues/17815), [#​17816](https://github.com/element-hq/synapse/issues/17816), [#​17817](https://github.com/element-hq/synapse/issues/17817), [#​17818](https://github.com/element-hq/synapse/issues/17818), [#​17890](https://github.com/element-hq/synapse/issues/17890))
* Include the destination in the error of 'Destination mismatch' on federation requests. ([#​17830](https://github.com/element-hq/synapse/issues/17830))
* The nix flake inside the repository no longer tracks nixpkgs/master to not catch the latest bugs from a MR merged 5 minutes ago. ([#​17852](https://github.com/element-hq/synapse/issues/17852))
* Minor speed-up of sliding sync by computing extensions results in parallel. ([#​17884](https://github.com/element-hq/synapse/issues/17884))
* Bump the default Python version in the Synapse Dockerfile from 3.11 -> 3.12. ([#​17887](https://github.com/element-hq/synapse/issues/17887))
* Remove usage of internal header encoding API. ([#​17894](https://github.com/element-hq/synapse/issues/17894))
* Use unique name for each os.arch variant when uploading Wheel artifacts. ([#​17905](https://github.com/element-hq/synapse/issues/17905))
* Fix tests to run with latest Twisted. ([#​17906](https://github.com/element-hq/synapse/pull/17906), [#​17907](https://github.com/element-hq/synapse/pull/17907), [#​17911](https://github.com/element-hq/synapse/pull/17911))
* Update version constraint to allow the latest poetry-core 1.9.1. ([#​17902](https://github.com/element-hq/synapse/pull/17902))
* Update the portdb CI to use Python 3.13 and Postgres 17 as latest dependencies. ([#​17909](https://github.com/element-hq/synapse/pull/17909))
* Add an index to `current_state_delta_stream` table. ([#​17912](https://github.com/element-hq/synapse/issues/17912))
* Fix building and attaching release artifacts during the release process. ([#​17921](https://github.com/element-hq/synapse/issues/17921))

View File

@@ -5,24 +5,39 @@
"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.0", "version": "1.99.0",
"upstreamVersion": "1.111.0", "upstreamVersion": "1.119.0",
"healthCheckPath": "/", "healthCheckPath": "/",
"httpPort": 8008, "httpPort": 8008,
"memoryLimit": 536870912, "memoryLimit": 536870912,
"addons": { "addons": {
"localstorage": {}, "localstorage": {},
"oidc": { "loginRedirectUri": "/_synapse/client/oidc/callback" }, "oidc": {
"loginRedirectUri": "/_synapse/client/oidc/callback"
},
"postgresql": {}, "postgresql": {},
"sendmail": { "supportsDisplayName": true }, "sendmail": {
"turn": { "optional": true } "supportsDisplayName": true
},
"turn": {
"optional": true
}
}, },
"manifestVersion": 2, "manifestVersion": 2,
"website": "https://matrix.org", "website": "https://matrix.org",
"contactEmail": "support@cloudron.io", "contactEmail": "support@cloudron.io",
"icon": "file://logo.png", "icon": "file://logo.png",
"tags": [ "tags": [
"im", "collaboration", "voip", "videochat", "chat", "slack", "zulip", "federated" "im",
"collaboration",
"voip",
"videochat",
"chat",
"slack",
"zulip",
"federated",
"element",
"riot"
], ],
"mediaLinks": [ "mediaLinks": [
"https://screenshots.cloudron.io/org.matrix.synapse/1.png", "https://screenshots.cloudron.io/org.matrix.synapse/1.png",

View File

@@ -9,16 +9,17 @@ 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.111.0 # renovate: datasource=github-releases depName=element-hq/synapse versioning=semver extractVersion=^v(?<version>.+)$
ARG SYNAPSE_VERSION=1.119.0
# https://github.com/matrix-org/synapse-s3-storage-provider # renovate: datasource=github-releases depName=matrix-org/synapse-s3-storage-provider versioning=semver extractVersion=^v(?<version>.+)$
ARG STORAGE_PROVIDER_VERSION=1beb6af95e1f5caedb8e6e7e1cc176cdb2106d37 ARG S3PROVIDER_VERSION=1.5.0
# Synapse (https://github.com/matrix-org/synapse/blob/master/INSTALL.md) # Synapse (https://github.com/matrix-org/synapse/blob/master/INSTALL.md)
# lxml - required for previews # lxml - required for previews
RUN pip install --upgrade pip && \ RUN pip install --upgrade pip && \
pip install --upgrade setuptools && \ pip install --upgrade setuptools && \
pip install matrix-synapse==v${VERSION} psycopg2-binary python-ldap matrix-synapse-ldap3 lxml publicsuffix2 git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${STORAGE_PROVIDER_VERSION} matrix-synapse[oidc] pip install matrix-synapse==v${SYNAPSE_VERSION} psycopg2-binary python-ldap matrix-synapse-ldap3 lxml publicsuffix2 git+https://github.com/matrix-org/synapse-s3-storage-provider.git@v${S3PROVIDER_VERSION} matrix-synapse[oidc]
# Updated suffix list # Updated suffix list
RUN curl -L https://publicsuffix.org/list/public_suffix_list.dat -o /app/code/env/lib/python3.10/site-packages/publicsuffix2/public_suffix_list.dat RUN curl -L https://publicsuffix.org/list/public_suffix_list.dat -o /app/code/env/lib/python3.10/site-packages/publicsuffix2/public_suffix_list.dat

4
renovate.json5 Normal file
View File

@@ -0,0 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["local>devops/renovator//default.renovate.json5"]
}

102
test/package-lock.json generated
View File

@@ -9,12 +9,17 @@
"version": "1.0.0", "version": "1.0.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"chromedriver": "^126.0.4", "chromedriver": "^129.0.2",
"expect.js": "^0.3.1", "expect.js": "^0.3.1",
"mocha": "^10.6.0", "mocha": "^10.7.3",
"selenium-webdriver": "^4.22.0" "selenium-webdriver": "^4.25.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": { "node_modules/@testim/chrome-version": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz", "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
@@ -115,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"
} }
@@ -241,13 +246,13 @@
} }
}, },
"node_modules/chromedriver": { "node_modules/chromedriver": {
"version": "126.0.4", "version": "129.0.2",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-126.0.4.tgz", "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-129.0.2.tgz",
"integrity": "sha512-mIdJqdocfN/y9fl5BymIzM9WQLy64x078i5tS1jGFzbFAwXwXrj3zmA86Wf3R/hywPYpWqwXxFGBJHgqZTuGCA==", "integrity": "sha512-rUEFCJAmAwOdFfaDFtveT97fFeA7NOxlkgyPyN+G09Ws4qGW39aLDxMQBbS9cxQQHhTihqZZobgF5CLVYXnmGA==",
"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",
@@ -524,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",
@@ -919,9 +924,9 @@
} }
}, },
"node_modules/mocha": { "node_modules/mocha": {
"version": "10.6.0", "version": "10.7.3",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-10.6.0.tgz", "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
"integrity": "sha512-hxjt4+EEB0SA0ZDygSS015t65lJw/I2yRCS3Ae+SJ5FrbzrXgfYwJr96f0OvIXdj7h4lv/vLCrH3rkiuizFSvw==", "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
"dependencies": { "dependencies": {
"ansi-colors": "^4.1.3", "ansi-colors": "^4.1.3",
"browser-stdout": "^1.3.1", "browser-stdout": "^1.3.1",
@@ -1175,13 +1180,14 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
}, },
"node_modules/selenium-webdriver": { "node_modules/selenium-webdriver": {
"version": "4.22.0", "version": "4.25.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.22.0.tgz", "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.25.0.tgz",
"integrity": "sha512-GNbrkCHmy249ai885wgXqTfqL2lZnclUH/P8pwTDIqzyFxU3YhDiN7p/c9tMFA4NhgRdEBO2QCG+CWmG7xr/Mw==", "integrity": "sha512-zl9IX93caOT8wbcCpZzAkEtYa+hNgJ4C5GUN8uhpzggqRLvsg1asfKi0p1uNZC8buYVvsBZbx8S+9MjVAjs4oA==",
"dependencies": { "dependencies": {
"@bazel/runfiles": "^5.8.1",
"jszip": "^3.10.1", "jszip": "^3.10.1",
"tmp": "^0.2.3", "tmp": "^0.2.3",
"ws": ">=8.16.0" "ws": "^8.18.0"
}, },
"engines": { "engines": {
"node": ">= 14.21.0" "node": ">= 14.21.0"
@@ -1395,9 +1401,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
}, },
"node_modules/ws": { "node_modules/ws": {
"version": "8.16.0", "version": "8.18.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
"integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"
}, },
@@ -1483,6 +1489,11 @@
} }
}, },
"dependencies": { "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": { "@testim/chrome-version": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz", "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
@@ -1562,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"
} }
@@ -1652,12 +1663,12 @@
} }
}, },
"chromedriver": { "chromedriver": {
"version": "126.0.4", "version": "129.0.2",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-126.0.4.tgz", "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-129.0.2.tgz",
"integrity": "sha512-mIdJqdocfN/y9fl5BymIzM9WQLy64x078i5tS1jGFzbFAwXwXrj3zmA86Wf3R/hywPYpWqwXxFGBJHgqZTuGCA==", "integrity": "sha512-rUEFCJAmAwOdFfaDFtveT97fFeA7NOxlkgyPyN+G09Ws4qGW39aLDxMQBbS9cxQQHhTihqZZobgF5CLVYXnmGA==",
"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",
@@ -1845,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",
@@ -2124,9 +2135,9 @@
} }
}, },
"mocha": { "mocha": {
"version": "10.6.0", "version": "10.7.3",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-10.6.0.tgz", "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
"integrity": "sha512-hxjt4+EEB0SA0ZDygSS015t65lJw/I2yRCS3Ae+SJ5FrbzrXgfYwJr96f0OvIXdj7h4lv/vLCrH3rkiuizFSvw==", "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
"requires": { "requires": {
"ansi-colors": "^4.1.3", "ansi-colors": "^4.1.3",
"browser-stdout": "^1.3.1", "browser-stdout": "^1.3.1",
@@ -2327,13 +2338,14 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
}, },
"selenium-webdriver": { "selenium-webdriver": {
"version": "4.22.0", "version": "4.25.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.22.0.tgz", "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.25.0.tgz",
"integrity": "sha512-GNbrkCHmy249ai885wgXqTfqL2lZnclUH/P8pwTDIqzyFxU3YhDiN7p/c9tMFA4NhgRdEBO2QCG+CWmG7xr/Mw==", "integrity": "sha512-zl9IX93caOT8wbcCpZzAkEtYa+hNgJ4C5GUN8uhpzggqRLvsg1asfKi0p1uNZC8buYVvsBZbx8S+9MjVAjs4oA==",
"requires": { "requires": {
"@bazel/runfiles": "^5.8.1",
"jszip": "^3.10.1", "jszip": "^3.10.1",
"tmp": "^0.2.3", "tmp": "^0.2.3",
"ws": ">=8.16.0" "ws": "^8.18.0"
} }
}, },
"serialize-javascript": { "serialize-javascript": {
@@ -2491,9 +2503,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
}, },
"ws": { "ws": {
"version": "8.16.0", "version": "8.18.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
"integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"requires": {} "requires": {}
}, },
"y18n": { "y18n": {

View File

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

View File

@@ -1,11 +1,7 @@
#!/usr/bin/env node #!/usr/bin/env node
/* jshint esversion: 8 */ /* jshint esversion: 8 */
/* global it:false */ /* global it, xit, describe, before, after, afterEach */
/* global xit:false */
/* global describe:false */
/* global before:false */
/* global after:false */
'use strict'; 'use strict';
@@ -13,11 +9,11 @@ require('chromedriver');
const execSync = require('child_process').execSync, const execSync = require('child_process').execSync,
expect = require('expect.js'), expect = require('expect.js'),
fs = require('fs'),
path = require('path'), path = require('path'),
{ Builder, By, Key, until } = require('selenium-webdriver'), { Builder, By, Key, until } = require('selenium-webdriver'),
{ Options } = require('selenium-webdriver/chrome'); { Options } = require('selenium-webdriver/chrome');
if (!process.env.USERNAME || !process.env.PASSWORD) { if (!process.env.USERNAME || !process.env.PASSWORD) {
console.log('USERNAME and PASSWORD env vars need to be set'); console.log('USERNAME and PASSWORD env vars need to be set');
process.exit(1); process.exit(1);
@@ -27,7 +23,7 @@ describe('Application life cycle test', function () {
this.timeout(0); this.timeout(0);
const ELEMENT_LOCATION = 'element-test'; const ELEMENT_LOCATION = 'element-test';
const LOCATION = 'test'; const LOCATION = process.env.LOCATION || 'test';
const TEST_TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 10000; const TEST_TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 10000;
const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' }; const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
const USERNAME = process.env.USERNAME; const USERNAME = process.env.USERNAME;
@@ -36,22 +32,40 @@ describe('Application life cycle test', function () {
const ROOM_NAME = 'Test room ' + ROOM_ID; const ROOM_NAME = 'Test room ' + ROOM_ID;
const MSG_TEXT = 'Test message '; const MSG_TEXT = 'Test message ';
let browser, app; let browser, app, elementApp;
let athenticated_by_oidc = false;
before(function () { before(function () {
const options = new Options().windowSize({ width: 1280, height: 1024 }); const chromeOptions = new Options().windowSize({ width: 1280, height: 1024 });
if (process.env.HEADLESS) options.addArguments('headless'); 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');
browser = new Builder().forBrowser('chrome').setChromeOptions(options).build(); if (process.env.CI) execSync(`cloudron uninstall --app ${ELEMENT_LOCATION} || true`, EXEC_ARGS);
}); });
after(function () { after(function () {
browser.quit(); browser.quit();
}); });
function sleep(millis) { afterEach(async function () {
return new Promise(resolve => setTimeout(resolve, millis)); 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');
});
async function clearCache() {
await browser.manage().deleteAllCookies();
await browser.quit();
browser = null;
const chromeOptions = new Options().windowSize({ width: 1280, height: 1024 });
if (process.env.CI) chromeOptions.addArguments('no-sandbox', 'disable-dev-shm-usage', 'headless');
chromeOptions.addArguments(`--user-data-dir=${await fs.promises.mkdtemp('/tmp/test-')}`); // --profile-directory=Default
browser = new Builder().forBrowser('chrome').setChromeOptions(chromeOptions).build();
} }
async function waitForElement(elem) { async function waitForElement(elem) {
@@ -67,8 +81,8 @@ describe('Application life cycle test', function () {
function getElementAppInfo() { function getElementAppInfo() {
const inspect = JSON.parse(execSync('cloudron inspect')); const inspect = JSON.parse(execSync('cloudron inspect'));
app = inspect.apps.filter(function (a) { return a.location.indexOf(ELEMENT_LOCATION) === 0; })[0]; elementApp = inspect.apps.filter(function (a) { return a.location.indexOf(ELEMENT_LOCATION) === 0; })[0];
expect(app).to.be.an('object'); expect(elementApp).to.be.an('object');
} }
function getMessage() { function getMessage() {
@@ -80,7 +94,7 @@ describe('Application life cycle test', function () {
execSync(`cloudron exec --app ${ELEMENT_LOCATION} -- bash -c "jq '.default_server_config[\\"m.homeserver\\"].base_url = \\"https://${app.fqdn}\\"' /app/data/config.json | sponge /app/data/config.json"`); execSync(`cloudron exec --app ${ELEMENT_LOCATION} -- bash -c "jq '.default_server_config[\\"m.homeserver\\"].base_url = \\"https://${app.fqdn}\\"' /app/data/config.json | sponge /app/data/config.json"`);
execSync(`cloudron restart --app ${ELEMENT_LOCATION}`); execSync(`cloudron restart --app ${ELEMENT_LOCATION}`);
// wait when all services are up and running // wait when all services are up and running
await sleep(15000); await browser.sleep(15000);
} }
async function checkLandingPage() { async function checkLandingPage() {
@@ -89,7 +103,7 @@ describe('Application life cycle test', function () {
} }
async function registerUser() { async function registerUser() {
await browser.get(`https://${app.fqdn}/#/register`); await browser.get(`https://${elementApp.fqdn}/#/register`);
await waitForElement(By.xpath('//input[@label="Username"]')); await waitForElement(By.xpath('//input[@label="Username"]'));
await browser.findElement(By.xpath('//input[@label="Username"]')).sendKeys(USERNAME); await browser.findElement(By.xpath('//input[@label="Username"]')).sendKeys(USERNAME);
await browser.sleep(2000); await browser.sleep(2000);
@@ -106,50 +120,61 @@ describe('Application life cycle test', function () {
await waitForElement(By.xpath(`//h1[contains(., "Welcome")]`)); await waitForElement(By.xpath(`//h1[contains(., "Welcome")]`));
} }
async function loginOIDC(username, password) { async function loginOIDC(username, password, hasSession, proceedWithReset) {
browser.manage().deleteAllCookies(); browser.manage().deleteAllCookies();
await browser.get(`https://${app.fqdn}/#/login`); await browser.get(`https://${elementApp.fqdn}/#/login`);
await browser.sleep(6000); await browser.sleep(6000);
await waitForElement(By.xpath('//div[@role="button" and contains(., "Continue with Cloudron")]')); await waitForElement(By.xpath('//div[@role="button" and contains(., "Continue with Cloudron")]'));
await browser.findElement(By.xpath('//div[@role="button" and contains(., "Continue with Cloudron")]')).click(); await browser.findElement(By.xpath('//div[@role="button" and contains(., "Continue with Cloudron")]')).click();
await browser.sleep(2000); await browser.sleep(2000);
if (!athenticated_by_oidc) { if (!hasSession) {
await waitForElement(By.xpath('//input[@name="username"]')); await waitForElement(By.xpath('//input[@name="username"]'));
await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username); await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username);
await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password); await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password);
await browser.sleep(2000); await browser.sleep(2000);
await browser.findElement(By.id('loginSubmitButton')).click(); await browser.findElement(By.id('loginSubmitButton')).click();
await browser.sleep(2000); await browser.sleep(2000);
athenticated_by_oidc = true;
} }
await waitForElement(By.xpath('//p[@class="confirm-trust" and contains(., "Continuing will grant ")]')); await waitForElement(By.xpath('//p[@class="confirm-trust" and contains(., "Continuing will grant ")]'));
await browser.findElement(By.xpath('//a[contains(., "Continue")]')).click(); await browser.findElement(By.xpath('//a[contains(., "Continue")]')).click();
await browser.sleep(2000); await browser.sleep(2000);
//if (await browser.findElements(By.xpath('//div[@aria-label="Skip verification for now"]')).then(found => !!found.length)) { if (proceedWithReset) {
// await skipVerification(); await browser.findElement(By.xpath('//div[text()="Proceed with reset"]')).click();
//}
await waitForElement(By.xpath('//button[text()="Continue"]'));
await browser.findElement(By.xpath('//button[text()="Continue"]')).click();
await waitForElement(By.xpath('//div[text()="Copy"]'));
await browser.findElement(By.xpath('//div[text()="Copy"]')).click();
await browser.sleep(1000);
await waitForElement(By.xpath('//button[text()="Continue"]'));
await browser.findElement(By.xpath('//button[text()="Continue"]')).click();
await waitForElement(By.xpath('//button[text()="Done"]'));
await browser.findElement(By.xpath('//button[text()="Done"]')).click();
await waitForElement(By.xpath('//div[text()="Cancel"]'));
await browser.findElement(By.xpath('//div[text()="Cancel"]')).click();
}
await browser.sleep(3000); await browser.sleep(3000);
await waitForElement(By.xpath(`//h1[contains(., "Welcome")]`)); await waitForElement(By.xpath(`//h1[contains(., "Welcome")]`));
} }
async function login() { async function login() {
await browser.get('https://' + app.fqdn + '/#/login'); await browser.get(`https://${elementApp.fqdn}/#/login`);
await browser.wait(until.elementLocated(By.xpath('//input[@value="Sign in"]')), TEST_TIMEOUT); await browser.wait(until.elementLocated(By.xpath('//input[@value="Sign in"]')), TEST_TIMEOUT);
await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(USERNAME); await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(USERNAME);
await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(PASSWORD); await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(PASSWORD);
await browser.findElement(By.xpath('//input[@value="Sign in"]')).click(); await browser.findElement(By.xpath('//input[@value="Sign in"]')).click();
await browser.sleep(5000); await browser.sleep(5000);
await skipVerification();
if (await browser.findElements(By.xpath('//div[@aria-label="Skip verification for now"]')).then(found => !!found.length)) {
await skipVerification();
}
await browser.wait(until.elementLocated(By.xpath('//span[text()="Rooms"]')), TEST_TIMEOUT); await browser.wait(until.elementLocated(By.xpath('//span[text()="Rooms"]')), TEST_TIMEOUT);
} }
@@ -164,7 +189,7 @@ describe('Application life cycle test', function () {
} }
async function logout() { async function logout() {
await browser.get('https://' + app.fqdn + '/#/home'); await browser.get(`https://${elementApp.fqdn}/#/home`);
await browser.sleep(5000); await browser.sleep(5000);
await waitForElement(By.xpath('//div[@role="button" and @aria-label="User menu"]')); await waitForElement(By.xpath('//div[@role="button" and @aria-label="User menu"]'));
@@ -174,21 +199,21 @@ describe('Application life cycle test', function () {
await browser.findElement(By.xpath('//li[@role="menuitem" and @aria-label="Sign out"]')).click(); await browser.findElement(By.xpath('//li[@role="menuitem" and @aria-label="Sign out"]')).click();
await browser.sleep(2000); await browser.sleep(2000);
// if (await browser.findElements(By.xpath('//button[contains(text(), "I don\'t want my encrypted messages")]')).then(found => !!found.length)) { if (await browser.findElements(By.xpath('//button[contains(text(), "I don\'t want my encrypted messages")]')).then(found => !!found.length)) {
await browser.findElement(By.xpath('//button[contains(text(), "I don\'t want my encrypted messages")]')).click(); await browser.findElement(By.xpath('//button[contains(text(), "I don\'t want my encrypted messages")]')).click();
await browser.sleep(3000); await browser.sleep(3000);
// } }
await waitForElement(By.xpath('//h1[text()="Sign in"]')); await waitForElement(By.xpath('//h1[text()="Sign in"]'));
} }
async function isLoggedIn() { async function isLoggedIn() {
await browser.get('https://' + app.fqdn + '/#/home'); await browser.get(`https://${elementApp.fqdn}/#/home`);
await browser.wait(until.elementLocated(By.xpath('//span[text()="Rooms"]')), TEST_TIMEOUT); await browser.wait(until.elementLocated(By.xpath('//span[text()="Rooms"]')), TEST_TIMEOUT);
} }
async function createRoom() { async function createRoom() {
await browser.get('https://' + app.fqdn + '/#/home'); await browser.get(`https://${elementApp.fqdn}/#/home`);
await browser.sleep(4000); await browser.sleep(4000);
await waitForElement(By.xpath('//div[@role="button" and @aria-label="Add room"]')); await waitForElement(By.xpath('//div[@role="button" and @aria-label="Add room"]'));
await browser.findElement(By.xpath('//div[@role="button" and @aria-label="Add room"]')).click(); await browser.findElement(By.xpath('//div[@role="button" and @aria-label="Add room"]')).click();
@@ -208,7 +233,7 @@ describe('Application life cycle test', function () {
} }
async function checkRoom() { async function checkRoom() {
await browser.get('https://' + app.fqdn + '/#/home'); await browser.get(`https://${elementApp.fqdn}/#/home`);
await browser.sleep(4000); await browser.sleep(4000);
await waitForElement(By.xpath('//div[@role="treeitem" and @aria-label="' + ROOM_NAME + '"]')); await waitForElement(By.xpath('//div[@role="treeitem" and @aria-label="' + ROOM_NAME + '"]'));
await browser.findElement(By.xpath('//div[@role="treeitem" and @aria-label="' + ROOM_NAME + '"]')).click(); await browser.findElement(By.xpath('//div[@role="treeitem" and @aria-label="' + ROOM_NAME + '"]')).click();
@@ -228,68 +253,62 @@ 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); // from auto-login
// it('can logout', logout); it('can login', login);
it('check room', checkRoom);
it('can logout', logout);
// it('can login', login); it('uninstall element-web app', async function () {
// it('check room', checkRoom); await browser.get('about:blank');
// it('can logout', logout); execSync(`cloudron uninstall --app ${ELEMENT_LOCATION}`, EXEC_ARGS);
});
// it('can get app info', getAppInfo); 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 // 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('can get Element app info', getElementAppInfo);
it('update element-app config', updateSynapseConfig); it('update element-app config', updateSynapseConfig);
it('can get Element app info', getElementAppInfo); it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, false, false /* proceedWithReset */));
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('is logged in', isLoggedIn);
// it('is logged in', isLoggedIn); it('check room', checkRoom);
// it('check room', checkRoom);
// 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('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);
@@ -302,48 +321,49 @@ describe('Application life cycle test', function () {
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 await browser.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, true, true /* proceedWithReset */));
it('check room', checkRoom); it('check room', checkRoom);
it('can send message', sendMessage); it('can send message', sendMessage);
it('can logout', logout);
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);
}); });
it('uninstall element-web app', function () {
execSync(`cloudron uninstall --app ${ELEMENT_LOCATION}`, EXEC_ARGS);
});
// test update // test update
it('clear cache', clearCache);
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); });
it('can get app info', getAppInfo); it('can get app info', getAppInfo);
it('update element-app config', updateSynapseConfig);
it('can install element-web app (update)', function () { execSync('cloudron install --appstore-id im.riot.cloudronapp --location ' + ELEMENT_LOCATION, EXEC_ARGS); });
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('update element-app config', updateSynapseConfig);
it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, false, false /* proceedWithReset */));
it('is logged in', isLoggedIn); it('is logged in', isLoggedIn);
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 get app info', getAppInfo);
it('can update', async function () { it('can update', async function () {
await browser.get('about:blank'); await browser.get('about:blank');
execSync(`cloudron update --app ${app.id}`, EXEC_ARGS); execSync(`cloudron update --app ${app.id}`, EXEC_ARGS);
// wait when all services are up and running await browser.sleep(15000);
await sleep(15000);
}); });
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, true, true /* proceedWithReset */));
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);