From 1ba767b8abc56b28f660ce44b80e1247c1876b83 Mon Sep 17 00:00:00 2001 From: Steve Matney Date: Mon, 27 Jan 2025 15:14:13 -0700 Subject: [PATCH] Build: giving cypress its own project --- package.json | 3 ++- packages/es-components/cypress.config.ts | 19 ------------------- .../es-components/cypress/cypress.config.ts | 2 +- .../{ => cypress}/e2e/drawer-tests.cy.js | 0 .../{ => cypress}/e2e/popover-tests.cy.js | 0 .../{ => cypress}/fixtures/example.json | 0 .../cypress/{ => cypress}/plugins/index.js | 0 .../cypress/{ => cypress}/support/commands.js | 0 .../cypress/{ => cypress}/support/e2e.js | 0 packages/es-components/cypress/package.json | 11 +++++++++++ 10 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 packages/es-components/cypress.config.ts rename packages/es-components/cypress/{ => cypress}/e2e/drawer-tests.cy.js (100%) rename packages/es-components/cypress/{ => cypress}/e2e/popover-tests.cy.js (100%) rename packages/es-components/cypress/{ => cypress}/fixtures/example.json (100%) rename packages/es-components/cypress/{ => cypress}/plugins/index.js (100%) rename packages/es-components/cypress/{ => cypress}/support/commands.js (100%) rename packages/es-components/cypress/{ => cypress}/support/e2e.js (100%) create mode 100644 packages/es-components/cypress/package.json diff --git a/package.json b/package.json index 9cd5d1241..80ae0bd0c 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ }, "workspaces": [ "shared/*", - "packages/*" + "packages/*", + "packages/es-components/cypress" ], "lint-staged": { "**/*.{js,jsx,ts,tsx,mjs,json,yml,yaml}": [ diff --git a/packages/es-components/cypress.config.ts b/packages/es-components/cypress.config.ts deleted file mode 100644 index a8ff56f18..000000000 --- a/packages/es-components/cypress.config.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { defineConfig } from 'cypress'; -import * as ciConfig from './cypress-ci.json'; - -const extraConfig = process.env.CI ? ciConfig : {}; - -export default defineConfig({ - ...extraConfig, - scrollBehavior: 'center', - chromeWebSecurity: false, - e2e: { - // We've imported your old cypress plugins here. - // You may want to clean this up later by importing these. - setupNodeEvents(on, config) { - // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return - return require('./cypress/plugins/index.js')(on, config); - }, - baseUrl: 'http://localhost:6060' - } -}); diff --git a/packages/es-components/cypress/cypress.config.ts b/packages/es-components/cypress/cypress.config.ts index b9b866efd..921f26f24 100644 --- a/packages/es-components/cypress/cypress.config.ts +++ b/packages/es-components/cypress/cypress.config.ts @@ -12,7 +12,7 @@ export default defineConfig({ // You may want to clean this up later by importing these. setupNodeEvents(on, config) { // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return - return require('./plugins/index.js')(on, config); + return require('./cypress/plugins/index.js')(on, config); }, baseUrl: 'http://localhost:6060' } diff --git a/packages/es-components/cypress/e2e/drawer-tests.cy.js b/packages/es-components/cypress/cypress/e2e/drawer-tests.cy.js similarity index 100% rename from packages/es-components/cypress/e2e/drawer-tests.cy.js rename to packages/es-components/cypress/cypress/e2e/drawer-tests.cy.js diff --git a/packages/es-components/cypress/e2e/popover-tests.cy.js b/packages/es-components/cypress/cypress/e2e/popover-tests.cy.js similarity index 100% rename from packages/es-components/cypress/e2e/popover-tests.cy.js rename to packages/es-components/cypress/cypress/e2e/popover-tests.cy.js diff --git a/packages/es-components/cypress/fixtures/example.json b/packages/es-components/cypress/cypress/fixtures/example.json similarity index 100% rename from packages/es-components/cypress/fixtures/example.json rename to packages/es-components/cypress/cypress/fixtures/example.json diff --git a/packages/es-components/cypress/plugins/index.js b/packages/es-components/cypress/cypress/plugins/index.js similarity index 100% rename from packages/es-components/cypress/plugins/index.js rename to packages/es-components/cypress/cypress/plugins/index.js diff --git a/packages/es-components/cypress/support/commands.js b/packages/es-components/cypress/cypress/support/commands.js similarity index 100% rename from packages/es-components/cypress/support/commands.js rename to packages/es-components/cypress/cypress/support/commands.js diff --git a/packages/es-components/cypress/support/e2e.js b/packages/es-components/cypress/cypress/support/e2e.js similarity index 100% rename from packages/es-components/cypress/support/e2e.js rename to packages/es-components/cypress/cypress/support/e2e.js diff --git a/packages/es-components/cypress/package.json b/packages/es-components/cypress/package.json new file mode 100644 index 000000000..1a61793d0 --- /dev/null +++ b/packages/es-components/cypress/package.json @@ -0,0 +1,11 @@ +{ + "name": "es-components-cypress-tests", + "version": "1.0.0", + "main": "cypress.config.ts", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "description": "" +}