From 2bbb127efd0ab858949f59fb148e3b9be337e234 Mon Sep 17 00:00:00 2001 From: Rainer Killinger Date: Wed, 25 Jun 2025 09:57:22 +0200 Subject: [PATCH] fix: app e2e cypress tests --- .gitlab-ci.yml | 6 ++-- frontend/app/cypress.config.ts | 1 + frontend/app/package.json | 4 +-- packages/api-cli/test/e2e.spec.ts | 2 +- pnpm-lock.yaml | 60 +++++++++++++++++++------------ 5 files changed, 45 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86f2da9b..0988246c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,9 +37,9 @@ default: before_script: - corepack enable - corepack prepare pnpm@latest-8 --activate - - echo TURBO_API=$TURBO_API >> .env.local - - echo TURBO_TOKEN=$TURBO_TOKEN >> .env.local - - echo TURBO_TEAM=$TURBO_TEAM >> .env.local + # - echo TURBO_API=$TURBO_API >> .env.local + # - echo TURBO_TOKEN=$TURBO_TOKEN >> .env.local + # - echo TURBO_TEAM=$TURBO_TEAM >> .env.local - pnpm config set store-dir .pnpm-store cache: &pnpm_cache key: diff --git a/frontend/app/cypress.config.ts b/frontend/app/cypress.config.ts index ab543d9b..c25b09af 100644 --- a/frontend/app/cypress.config.ts +++ b/frontend/app/cypress.config.ts @@ -22,6 +22,7 @@ export default defineConfig({ mochaFile: 'coverage/integration-report-junit-[hash].xml', }, baseUrl: 'http://localhost:4200', + injectDocumentDomain: true, supportFile: 'cypress/support/index.ts', videosFolder: 'cypress/videos', screenshotsFolder: 'cypress/screenshots', diff --git a/frontend/app/package.json b/frontend/app/package.json index 226fb3a2..e6016d5e 100644 --- a/frontend/app/package.json +++ b/frontend/app/package.json @@ -133,7 +133,7 @@ "@capacitor/cli": "6.2.1", "@capacitor/ios": "6.2.1", "@compodoc/compodoc": "1.1.23", - "@cypress/schematic": "2.5.1", + "@cypress/schematic": "3.0.0", "@ionic/angular-toolkit": "11.0.1", "@ionic/cli": "7.2.0", "@openstapps/prettier-config": "workspace:*", @@ -152,7 +152,7 @@ "@typescript-eslint/eslint-plugin": "7.2.0", "@typescript-eslint/parser": "7.2.0", "cordova-res": "0.15.4", - "cypress": "13.10.0", + "cypress": "14.5.0", "eslint": "8.57.0", "eslint-plugin-jsdoc": "48.2.1", "eslint-plugin-prettier": "5.1.3", diff --git a/packages/api-cli/test/e2e.spec.ts b/packages/api-cli/test/e2e.spec.ts index b37378c9..b31c20d2 100644 --- a/packages/api-cli/test/e2e.spec.ts +++ b/packages/api-cli/test/e2e.spec.ts @@ -159,7 +159,7 @@ describe('e2e Connector', function () { failOnLookup = false; failOnCompare = true; - e2eRun(httpClient, { + await e2eRun(httpClient, { to: 'http://localhost', samplesLocation: './node_modules/@openstapps/core/test/resources', }).should.eventually.satisfy((errors: string[]) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a07fa26f..c9b4d83c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -952,8 +952,8 @@ importers: specifier: 1.1.23 version: 1.1.23(typescript@5.4.2) '@cypress/schematic': - specifier: 2.5.1 - version: 2.5.1(@angular/cli@17.3.17)(@angular/core@17.3.12) + specifier: 3.0.0 + version: 3.0.0(@angular/cli@17.3.17)(@angular/core@17.3.12) '@ionic/angular-toolkit': specifier: 11.0.1 version: 11.0.1 @@ -1009,8 +1009,8 @@ importers: specifier: 0.15.4 version: 0.15.4 cypress: - specifier: 13.10.0 - version: 13.10.0 + specifier: 14.5.0 + version: 14.5.0 eslint: specifier: 8.57.0 version: 8.57.0 @@ -5243,16 +5243,16 @@ packages: uuid: 8.3.2 dev: true - /@cypress/schematic@2.5.1(@angular/cli@17.3.17)(@angular/core@17.3.12): - resolution: {integrity: sha512-tO2lUnr5C0udB4xpewndlTMkEHHdgyvSNLI9+bTdYbxCby8MlxrFpewxmqPIfH21ZmOQP8XghD5uMd3l732ESA==} + /@cypress/schematic@3.0.0(@angular/cli@17.3.17)(@angular/core@17.3.12): + resolution: {integrity: sha512-LFT0sl4HOykGWwrDfvHnQxucSvT2P/VA+GOk89dbSRMkXLG8u8h9GfbqK+9keoJBGTnfJFU8MWTtwjyYwPZW6w==} peerDependencies: - '@angular/cli': '>=14' - '@angular/core': '>=14' + '@angular/cli': '>=17.2' + '@angular/core': '>=17.2' dependencies: '@angular/cli': 17.3.17 '@angular/core': 17.3.12(rxjs@7.8.1)(zone.js@0.14.4) jsonc-parser: 3.3.1 - rxjs: 6.6.7 + rxjs: 7.8.1 dev: true /@cypress/xvfb@1.2.4(supports-color@8.1.1): @@ -6351,7 +6351,7 @@ packages: dependencies: '@ionic/utils-object': 2.1.6 '@ionic/utils-terminal': 2.3.4 - debug: 4.3.4 + debug: 4.4.1(supports-color@8.1.1) signal-exit: 3.0.7 tree-kill: 1.2.2 tslib: 2.6.2 @@ -6387,7 +6387,7 @@ packages: resolution: {integrity: sha512-4+Kitey1lTA1yGtnigeYNhV/0tggI3lWBMjC7tBs1K9GXa/q7q4CtOISppdh8QgtOhrhAXS2Igp8rbko/Cj+lA==} engines: {node: '>=16.0.0'} dependencies: - debug: 4.3.4 + debug: 4.4.1(supports-color@8.1.1) tslib: 2.6.2 transitivePeerDependencies: - supports-color @@ -6429,7 +6429,7 @@ packages: '@ionic/utils-stream': 3.1.6 '@ionic/utils-terminal': 2.3.4 cross-spawn: 7.0.6 - debug: 4.3.4 + debug: 4.4.1(supports-color@8.1.1) tslib: 2.6.2 transitivePeerDependencies: - supports-color @@ -6473,7 +6473,7 @@ packages: engines: {node: '>=16.0.0'} dependencies: '@types/slice-ansi': 4.0.0 - debug: 4.3.4 + debug: 4.4.1(supports-color@8.1.1) signal-exit: 3.0.7 slice-ansi: 4.0.0 string-width: 4.2.3 @@ -9614,13 +9614,13 @@ packages: colors: 1.4.0 dev: true - /cli-table3@0.6.5: - resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==} + /cli-table3@0.6.1: + resolution: {integrity: sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==} engines: {node: 10.* || >= 12.*} dependencies: string-width: 4.2.3 optionalDependencies: - '@colors/colors': 1.5.0 + colors: 1.4.0 dev: true /cli-truncate@2.1.0: @@ -10347,9 +10347,9 @@ packages: resolution: {integrity: sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==} dev: true - /cypress@13.10.0: - resolution: {integrity: sha512-tOhwRlurVOQbMduX+KonoMeQILs2cwR3yHGGENoFvvSoLUBHmJ8b9/n21gFSDqjlOJ+SRVcwuh+fG/JDsHsT6Q==} - engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0} + /cypress@14.5.0: + resolution: {integrity: sha512-1HOnKvWep0LkWuFwPeWkZ0TDl7ivi2/Mz+WNU4dfkeLJaFndS3Ow6TXT7YjuTqLFI2peJKzPKljVUFdymI2K5g==} + engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true requiresBuild: true dependencies: @@ -10364,8 +10364,9 @@ packages: cachedir: 2.4.0 chalk: 4.1.2 check-more-types: 2.24.0 + ci-info: 4.2.0 cli-cursor: 3.1.0 - cli-table3: 0.6.5 + cli-table3: 0.6.1 commander: 6.2.1 common-tags: 1.8.2 dayjs: 1.11.13 @@ -10378,7 +10379,7 @@ packages: figures: 3.2.0 fs-extra: 9.1.0 getos: 3.2.1 - is-ci: 3.0.1 + hasha: 5.2.2 is-installed-globally: 0.4.0 lazy-ass: 1.6.0 listr2: 3.14.0(enquirer@2.4.1) @@ -10390,9 +10391,10 @@ packages: process: 0.11.10 proxy-from-env: 1.0.0 request-progress: 3.0.0 - semver: 7.6.0 + semver: 7.7.2 supports-color: 8.1.1 tmp: 0.2.3 + tree-kill: 1.2.2 untildify: 4.0.0 yauzl: 2.10.0 dev: true @@ -12909,6 +12911,14 @@ packages: dependencies: has-symbols: 1.1.0 + /hasha@5.2.2: + resolution: {integrity: sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==} + engines: {node: '>=8'} + dependencies: + is-stream: 2.0.1 + type-fest: 0.8.1 + dev: true + /hasown@2.0.2: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} @@ -17694,6 +17704,12 @@ packages: dependencies: lru-cache: 6.0.0 + /semver@7.7.2: + resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==} + engines: {node: '>=10'} + hasBin: true + dev: true + /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} engines: {node: '>= 0.8.0'}