diff --git a/cypress.config.js b/cypress.config.js new file mode 100644 index 000000000..81147e36f --- /dev/null +++ b/cypress.config.js @@ -0,0 +1,18 @@ +const { defineConfig } = require('cypress') + +module.exports = defineConfig({ + fixturesFolder: 'test/cypress/fixtures', + video: false, + viewportWidth: 1440, + viewportHeight: 900, + 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('./test/cypress/plugins/index.js')(on, config) + }, + baseUrl: 'http://localhost:9002', + specPattern: 'test/cypress/integration/**/*.cy.{js,jsx,ts,tsx}', + supportFile: 'test/cypress/support/index.js', + }, +}) diff --git a/cypress.json b/cypress.json deleted file mode 100644 index 70d54e6ba..000000000 --- a/cypress.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "baseUrl": "http://localhost:9002", - "fixturesFolder": "test/cypress/fixtures", - "integrationFolder": "test/cypress/integration", - "pluginsFile": "test/cypress/plugins/index.js", - "supportFile": "test/cypress/support/index.js", - "video": false, - "viewportWidth": 1440, - "viewportHeight": 900 -} diff --git a/package.json b/package.json index f181a7bfa..cb05e6794 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "chai": "^4.3.6", "codeclimate-test-reporter": "^0.5.1", "cssnano": "^5.1.11", - "cypress": "^9.7.0", + "cypress": "10.0.2", "cypress-plugin-tab": "^1.0.5", "del": "^6.1.1", "eslint": "^8.17.0", diff --git a/test/cypress/integration/a11y.spec.js b/test/cypress/integration/a11y.cy.js similarity index 100% rename from test/cypress/integration/a11y.spec.js rename to test/cypress/integration/a11y.cy.js diff --git a/test/cypress/integration/destroying-elements.spec.js b/test/cypress/integration/destroying-elements.cy.js similarity index 100% rename from test/cypress/integration/destroying-elements.spec.js rename to test/cypress/integration/destroying-elements.cy.js diff --git a/test/cypress/integration/element-targeting.spec.js b/test/cypress/integration/element-targeting.cy.js similarity index 100% rename from test/cypress/integration/element-targeting.spec.js rename to test/cypress/integration/element-targeting.cy.js diff --git a/test/cypress/integration/modal.spec.js b/test/cypress/integration/modal.cy.js similarity index 100% rename from test/cypress/integration/modal.spec.js rename to test/cypress/integration/modal.cy.js diff --git a/test/cypress/integration/test.acceptance.js b/test/cypress/integration/test.acceptance.cy.js similarity index 100% rename from test/cypress/integration/test.acceptance.js rename to test/cypress/integration/test.acceptance.cy.js diff --git a/yarn.lock b/yarn.lock index 1e25ef4b3..7b944e9aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3200,10 +3200,10 @@ cypress-plugin-tab@^1.0.5: dependencies: ally.js "^1.4.1" -cypress@^9.7.0: - version "9.7.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.7.0.tgz#bf55b2afd481f7a113ef5604aa8b693564b5e744" - integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q== +cypress@10.0.2: + version "10.0.2" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.0.2.tgz#6aeac1923d534f9850d57dad9496f9ea74034a23" + integrity sha512-7+C4KHYBcfZrawss+Gt5PlS35rfc6ySc59JcHDVsIMm1E/J35dqE41UEXpdtwIq3549umCerNWnFADzqib4kcA== dependencies: "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4"