From b43f17fc4af1c79ea340204e26ef31598092cacf Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 29 Sep 2022 11:13:51 -0500 Subject: [PATCH] test(react): update test app to cypress 10 (#26035) --- packages/react/test-app/cypress.config.ts | 20 +++++++++++++ packages/react/test-app/cypress.json | 3 -- packages/react/test-app/cypress/tsconfig.json | 8 ----- packages/react/test-app/package-lock.json | 30 +++++++++---------- packages/react/test-app/package.json | 2 +- .../{cypress => tests/e2e}/plugins/index.js | 0 .../e2e/specs/navigation/IonNav.cy.ts} | 0 .../overlay-components/IonActionSheet.cy.ts} | 0 .../specs/overlay-components/IonAlert.cy.ts} | 0 .../overlay-components/IonLoading.cy.ts} | 0 .../specs/overlay-components/IonModal.cy.ts} | 0 .../specs/overlay-components/IonPicker.cy.ts} | 0 .../overlay-components/IonPopover.cy.ts} | 0 .../specs/overlay-components/IonToast.cy.ts} | 0 .../KeepContentsMounted.cy.ts} | 0 .../overlay-hooks/useIonActionSheet.cy.ts} | 0 .../specs/overlay-hooks/useIonAlert.cy.ts} | 0 .../specs/overlay-hooks/useIonLoading.cy.ts} | 0 .../specs/overlay-hooks/useIonModal.cy.ts} | 0 .../specs/overlay-hooks/useIonPicker.cy.ts} | 0 .../specs/overlay-hooks/useIonPopover.cy.ts} | 0 .../specs/overlay-hooks/useIonToast.cy.ts} | 0 .../e2e/specs/tabs/tabs.cy.ts} | 0 .../e2e}/support/commands.js | 0 .../{cypress => tests/e2e}/support/index.js | 0 25 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 packages/react/test-app/cypress.config.ts delete mode 100644 packages/react/test-app/cypress.json delete mode 100644 packages/react/test-app/cypress/tsconfig.json rename packages/react/test-app/{cypress => tests/e2e}/plugins/index.js (100%) rename packages/react/test-app/{cypress/integration/navigation/IonNav.spec.ts => tests/e2e/specs/navigation/IonNav.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-components/IonActionSheet.spec.ts => tests/e2e/specs/overlay-components/IonActionSheet.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-components/IonAlert.spec.ts => tests/e2e/specs/overlay-components/IonAlert.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-components/IonLoading.spec.ts => tests/e2e/specs/overlay-components/IonLoading.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-components/IonModal.spec.ts => tests/e2e/specs/overlay-components/IonModal.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-components/IonPicker.spec.ts => tests/e2e/specs/overlay-components/IonPicker.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-components/IonPopover.spec.ts => tests/e2e/specs/overlay-components/IonPopover.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-components/IonToast.spec.ts => tests/e2e/specs/overlay-components/IonToast.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-components/KeepContentsMounted.spec.ts => tests/e2e/specs/overlay-components/KeepContentsMounted.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-hooks/useIonActionSheet.spec.ts => tests/e2e/specs/overlay-hooks/useIonActionSheet.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-hooks/useIonAlert.spec.ts => tests/e2e/specs/overlay-hooks/useIonAlert.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-hooks/useIonLoading.spec.ts => tests/e2e/specs/overlay-hooks/useIonLoading.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-hooks/useIonModal.spec.ts => tests/e2e/specs/overlay-hooks/useIonModal.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-hooks/useIonPicker.spec.ts => tests/e2e/specs/overlay-hooks/useIonPicker.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-hooks/useIonPopover.spec.ts => tests/e2e/specs/overlay-hooks/useIonPopover.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/overlay-hooks/useIonToast.spec.ts => tests/e2e/specs/overlay-hooks/useIonToast.cy.ts} (100%) rename packages/react/test-app/{cypress/integration/tabs/tabs.spec.ts => tests/e2e/specs/tabs/tabs.cy.ts} (100%) rename packages/react/test-app/{cypress => tests/e2e}/support/commands.js (100%) rename packages/react/test-app/{cypress => tests/e2e}/support/index.js (100%) diff --git a/packages/react/test-app/cypress.config.ts b/packages/react/test-app/cypress.config.ts new file mode 100644 index 0000000000..8b5be1e4b3 --- /dev/null +++ b/packages/react/test-app/cypress.config.ts @@ -0,0 +1,20 @@ +import { defineConfig } from 'cypress'; + +export default defineConfig({ + video: false, + screenshotOnRunFailure: false, + defaultCommandTimeout: 10000, + fixturesFolder: 'tests/e2e/fixtures', + screenshotsFolder: 'tests/e2e/screenshots', + videosFolder: 'tests/e2e/videos', + e2e: { + // We've imported your old cypress plugins here. + // You may want to clean this up later by importing these. + setupNodeEvents(on, config) { + return require('./tests/e2e/plugins/index.js')(on, config) + }, + baseUrl: "http://localhost:3000", + specPattern: 'tests/e2e/specs/**/*.cy.{js,jsx,ts,tsx}', + supportFile: 'tests/e2e/support/index.js', + }, +}) diff --git a/packages/react/test-app/cypress.json b/packages/react/test-app/cypress.json deleted file mode 100644 index 17ef242e71..0000000000 --- a/packages/react/test-app/cypress.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "baseUrl": "http://localhost:3000" -} diff --git a/packages/react/test-app/cypress/tsconfig.json b/packages/react/test-app/cypress/tsconfig.json deleted file mode 100644 index f87a578b65..0000000000 --- a/packages/react/test-app/cypress/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "compilerOptions": { - "target": "es5", - "lib": ["es5", "dom"], - "types": ["cypress"] - }, - "include": ["**/*.ts"] -} diff --git a/packages/react/test-app/package-lock.json b/packages/react/test-app/package-lock.json index 245ff7ab66..6b1ddb35ac 100644 --- a/packages/react/test-app/package-lock.json +++ b/packages/react/test-app/package-lock.json @@ -28,7 +28,7 @@ "@types/jest": "^27.4.1", "@types/node": "^17.0.21", "concurrently": "^6.3.0", - "cypress": "^9.5.2", + "cypress": "^10.9.0", "serve": "^14.0.1", "wait-on": "^6.0.0", "webpack-cli": "^4.9.1" @@ -6507,9 +6507,9 @@ "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==" }, "node_modules/cypress": { - "version": "9.7.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.7.0.tgz", - "integrity": "sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q==", + "version": "10.9.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.9.0.tgz", + "integrity": "sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -6532,7 +6532,7 @@ "dayjs": "^1.10.4", "debug": "^4.3.2", "enquirer": "^2.3.6", - "eventemitter2": "^6.4.3", + "eventemitter2": "6.4.7", "execa": "4.1.0", "executable": "^4.1.1", "extract-zip": "2.0.1", @@ -7947,9 +7947,9 @@ } }, "node_modules/eventemitter2": { - "version": "6.4.5", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz", - "integrity": "sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==", + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz", + "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==", "dev": true }, "node_modules/eventemitter3": { @@ -22013,9 +22013,9 @@ "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==" }, "cypress": { - "version": "9.7.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.7.0.tgz", - "integrity": "sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q==", + "version": "10.9.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.9.0.tgz", + "integrity": "sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA==", "dev": true, "requires": { "@cypress/request": "^2.88.10", @@ -22037,7 +22037,7 @@ "dayjs": "^1.10.4", "debug": "^4.3.2", "enquirer": "^2.3.6", - "eventemitter2": "^6.4.3", + "eventemitter2": "6.4.7", "execa": "4.1.0", "executable": "^4.1.1", "extract-zip": "2.0.1", @@ -23077,9 +23077,9 @@ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" }, "eventemitter2": { - "version": "6.4.5", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz", - "integrity": "sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==", + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz", + "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==", "dev": true }, "eventemitter3": { diff --git a/packages/react/test-app/package.json b/packages/react/test-app/package.json index 85bc38e911..1124aa22a7 100644 --- a/packages/react/test-app/package.json +++ b/packages/react/test-app/package.json @@ -51,7 +51,7 @@ "@types/jest": "^27.4.1", "@types/node": "^17.0.21", "concurrently": "^6.3.0", - "cypress": "^9.5.2", + "cypress": "^10.9.0", "serve": "^14.0.1", "wait-on": "^6.0.0", "webpack-cli": "^4.9.1" diff --git a/packages/react/test-app/cypress/plugins/index.js b/packages/react/test-app/tests/e2e/plugins/index.js similarity index 100% rename from packages/react/test-app/cypress/plugins/index.js rename to packages/react/test-app/tests/e2e/plugins/index.js diff --git a/packages/react/test-app/cypress/integration/navigation/IonNav.spec.ts b/packages/react/test-app/tests/e2e/specs/navigation/IonNav.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/navigation/IonNav.spec.ts rename to packages/react/test-app/tests/e2e/specs/navigation/IonNav.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-components/IonActionSheet.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-components/IonActionSheet.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-components/IonActionSheet.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-components/IonActionSheet.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-components/IonAlert.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-components/IonAlert.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-components/IonAlert.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-components/IonAlert.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-components/IonLoading.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-components/IonLoading.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-components/IonLoading.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-components/IonLoading.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-components/IonModal.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-components/IonModal.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-components/IonModal.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-components/IonModal.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-components/IonPicker.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-components/IonPicker.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-components/IonPicker.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-components/IonPicker.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-components/IonPopover.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-components/IonPopover.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-components/IonPopover.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-components/IonPopover.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-components/IonToast.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-components/IonToast.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-components/IonToast.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-components/IonToast.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-components/KeepContentsMounted.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-components/KeepContentsMounted.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-components/KeepContentsMounted.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-components/KeepContentsMounted.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-hooks/useIonActionSheet.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonActionSheet.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-hooks/useIonActionSheet.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonActionSheet.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-hooks/useIonAlert.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonAlert.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-hooks/useIonAlert.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonAlert.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-hooks/useIonLoading.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonLoading.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-hooks/useIonLoading.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonLoading.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-hooks/useIonModal.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonModal.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-hooks/useIonModal.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonModal.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-hooks/useIonPicker.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonPicker.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-hooks/useIonPicker.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonPicker.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-hooks/useIonPopover.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonPopover.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-hooks/useIonPopover.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonPopover.cy.ts diff --git a/packages/react/test-app/cypress/integration/overlay-hooks/useIonToast.spec.ts b/packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonToast.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/overlay-hooks/useIonToast.spec.ts rename to packages/react/test-app/tests/e2e/specs/overlay-hooks/useIonToast.cy.ts diff --git a/packages/react/test-app/cypress/integration/tabs/tabs.spec.ts b/packages/react/test-app/tests/e2e/specs/tabs/tabs.cy.ts similarity index 100% rename from packages/react/test-app/cypress/integration/tabs/tabs.spec.ts rename to packages/react/test-app/tests/e2e/specs/tabs/tabs.cy.ts diff --git a/packages/react/test-app/cypress/support/commands.js b/packages/react/test-app/tests/e2e/support/commands.js similarity index 100% rename from packages/react/test-app/cypress/support/commands.js rename to packages/react/test-app/tests/e2e/support/commands.js diff --git a/packages/react/test-app/cypress/support/index.js b/packages/react/test-app/tests/e2e/support/index.js similarity index 100% rename from packages/react/test-app/cypress/support/index.js rename to packages/react/test-app/tests/e2e/support/index.js