From a23cd5ad2982fc8e25eb6567207f42569f511086 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Mon, 31 Jul 2023 14:44:59 -0700 Subject: [PATCH 1/5] Update Cypress deps --- frontend/package-lock.json | 34 +++++++++++++++++++--------------- frontend/package.json | 4 ++-- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 561b61096..d82eecd5b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -58,9 +58,9 @@ }, "optionalDependencies": { "@cypress/schematic": "^2.5.0", - "cypress": "^12.17.1", + "cypress": "^12.17.2", "cypress-fail-on-console-error": "~4.0.3", - "cypress-wait-until": "^1.7.2", + "cypress-wait-until": "^2.0.0", "mock-socket": "~9.2.1", "start-server-and-test": "~2.0.0" } @@ -6641,9 +6641,9 @@ "peer": true }, "node_modules/cypress": { - "version": "12.17.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.1.tgz", - "integrity": "sha512-eKfBgO6t8waEyhegL4gxD7tcI6uTCGttu+ZU7y9Hq8BlpMztd7iLeIF4AJFAnbZH1xjX+wwgg4cRKFNSvv3VWQ==", + "version": "12.17.2", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz", + "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==", "hasInstallScript": true, "optional": true, "dependencies": { @@ -6710,10 +6710,14 @@ } }, "node_modules/cypress-wait-until": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-1.7.2.tgz", - "integrity": "sha512-uZ+M8/MqRcpf+FII/UZrU7g1qYZ4aVlHcgyVopnladyoBrpoaMJ4PKZDrdOJ05H5RHbr7s9Tid635X3E+ZLU/Q==", - "optional": true + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-2.0.0.tgz", + "integrity": "sha512-ulUZyrWBn+OuC8oiQuGKAScDYfpaWnE3dEE/raUo64w4RHQxZrQ/iMIWT4ZjGMMPr3P+BFEALCRnjQeRqzZj6g==", + "optional": true, + "engines": { + "node": ">=18.16.0", + "npm": ">=9.5.1" + } }, "node_modules/cypress/node_modules/@types/node": { "version": "14.18.53", @@ -20968,9 +20972,9 @@ "peer": true }, "cypress": { - "version": "12.17.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.1.tgz", - "integrity": "sha512-eKfBgO6t8waEyhegL4gxD7tcI6uTCGttu+ZU7y9Hq8BlpMztd7iLeIF4AJFAnbZH1xjX+wwgg4cRKFNSvv3VWQ==", + "version": "12.17.2", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz", + "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==", "optional": true, "requires": { "@cypress/request": "^2.88.11", @@ -21151,9 +21155,9 @@ } }, "cypress-wait-until": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-1.7.2.tgz", - "integrity": "sha512-uZ+M8/MqRcpf+FII/UZrU7g1qYZ4aVlHcgyVopnladyoBrpoaMJ4PKZDrdOJ05H5RHbr7s9Tid635X3E+ZLU/Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-2.0.0.tgz", + "integrity": "sha512-ulUZyrWBn+OuC8oiQuGKAScDYfpaWnE3dEE/raUo64w4RHQxZrQ/iMIWT4ZjGMMPr3P+BFEALCRnjQeRqzZj6g==", "optional": true }, "d": { diff --git a/frontend/package.json b/frontend/package.json index 29f57538e..db6ee0f3a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -110,9 +110,9 @@ }, "optionalDependencies": { "@cypress/schematic": "^2.5.0", - "cypress": "^12.17.1", + "cypress": "^12.17.2", "cypress-fail-on-console-error": "~4.0.3", - "cypress-wait-until": "^1.7.2", + "cypress-wait-until": "^2.0.0", "mock-socket": "~9.2.1", "start-server-and-test": "~2.0.0" }, From e4a43fcca5191d99f6b8e1651943d259a386020b Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Fri, 4 Aug 2023 08:19:19 -0700 Subject: [PATCH 2/5] Update tsconfig for the tests --- frontend/tsconfig.spec.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/tsconfig.spec.json b/frontend/tsconfig.spec.json index 1db2e6ee9..3467e0d0a 100644 --- a/frontend/tsconfig.spec.json +++ b/frontend/tsconfig.spec.json @@ -4,8 +4,10 @@ "outDir": "./out-tsc/spec", "types": [ "jasmine", - "node" - ] + "node", + "cypress", + "cypress-wait-until" +] }, "files": [ "src/test.ts", From da4f891e2fe6e92d77b851f8ae54ccd930adb03d Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Fri, 4 Aug 2023 08:23:29 -0700 Subject: [PATCH 3/5] Use full path for import --- frontend/cypress/support/commands.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/cypress/support/commands.ts b/frontend/cypress/support/commands.ts index 0d698fca5..25a3b6a7e 100644 --- a/frontend/cypress/support/commands.ts +++ b/frontend/cypress/support/commands.ts @@ -44,7 +44,7 @@ 'use strict' -import 'cypress-wait-until'; +import '../../node_modules/cypress-wait-until'; import { PageIdleDetector } from './PageIdleDetector'; import { mockWebSocket } from './websocket'; From e3114144e1dfa6befc25c657389d9369c0f5c6fb Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Fri, 4 Aug 2023 08:36:05 -0700 Subject: [PATCH 4/5] Tweak imports again --- frontend/cypress/support/commands.ts | 3 --- frontend/cypress/support/e2e.ts | 1 + frontend/cypress/tsconfig.json | 2 +- frontend/package-lock.json | 20 ++++++++++++++++++++ frontend/package.json | 1 + 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/frontend/cypress/support/commands.ts b/frontend/cypress/support/commands.ts index 25a3b6a7e..3c32df517 100644 --- a/frontend/cypress/support/commands.ts +++ b/frontend/cypress/support/commands.ts @@ -42,9 +42,6 @@ // -- This will overwrite an existing command -- // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) -'use strict' - -import '../../node_modules/cypress-wait-until'; import { PageIdleDetector } from './PageIdleDetector'; import { mockWebSocket } from './websocket'; diff --git a/frontend/cypress/support/e2e.ts b/frontend/cypress/support/e2e.ts index 71e9ea589..8b9e29027 100644 --- a/frontend/cypress/support/e2e.ts +++ b/frontend/cypress/support/e2e.ts @@ -14,6 +14,7 @@ // *********************************************************** // When a command from ./commands is ready to use, import with `import './commands'` syntax +import 'cypress-wait-until'; import './commands'; import failOnConsoleError from 'cypress-fail-on-console-error'; diff --git a/frontend/cypress/tsconfig.json b/frontend/cypress/tsconfig.json index 8f044958a..20e0cc894 100644 --- a/frontend/cypress/tsconfig.json +++ b/frontend/cypress/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../tsconfig.json", "include": ["**/*.ts"], "compilerOptions": { - "types": ["cypress"], + "types": ["cypress", "node", "cypress-wait-until"], "lib": ["es2015", "dom"], "allowJs": true, "noEmit": true, diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d82eecd5b..97c023be0 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -58,6 +58,7 @@ }, "optionalDependencies": { "@cypress/schematic": "^2.5.0", + "@types/cypress": "^1.1.3", "cypress": "^12.17.2", "cypress-fail-on-console-error": "~4.0.3", "cypress-wait-until": "^2.0.0", @@ -3925,6 +3926,16 @@ "@types/node": "*" } }, + "node_modules/@types/cypress": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.3.tgz", + "integrity": "sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==", + "deprecated": "This is a stub types definition for cypress (https://cypress.io). cypress provides its own type definitions, so you don't need @types/cypress installed!", + "optional": true, + "dependencies": { + "cypress": "*" + } + }, "node_modules/@types/eslint": { "version": "8.4.1", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz", @@ -18866,6 +18877,15 @@ "@types/node": "*" } }, + "@types/cypress": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.3.tgz", + "integrity": "sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==", + "optional": true, + "requires": { + "cypress": "*" + } + }, "@types/eslint": { "version": "8.4.1", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index db6ee0f3a..7f6f34060 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -110,6 +110,7 @@ }, "optionalDependencies": { "@cypress/schematic": "^2.5.0", + "@types/cypress": "^1.1.3", "cypress": "^12.17.2", "cypress-fail-on-console-error": "~4.0.3", "cypress-wait-until": "^2.0.0", From 367bcbda83fefcb6addc3e480e5833ba25760688 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Fri, 4 Aug 2023 08:40:15 -0700 Subject: [PATCH 5/5] Update cypress action to node 18 --- .github/workflows/cypress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index bc66678d4..d067136bf 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -38,7 +38,7 @@ jobs: - name: Setup node uses: actions/setup-node@v3 with: - node-version: 16.15.0 + node-version: 18 cache: "npm" cache-dependency-path: ${{ matrix.module }}/frontend/package-lock.json