Version 1.22.4

CHANGELOG

@@ -657,3 +657,164 @@
 * Accept multiple SSH keys in single LDAP SSHPublicKey attribute (#13989) (#14607)
 * Fix bug about ListOptions and stars/watchers pagnation (#14556) (#14573)
 * Fix GPG key deletion during account deletion (#14561) (#14569)
+
+[1.20.2]
+* Update Gitea to 1.13.4
+* Fix issue popups (#14898) (#14899)
+* Fix race in LFS ContentStore.Put(...) (#14895) (#14913)
+* Fix a couple of issues with a feeds (#14897) (#14903)
+* When transfering repository and database transaction failed, rollback the renames (#14864) (#14902)
+* Fix race in local storage (#14888) (#14901)
+* Fix 500 on pull view page if user is not loged in (#14885) (#14886)
+
+[1.20.3]
+* Update Gitea to 1.13.5
+* Update to goldmark 1.3.3 (#15059) (#15061)
+* Another clusterfuzz spotted issue (#15032) (#15034)
+* Fix set milestone on PR creation (#14981) (#15001)
+* Prevent panic when editing forked repos by API (#14960) (#14963)
+* Fix bug when upload on web (#15042) (#15055)
+* Delete Labels & IssueLabels on Repo Delete too (#15039) (#15051)
+* Fix postgres ID sequences broken by recreate-table (#15015) (#15029)
+* Fix several render issues (#14986) (#15013)
+* Make sure sibling images get a link too (#14979) (#14995)
+* Fix Anchor jumping with escaped query components (#14969) (#14977)
+* Fix release mail html template (#14976)
+* Fix excluding more than two labels on issues list (#14962) (#14973)
+* Don't mark each comment poster as OP (#14971) (#14972)
+* Add "captcha" to list of reserved usernames (#14930)
+* Re-enable import local paths after reversion from #13610 (#14925) (#14927)
+
+[1.20.4]
+* Update Gitea to 1.13.6
+* Fix bug on avatar middleware (#15124) (#15125)
+* Fix another clusterfuzz identified issue (#15096) (#15114)
+* Fix nil exeption for get pull reviews API #15104 (#15106)
+* Fix markdown rendering in milestone content (#15056) (#15092)
+
+[1.20.5]
+* Update Gitea to 1.13.7
+* Update to bluemonday-1.0.6 (#15294) (#15298)
+* Clusterfuzz found another way (#15160) (#15169)
+* Fix wrong user returned in API (#15139) (#15150)
+* Add 'fonts' into 'KnownPublicEntries' (#15188) (#15317)
+* Speed up enry.IsVendor (#15213) (#15246)
+* Response 404 for diff/patch of a commit that not exist (#15221) (#15238)
+* Prevent NPE in CommentMustAsDiff if no hunk header (#15199) (#15201)
+* Add size to Save function (#15264) (#15271)
+
+[1.21.0]
+* Update Gitea to 1.14.0
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.0)
+
+[1.21.1]
+* Update Gitea to 1.14.1
+* Fix bug clone wiki (#15499) (#15502)
+* Github Migration ignore rate limit, if not enabled (#15490) (#15495)
+* Use subdir for URL (#15446) (#15493)
+* Query the DB for the hash before inserting in to email_hash (#15457) (#15491)
+* Ensure review dismissal only dismisses the correct review (#15477) (#15489)
+* Use index of the supported tags to choose user lang (#15452) (#15488)
+* Fix wrong file link in code search page (#15466) (#15486)
+* Quick template fix for built-in SSH server in admin config (#15464) (#15481)
+* Prevent superfluous response.WriteHeader (#15456) (#15476)
+* Fix ambiguous argument error on tags (#15432) (#15474)
+* Add created_unix instead of expiry to migration (#15458) (#15463)
+* Fix repository search (#15428) (#15442)
+* Prevent NPE on avatar direct rendering if federated avatars disabled (#15434) (#15439)
+* Fix wiki clone urls (#15430) (#15431)
+* Fix dingtalk icon url at webhook (#15417) (#15426)
+* Standardise icon on projects PR page (#15387) (#15408)
+* Add option to skip LFS/attachment files for dump (#15407) (#15492)
+* Clone panel fixes (#15436)
+* Use semantic dropdown for code search query type (#15276) (#15364)
+
+[1.21.2]
+* Update Gitea to 1.14.2
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.2)
+* Display conflict-free merge messages for pull requests (#15773) (#15796)
+* Exponential Backoff for ByteFIFO (#15724) (#15793)
+* Issue list alignment tweaks (#15483) (#15766)
+* Implement delete release attachments and update release attachments' name (#14130) (#15666)
+* Add placeholder text to deploy key textarea (#15575) (#15576)
+* Project board improvements (#15429) (#15560)
+* Repo branch page: label size, PR ref, new PR button alignment (#15363) (#15365)
+
+[1.21.3]
+* Update Gitea to 1.14.3
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.3)
+* Encrypt migration credentials at rest (#15895) (#16187)
+* Only check access tokens if they are likely to be tokens (#16164) (#16171)
+* Add missing SameSite settings for the i_like_gitea cookie (#16037) (#16039)
+* Fix setting of SameSite on cookies (#15989) (#15991)
+
+[1.21.4]
+* Update Gitea to 1.14.4
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.4)
+* Fix relative links in postprocessed images (#16334) (#16340)
+* Fix list_options GetStartEnd (#16303) (#16305)
+* Fix API to use author for commits instead of committer (#16276) (#16277)
+* Handle misencoding of login_source cfg in mssql (#16268) (#16275)
+* Fixed issues not updated by commits (#16254) (#16261)
+* Improve efficiency in FindRenderizableReferenceNumeric and getReference (#16251) (#16255)
+* Use html.Parse rather than html.ParseFragment (#16223) (#16225)
+* Fix milestone counters on new issue (#16183) (#16224)
+* reqOrgMembership calls need to be preceded by reqToken (#16198) (#16219)
+
+[1.21.5]
+* Update Gitea to 1.14.5
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.5)
+* Hide mirror passwords on repo settings page (#16022) (#16355)
+* Update bluemonday to v1.0.15 (#16379) (#16380)
+* Retry rename on lock induced failures (#16435) (#16439)
+* Validate issue index before querying DB (#16406) (#16410)
+* Fix crash following ldap authentication update (#16447) (#16449)
+* Redirect on bad CSRF instead of presenting bad page (#14937) (#16378)
+
+[1.21.6]
+* Update Gitea to 1.14.6
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.6)
+* SECURITY
+  * Bump github.com/markbates/goth from v1.67.1 to v1.68.0 (#16538) (#16540)
+  * Switch to maintained JWT lib (#16532) (#16535)
+  * Upgrade to latest version of golang-jwt (as forked for 1.14) (#16590) (#16607)
+
+[1.22.0]
+* Update Gitea to 1.15.0
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.15.0)
+
+[1.22.1]
+* Update Gitea to 1.15.1
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.15.1)
+
+[1.22.2]
+* Update Gitea to 1.15.2
+* Add unique constraint back into issue_index (#16938)
+* Close storage objects before cleaning (#16934) (#16942)
+
+[1.22.3]
+* Update Gitea to 1.15.3
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.15.3)
+* Add fluid to ui container class to remove margin (#16396) (#16976)
+* Add caller to cat-file batch calls (#17082) (#17089)
+* Many bug fixes
+
+[1.22.4]
+* Update Gitea to 1.15.4
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.15.4)
+* Raw file API: don't try to interpret 40char filenames as commit SHA (#17185) (#17272)
+* Don't allow merged PRs to be reopened (#17192) (#17271)
+* Fix incorrect repository count on organization tab of dashboard (#17256) (#17266)
+* Fix unwanted team review request deletion (#17257) (#17264)
+* Fix broken Activities link in team dashboard (#17255) (#17258)
+* API pull's head/base have correct permission(#17214) (#17245)
+* Fix stange behavior of DownloadPullDiffOrPatch in incorect index (#17223) (#17227)
+* Upgrade xorm to v1.2.5 (#17177) (#17188)
+* Fix missing repo link in issue/pull assigned emails (#17183) (#17184)
+* Fix bug of get context user (#17169) (#17172)
+* Nicely handle missing user in collaborations (#17049) (#17166)
+* Add Horizontal scrollbar to inner menu on Chrome (#17086) (#17164)
+* Fix wrong i18n keys (#17150) (#17153)
+* Fix Archive Creation: correct transaction ending (#17151)
+* Prevent panic in Org mode HighlightCodeBlock (#17140) (#17141)
+* Create doctor command to fix repo_units broken by dumps from 1.14.3-1.14.6 (#17136) (#17137)

CloudronManifest.json

@@ -4,8 +4,8 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.20.1",
+  "version": "1.22.4",
-  "healthCheckPath": "/healthcheck",
+  "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
   "addons": {

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.13.3</upstream>
+This app packages Gitea <upstream>1.15.4</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.
 

Dockerfile

@@ -15,7 +15,7 @@ RUN passwd -d git
 RUN mkdir -p /home/git/gitea
 WORKDIR /home/git
 
-ARG VERSION=1.13.3
+ARG VERSION=1.15.4
 
 RUN curl -L https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
     && chmod +x /home/git/gitea/gitea

start.sh

@@ -26,7 +26,7 @@ setup_ldap_source() {
 setup_root_user() {
     set -eu
 
-    if sudo -H -u git /home/git/gitea/gitea admin create-user --name root --password changeme --email test@cloudron.io --admin -c /run/gitea/app.ini; then
+    if sudo -H -u git /home/git/gitea/gitea admin user create --name root --password changeme --email test@cloudron.io --admin -c /run/gitea/app.ini; then
         echo "==> root user added"
     else
         echo "==> Failed to add root user"
@@ -38,7 +38,7 @@ setup_auth() {
     set -eu
 
     # Wait for gitea to finish db setup, before we do any db operations
-    while ! curl --fail http://localhost:3000/healthcheck; do
+    while ! curl --fail http://localhost:3000/explore; do
         echo "==> Waiting for gitea to come up"
         sleep 1
     done

test/package-lock.json

@@ -5,25 +5,25 @@
   "requires": true,
   "dependencies": {
     "@nodelib/fs.scandir": {
-      "version": "2.1.4",
+      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "requires": {
-        "@nodelib/fs.stat": "2.0.4",
+        "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
       }
     },
     "@nodelib/fs.stat": {
-      "version": "2.0.4",
+      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.6",
+      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "requires": {
-        "@nodelib/fs.scandir": "2.1.4",
+        "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
       }
     },
@@ -33,15 +33,15 @@
       "integrity": "sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw=="
     },
     "@types/node": {
-      "version": "14.14.22",
+      "version": "16.10.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz",
-      "integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==",
+      "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==",
       "optional": true
     },
     "@types/yauzl": {
-      "version": "2.9.1",
+      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
-      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
       "optional": true,
       "requires": {
         "@types/node": "*"
@@ -75,9 +75,9 @@
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
     },
     "ansi-regex": {
-      "version": "3.0.0",
+      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
       "version": "4.3.0",
@@ -88,9 +88,9 @@
       }
     },
     "anymatch": {
-      "version": "3.1.1",
+      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -112,11 +112,11 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "axios": {
-      "version": "0.21.1",
+      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "requires": {
-        "follow-redirects": "^1.10.0"
+        "follow-redirects": "^1.14.0"
       }
     },
     "balanced-match": {
@@ -162,9 +162,9 @@
       "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
     },
     "chalk": {
-      "version": "4.1.0",
+      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "requires": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -181,31 +181,30 @@
       }
     },
     "chokidar": {
-      "version": "3.5.1",
+      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
       "requires": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "fsevents": "~2.3.1",
+        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.0",
+        "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
+        "readdirp": "~3.6.0"
       }
     },
     "chromedriver": {
-      "version": "88.0.0",
+      "version": "94.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-88.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-94.0.0.tgz",
-      "integrity": "sha512-EE8rXh7mikxk3VWKjUsz0KCUX8d3HkQ4HgMNJhWrWjzju12dKPPVHO9MY+YaAI5ryXrXGNf0Y4HcNKgW36P/CA==",
+      "integrity": "sha512-x4hK7R7iOyAhdLHJEcOyGBW/oa2kno6AqpHVLd+n3G7c2Vk9XcAXMz84XhNItqykJvTc6E3z/JRIT1eHYH//Eg==",
       "requires": {
         "@testim/chrome-version": "^1.0.7",
-        "axios": "^0.21.1",
+        "axios": "^0.21.2",
         "del": "^6.0.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.0",
-        "mkdirp": "^1.0.4",
         "proxy-from-env": "^1.1.0",
         "tcp-port-used": "^1.0.1"
       }
@@ -223,36 +222,6 @@
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
         "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
       }
     },
     "color-convert": {
@@ -297,9 +266,9 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "debug": {
-      "version": "4.3.1",
+      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -310,9 +279,9 @@
       "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="
     },
     "deep-is": {
-      "version": "0.1.3",
+      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "define-properties": {
       "version": "1.1.3",
@@ -422,16 +391,15 @@
       }
     },
     "fast-glob": {
-      "version": "3.2.5",
+      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
+        "micromatch": "^4.0.4"
-        "picomatch": "^2.2.1"
       }
     },
     "fast-safe-stringify": {
@@ -440,9 +408,9 @@
       "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="
     },
     "fastq": {
-      "version": "1.10.1",
+      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA==",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "requires": {
         "reusify": "^1.0.4"
       }
@@ -478,9 +446,9 @@
       "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="
     },
     "follow-redirects": {
-      "version": "1.13.2",
+      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
-      "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="
+      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
     },
     "form-data": {
       "version": "3.0.0",
@@ -540,17 +508,17 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
+      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "requires": {
         "is-glob": "^4.0.1"
       }
     },
     "globby": {
-      "version": "11.0.2",
+      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==",
+      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -561,9 +529,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.4",
+      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
     },
     "growl": {
       "version": "1.10.5",
@@ -660,14 +628,14 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "is-fullwidth-code-point": {
-      "version": "2.0.0",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
     "is-glob": {
-      "version": "4.0.1",
+      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -683,9 +651,9 @@
       "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
     },
     "is-path-inside": {
-      "version": "3.0.2",
+      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg=="
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
     },
     "is-plain-obj": {
       "version": "2.1.0",
@@ -708,15 +676,20 @@
         "has-symbols": "^1.0.0"
       }
     },
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="
+    },
     "is-url": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
     },
     "is2": {
-      "version": "2.0.6",
+      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.7.tgz",
-      "integrity": "sha512-+Z62OHOjA6k2sUDOKXoZI3EXv7Fb1K52jpTBLbkfx62bcUeSsrTBLhEquCRDKTx0XE5XbHcG/S2vrtE3lnEDsQ==",
+      "integrity": "sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA==",
       "requires": {
         "deep-is": "^0.1.3",
         "ip-regex": "^4.1.0",
@@ -729,9 +702,9 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "js-yaml": {
-      "version": "4.0.0",
+      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "requires": {
         "argparse": "^2.0.1"
       }
@@ -793,11 +766,12 @@
       }
     },
     "log-symbols": {
-      "version": "4.0.0",
+      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "requires": {
-        "chalk": "^4.0.0"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       }
     },
     "merge2": {
@@ -811,12 +785,12 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromatch": {
-      "version": "4.0.2",
+      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "requires": {
         "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "picomatch": "^2.2.3"
       }
     },
     "mime": {
@@ -845,47 +819,41 @@
         "brace-expansion": "^1.1.7"
       }
     },
-    "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-    },
     "mocha": {
-      "version": "8.3.0",
+      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.2.tgz",
-      "integrity": "sha512-TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q==",
+      "integrity": "sha512-ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w==",
       "requires": {
         "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "chokidar": "3.5.1",
+        "chokidar": "3.5.2",
-        "debug": "4.3.1",
+        "debug": "4.3.2",
         "diff": "5.0.0",
         "escape-string-regexp": "4.0.0",
         "find-up": "5.0.0",
-        "glob": "7.1.6",
+        "glob": "7.1.7",
         "growl": "1.10.5",
         "he": "1.2.0",
-        "js-yaml": "4.0.0",
+        "js-yaml": "4.1.0",
-        "log-symbols": "4.0.0",
+        "log-symbols": "4.1.0",
         "minimatch": "3.0.4",
         "ms": "2.1.3",
-        "nanoid": "3.1.20",
+        "nanoid": "3.1.25",
-        "serialize-javascript": "5.0.1",
+        "serialize-javascript": "6.0.0",
         "strip-json-comments": "3.1.1",
         "supports-color": "8.1.1",
         "which": "2.0.2",
-        "wide-align": "1.1.3",
+        "workerpool": "6.1.5",
-        "workerpool": "6.1.0",
         "yargs": "16.2.0",
         "yargs-parser": "20.2.4",
         "yargs-unparser": "2.0.0"
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.6",
+          "version": "7.1.7",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -908,9 +876,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "nanoid": {
-      "version": "3.1.20",
+      "version": "3.1.25",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="
+      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="
     },
     "normalize-path": {
       "version": "3.0.0",
@@ -999,9 +967,9 @@
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
     },
     "picomatch": {
-      "version": "2.2.2",
+      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
     },
     "process-nextick-args": {
       "version": "2.0.0",
@@ -1027,6 +995,11 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
       "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
     },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -1046,9 +1019,9 @@
       }
     },
     "readdirp": {
-      "version": "3.5.0",
+      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "requires": {
         "picomatch": "^2.2.1"
       }
@@ -1072,9 +1045,12 @@
       }
     },
     "run-parallel": {
-      "version": "1.1.10",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
     },
     "safe-buffer": {
       "version": "5.1.2",
@@ -1113,9 +1089,9 @@
       "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
     },
     "serialize-javascript": {
-      "version": "5.0.1",
+      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
       "requires": {
         "randombytes": "^2.1.0"
       }
@@ -1131,12 +1107,13 @@
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
     "string-width": {
-      "version": "2.1.1",
+      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
+        "emoji-regex": "^8.0.0",
-        "strip-ansi": "^4.0.0"
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       }
     },
     "string.prototype.trimleft": {
@@ -1173,11 +1150,11 @@
       }
     },
     "strip-ansi": {
-      "version": "4.0.0",
+      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "requires": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-json-comments": {
@@ -1233,6 +1210,16 @@
       "requires": {
         "debug": "4.3.1",
         "is2": "^2.0.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        }
       }
     },
     "tmp": {
@@ -1273,18 +1260,10 @@
         "isexe": "^2.0.0"
       }
     },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "requires": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
     "workerpool": {
-      "version": "6.1.0",
+      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
-      "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="
+      "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw=="
     },
     "wrap-ansi": {
       "version": "7.0.0",
@@ -1294,36 +1273,6 @@
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
       }
     },
     "wrappy": {
@@ -1347,9 +1296,9 @@
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
     },
     "y18n": {
-      "version": "5.0.5",
+      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
     "yargs": {
       "version": "16.2.0",
@@ -1363,36 +1312,6 @@
         "string-width": "^4.2.0",
         "y18n": "^5.0.5",
         "yargs-parser": "^20.2.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
       }
     },
     "yargs-parser": {

test/package.json

@@ -9,9 +9,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^88.0.0",
+    "chromedriver": "^94.0.0",
     "expect.js": "^0.3.1",
-    "mocha": "^8.3.0",
+    "mocha": "^9.1.2",
     "rimraf": "^3.0.2",
     "selenium-webdriver": "^3.6.0",
     "superagent": "^6.1.0"

test/test.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-/* jslint node:true */
+/* jshint esversion: 8 */
 /* global it:false */
 /* global xit:false */
 /* global describe:false */
@@ -54,247 +54,130 @@ describe('Application life cycle test', function () {
 
     function getAppInfo() {
         var inspect = JSON.parse(execSync('cloudron inspect'));
-
+        app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
-        app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
-
         expect(app).to.be.an('object');
     }
 
-    function setAvatarOld(done) {
+    function sleep(millis) {
-        browser.get('https://' + app.fqdn + '/user/settings/avatar').then(function () {
+        return new Promise(resolve => setTimeout(resolve, millis));
-            return browser.findElement(By.xpath('//input[@type="file" and @name="avatar"]')).sendKeys(path.resolve(__dirname, '../logo.png'));
-        }).then(function () {
-            return browser.findElement(By.xpath('//button[contains(text(), "Update Avatar Setting")]')).click();
-        }).then(function () {
-            if (app.manifest.version === '1.0.3') {
-                return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"updated successfully")]')), TIMEOUT);
-            } else {
-                return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"Your avatar setting has been updated.")]')), TIMEOUT);
-            }
-        }).then(function () {
-            done();
-        });
     }
 
-    function setAvatar(done) {
+    async function setAvatar() {
-        if (app.manifest.version === '1.5.4') return setAvatarOld(done);
+        await browser.get('https://' + app.fqdn + '/user/settings');
 
-        browser.get('https://' + app.fqdn + '/user/settings').then(function () {
+        var button = await browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]'));
-            var button = browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]'));
+        await browser.executeScript('arguments[0].scrollIntoView(false)', button);
-            return browser.executeScript('arguments[0].scrollIntoView(false)', button);
+        await browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]')).click();
-        }).then(function () {
+        await browser.findElement(By.xpath('//input[@type="file" and @name="avatar"]')).sendKeys(path.resolve(__dirname, '../logo.png'));
-            return browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]')).click();
+        await browser.findElement(By.xpath('//button[contains(text(), "Update Avatar")]')).click();
-        }).then(function () {
+        await browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"Your avatar has been updated.")]')), TIMEOUT);
-            return browser.findElement(By.xpath('//input[@type="file" and @name="avatar"]')).sendKeys(path.resolve(__dirname, '../logo.png'));
-        }).then(function () {
-            return browser.findElement(By.xpath('//button[contains(text(), "Update Avatar")]')).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"Your avatar has been updated.")]')), TIMEOUT);
-        }).then(function () {
-            done();
-        });
     }
 
-    function checkAvatar(done) {
+    async function checkAvatar() {
-return done();
+        await browser.get(`https://${app.fqdn}/${username}`);
-        superagent.get('https://' + app.fqdn + '/avatars/a3e6f3316fc1738e29d621e6a26e93d3').end(function (error, result) {
+
-            expect(error).to.be(null);
+        var avatarSrc = await browser.findElement(By.xpath('//a[@id="profile-avatar"]/img')).getAttribute('src');
-            expect(result.statusCode).to.be(200);
+
-            done();
+        var avatar = await superagent.get(avatarSrc);
-        });
+        expect(avatar.statusCode).to.equal(200);
     }
 
-    function login(username, password, done) {
+    async function login(username, password) {
-        browser.get('https://' + app.fqdn + '/user/login').then(function () {
+        await browser.get('https://' + app.fqdn + '/user/login');
-            return browser.findElement(By.id('user_name')).sendKeys(username);
+
-        }).then(function () {
+        await browser.findElement(By.id('user_name')).sendKeys(username);
-            return browser.findElement(By.id('password')).sendKeys(password);
+        await browser.findElement(By.id('password')).sendKeys(password);
-        }).then(function () {
+        await browser.findElement(By.tagName('form')).submit();
-            return browser.findElement(By.tagName('form')).submit();
+        await browser.wait(until.elementLocated(By.linkText('Dashboard')), TIMEOUT);
-        }).then(function () {
-            return browser.wait(until.elementLocated(By.linkText('Dashboard')), TIMEOUT);
-        }).then(function () {
-            done();
-        });
     }
 
-    function adminLogin(done) {
+    async function adminLogin() {
-        login('root', 'changeme', done);
+        await login('root', 'changeme');
     }
 
-    function logout(done) {
+    async function logout() {
-        browser.get('https://' + app.fqdn).then(function () {
+        await browser.get('https://' + app.fqdn);
-            return browser.findElement(By.xpath('//img[contains(@class, "avatar")]')).click();
+
-        }).then(function () {
+        await browser.findElement(By.xpath('//img[contains(@class, "avatar")]')).click();
-            browser.sleep(2000);
+        await sleep(2000);
-        }).then(function () {
+        await browser.findElement(By.xpath('//a[@data-url="/user/logout"]')).click();
-            return browser.findElement(By.xpath('//a[@data-url="/user/logout"]')).click();
+        await sleep(2000);
-        }).then(function () {
-            browser.sleep(2000);
-        }).then(function () {
-            done();
-        });
     }
 
-    function addPublicKey(done) {
+    async function addPublicKey() {
         var publicKey = fs.readFileSync(__dirname + '/id_rsa.pub', 'utf8');
 
         const sshPage = 'https://' + app.fqdn + '/user/settings/keys';
 
-        browser.get(sshPage).then(function () {
+        await browser.get(sshPage);
-            return browser.findElement(By.xpath('//div[text()="Add Key"]')).click();
+
-        }).then(function () {
+        await browser.findElement(By.xpath('//div[text()="Add Key"]')).click();
-            return browser.findElement(By.id('ssh-key-title')).sendKeys('testkey');
+        await browser.findElement(By.id('ssh-key-title')).sendKeys('testkey');
-        }).then(function () {
+        await browser.findElement(By.id('ssh-key-content')).sendKeys(publicKey.trim()); // #3480
-            return browser.findElement(By.id('ssh-key-content')).sendKeys(publicKey.trim()); // #3480
-        }).then(function () {
         var button = browser.findElement(By.xpath('//button[contains(text(), "Add Key")]'));
-            return browser.executeScript('arguments[0].scrollIntoView(false)', button);
+        await browser.executeScript('arguments[0].scrollIntoView(false)', button);
-        }).then(function () {
+        await browser.findElement(By.xpath('//button[contains(text(), "Add Key")]')).click();
-            return browser.findElement(By.xpath('//button[contains(text(), "Add Key")]')).click();
+
-        }).then(function () {
+        await browser.wait(until.elementLocated(By.xpath('//p[contains(text(), "has been added.")]')), TIMEOUT);
-            if (app.manifest.version === '1.0.3') {
-                return browser.wait(until.elementLocated(By.xpath('//p[contains(text(), "added successfully!")]')), TIMEOUT);
-            } else {
-                return browser.wait(until.elementLocated(By.xpath('//p[contains(text(), "has been added.")]')), TIMEOUT);
-            }
-        }).then(function () {
-            done();
-        });
     }
 
-    function createRepo(done) {
+    async function createRepo() {
-        var getRepoPage;
+        var getRepoPage = await browser.get('https://' + app.fqdn + '/repo/create');
-        if (app.manifest.version === '1.0.3') {
-            getRepoPage = browser.get('https://' + app.fqdn).then(function () {
-                return browser.findElement(By.linkText('New Repository')).click();
-            }).then(function () {
-                return browser.wait(until.elementLocated(By.xpath('//*[contains(text(), "New Repository")]')), TIMEOUT);
-            });
-        } else {
-            getRepoPage = browser.get('https://' + app.fqdn + '/repo/create');
-        }
 
-        getRepoPage.then(function () {
+        await browser.findElement(By.id('repo_name')).sendKeys(reponame);
-            return browser.findElement(By.id('repo_name')).sendKeys(reponame);
-        }).then(function () {
         var button = browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]'));
-            return browser.executeScript('arguments[0].scrollIntoView(true)', button);
+        await browser.executeScript('arguments[0].scrollIntoView(true)', button);
-        }).then(function () {
+        await browser.findElement(By.id('auto-init')).click();
-            return browser.findElement(By.id('auto-init')).click();
+        await browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]')).click();
-        }).then(function () {
+
-            return browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]')).click();
+        await browser.wait(function () {
-        }).then(function () {
-            browser.wait(function () {
             return browser.getCurrentUrl().then(function (url) {
                 return url === 'https://' + app.fqdn + '/' + username + '/' + reponame;
             });
         }, TIMEOUT);
-        }).then(function () {
-            done();
-        });
     }
 
-    function checkCloneUrl(done) {
+    async function checkCloneUrl() {
-        browser.get('https://' + app.fqdn + '/' + username + '/' + reponame).then(function () {
+        await browser.get('https://' + app.fqdn + '/' + username + '/' + reponame);
-            return browser.findElement(By.id('repo-clone-ssh')).click();
+        await browser.findElement(By.id('repo-clone-ssh')).click();
-        }).then(function () {
+
-            return browser.findElement(By.id('repo-clone-url')).getAttribute('value');
+        var cloneUrl = await browser.findElement(By.id('repo-clone-url')).getAttribute('value');
-        }).then(function (cloneUrl) {
         expect(cloneUrl).to.be(`ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame}.git`);
-            done();
-        });
     }
 
-    function cloneRepo(done) {
+    function cloneRepo() {
         rimraf.sync(repodir);
         var env = Object.create(process.env);
         env.GIT_SSH = __dirname + '/git_ssh_wrapper.sh';
         execSync(`git clone ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame}.git ${repodir}`, { env: env });
-        done();
     }
 
-    function pushFile(done) {
+    function pushFile() {
         var env = Object.create(process.env);
         env.GIT_SSH = __dirname + '/git_ssh_wrapper.sh';
         execSync(`touch newfile && git add newfile && git commit -a -mx && git push ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame} master`,
                  { env: env, cwd: repodir });
         rimraf.sync('/tmp/testrepo');
-        done();
-    }
-
-    function addCustomFile(done) {
-        fs.writeFileSync('/tmp/customfile.txt', 'GOGS TEST', 'utf8');
-        execSync(`cloudron exec --app ${app.id} -- mkdir -p /app/data/custom/public`);
-        execSync(`cloudron push --app ${app.id} /tmp/customfile.txt /app/data/custom/public/customfile.txt`);
-        fs.unlinkSync('/tmp/customfile.txt');
-        done();
-    }
-
-    function checkCustomFile(done) {
-        superagent.get('https://' + app.fqdn + '/customfile.txt').end(function (error, result) {
-            if (error) return done(error);
-
-            expect(result.text).to.contain('GOGS TEST');
-            done();
-        });
     }
 
     function fileExists() {
         expect(fs.existsSync(repodir + '/newfile')).to.be(true);
     }
 
-    function sendMail(done) {
+    async function sendMail() {
-        browser.get(`https://${app.fqdn}/admin/config`).then(function () {
+        await browser.get(`https://${app.fqdn}/admin/config`);
-            var button = browser.findElement(By.xpath('//button[@id="test-mail-btn"]'));
+
-            return browser.executeScript('arguments[0].scrollIntoView(true)', button);
+        var button = await browser.findElement(By.xpath('//button[@id="test-mail-btn"]'));
-        }).then(function () {
+        await browser.executeScript('arguments[0].scrollIntoView(true)', button);
-            return browser.findElement(By.xpath('//input[@name="email"]')).sendKeys('test@cloudron.io');
+        await browser.findElement(By.xpath('//input[@name="email"]')).sendKeys('test@cloudron.io');
-        }).then(function () {
+        await browser.findElement(By.xpath('//button[@id="test-mail-btn"]')).click();
-            return browser.findElement(By.xpath('//button[@id="test-mail-btn"]')).click();
+        await browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"A testing email has been sent to \'test@cloudron.io\'")]')), TIMEOUT);
-        }).then(function () {
-            return browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"A testing email has been sent to \'test@cloudron.io\'")]')), TIMEOUT);
-        }).then(function () {
-            done();
-        });
     }
 
     xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
-
-    // it('can login', function (done) {
-    //     var inspect = JSON.parse(execSync('cloudron inspect'));
-
-    //     superagent.post(`https://${inspect.apiEndpoint}/api/v1/developer/login`).send({
-    //         username: username,
-    //         password: password
-    //     }).end(function (error, result) {
-    //         if (error) return done(error);
-    //         if (result.statusCode !== 200) return done(new Error('Login failed with status ' + result.statusCode));
-
-    //         token = result.body.accessToken;
-
-    //         superagent.get(`https://${inspect.apiEndpoint}/api/v1/profile`)
-    //             .query({ access_token: token }).end(function (error, result) {
-    //             if (error) return done(error);
-    //             if (result.statusCode !== 200) return done(new Error('Get profile failed with status ' + result.statusCode));
-
-    //             email = result.body.email;
-    //             done();
-    //         });
-    //     });
-    // });
-
     it('install app', function () { execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
 
     it('can get app information', getAppInfo);
-    it('can get the main page', function (done) {
-        superagent.get('https://' + app.fqdn).end(function (error, result) {
-            expect(error).to.be(null);
-            expect(result.status).to.eql(200);
-
-            done();
-        });
-    });
 
     it('can admin login', adminLogin);
     it('can send mail', sendMail);
@@ -314,9 +197,6 @@ return done();
 
     it('can add and push a file', pushFile);
 
-    it('can add custom file', addCustomFile);
-    it('can check custom file', checkCustomFile);
-
     it('can restart app', function () { execSync('cloudron restart  --app ' + app.id); });
 
     xit('can login', login.bind(null, username, password)); // no need to relogin since session persists
@@ -332,18 +212,14 @@ return done();
     it('can clone the url', cloneRepo);
     it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); });
 
-    it('move to different location', function (done) {
+    it('move to different location', async function () {
         //browser.manage().deleteAllCookies(); // commented because of error "'Network.deleteCookie' wasn't found"
         // ensure we don't hit NXDOMAIN in the mean time
-        browser.get('about:blank').then(function () {
+        await browser.get('about:blank');
-            execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, EXEC_ARGS);
-            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');
 
-            done();
+        execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, EXEC_ARGS);
-        });
     });
+    it('can get app information', getAppInfo);
 
     it('can login', login.bind(null, username, password));
     it('can get avatar', checkAvatar);
@@ -351,57 +227,38 @@ return done();
     it('can clone the url', cloneRepo);
     it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); });
 
-    it('uninstall app', function (done) {
+    it('uninstall app', async function () {
         // ensure we don't hit NXDOMAIN in the mean time
-        browser.get('about:blank').then(function () {
+        await browser.get('about:blank');
         execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
-            done();
-        });
     });
 
     // check if the _first_ login via email succeeds
-    it('can login via email', function (done) {
+    it('can login via email', async function () { execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
-        execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS);
-        var inspect = JSON.parse(execSync('cloudron inspect'));
 
-        app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
+    it('can get app information', getAppInfo);
-        expect(app).to.be.an('object');
+    it('can login', login.bind(null, email, password));
-
-        login(email, password, function (error) {
-            if (error) return done(error);
 
+    it('uninstall app', async function () {
         // ensure we don't hit NXDOMAIN in the mean time
-            browser.get('about:blank').then(function () {
+        await browser.get('about:blank');
         execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
-                done();
-            });
-        });
     });
 
     // No SSO
-    it('install app (no sso)', function () {
+    it('install app (no sso)', function () { execSync(`cloudron install --no-sso --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
-        execSync(`cloudron install --no-sso --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS);
-    });
-
-    it('can get app information', function () {
-        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 get app information', getAppInfo);
     it('can admin login (no sso)', adminLogin);
     it('can logout', logout);
 
-    it('uninstall app (no sso)', function () {
+    it('uninstall app (no sso)', async function () {
+        await browser.get('about:blank');
         execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
     });
 
     // test update
-    it('can install app', function () {
+    it('can install app', function () { execSync(`cloudron install --appstore-id ${app.manifest.id} --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
-        execSync(`cloudron install --appstore-id ${app.manifest.id} --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS);
-    });
 
     it('can get app information', getAppInfo);
     it('can login', login.bind(null, username, password));
@@ -412,9 +269,7 @@ return done();
     it('can clone the url', cloneRepo);
     it('can add and push a file', pushFile);
 
-    it('can update', function () {
+    it('can update', function () { execSync('cloudron update --app ' + app.id, EXEC_ARGS); });
-        execSync('cloudron update --app ' + app.id, EXEC_ARGS);
-    });
 
     xit('can admin login', adminLogin);
     xit('can send mail', sendMail);
@@ -425,11 +280,9 @@ return done();
     it('can clone the url', cloneRepo);
     it('file exists in cloned repo', fileExists);
 
-    it('uninstall app', function (done) {
+    it('uninstall app', async function () {
         // ensure we don't hit NXDOMAIN in the mean time
-        browser.get('about:blank').then(function () {
+        await browser.get('about:blank');
         execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
-            done();
-        });
     });
 });