diff --git a/cypress.config.js b/cypress.config.js new file mode 100644 --- /dev/null +++ b/cypress.config.js @@ -0,0 +1,40 @@ +const {defineConfig} = require('cypress'); + +module.exports = defineConfig({ + video: false, + viewportWidth: 1920, + viewportHeight: 1080, + defaultCommandTimeout: 20000, + requestTimeout: 20000, + numTestsKeptInMemory: 500, + reporter: 'cypress-multi-reporters', + reporterOptions: { + reporterEnabled: 'mochawesome, mocha-junit-reporter', + mochawesomeReporterOptions: { + reportDir: 'cypress/mochawesome/results', + quiet: true, + overwrite: false, + html: false, + json: true + }, + mochaJunitReporterReporterOptions: { + mochaFile: 'cypress/junit/results/results-[hash].xml' + } + }, + env: { + SKIP_SLOW_TESTS: 1 + }, + retries: { + runMode: 4 + }, + hmrUrl: 'ws://localhost:3000/ws', + hmrRestartDelay: 5000, + 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('./cypress/plugins/index.js')(on, config); + }, + baseUrl: 'http://localhost:5004' + } +}); diff --git a/cypress.json b/cypress.json deleted file mode 100644 --- a/cypress.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "baseUrl": "http://localhost:5004", - "video": false, - "viewportWidth": 1920, - "viewportHeight": 1080, - "defaultCommandTimeout": 20000, - "requestTimeout": 20000, - "numTestsKeptInMemory": 500, - "reporter": "cypress-multi-reporters", - "reporterOptions": { - "reporterEnabled": "mochawesome, mocha-junit-reporter", - "mochawesomeReporterOptions": { - "reportDir": "cypress/mochawesome/results", - "quiet": true, - "overwrite": false, - "html": false, - "json": true - }, - "mochaJunitReporterReporterOptions": { - "mochaFile": "cypress/junit/results/results-[hash].xml" - } - }, - "env": { - "SKIP_SLOW_TESTS": 1 - }, - "retries": { - "runMode": 4 - }, - "hmrUrl": "ws://localhost:3000/ws", - "hmrRestartDelay": 5000 -} \ No newline at end of file diff --git a/cypress/integration/add-forge-now-request-create.spec.js b/cypress/e2e/add-forge-now-request-create.cy.js rename from cypress/integration/add-forge-now-request-create.spec.js rename to cypress/e2e/add-forge-now-request-create.cy.js diff --git a/cypress/integration/add-forge-now-request-dashboard.spec.js b/cypress/e2e/add-forge-now-request-dashboard.cy.js rename from cypress/integration/add-forge-now-request-dashboard.spec.js rename to cypress/e2e/add-forge-now-request-dashboard.cy.js diff --git a/cypress/integration/add-forge-now-requests-moderation.spec.js b/cypress/e2e/add-forge-now-requests-moderation.cy.js rename from cypress/integration/add-forge-now-requests-moderation.spec.js rename to cypress/e2e/add-forge-now-requests-moderation.cy.js diff --git a/cypress/integration/admin.spec.js b/cypress/e2e/admin.cy.js rename from cypress/integration/admin.spec.js rename to cypress/e2e/admin.cy.js diff --git a/cypress/integration/api-tokens.spec.js b/cypress/e2e/api-tokens.cy.js rename from cypress/integration/api-tokens.spec.js rename to cypress/e2e/api-tokens.cy.js diff --git a/cypress/integration/back-to-top.spec.js b/cypress/e2e/back-to-top.cy.js rename from cypress/integration/back-to-top.spec.js rename to cypress/e2e/back-to-top.cy.js diff --git a/cypress/integration/code-highlighting.spec.js b/cypress/e2e/code-highlighting.cy.js rename from cypress/integration/code-highlighting.spec.js rename to cypress/e2e/code-highlighting.cy.js diff --git a/cypress/integration/content-display.spec.js b/cypress/e2e/content-display.cy.js rename from cypress/integration/content-display.spec.js rename to cypress/e2e/content-display.cy.js diff --git a/cypress/integration/content-rendering.spec.js b/cypress/e2e/content-rendering.cy.js rename from cypress/integration/content-rendering.spec.js rename to cypress/e2e/content-rendering.cy.js diff --git a/cypress/integration/deposit-admin.spec.js b/cypress/e2e/deposit-admin.cy.js rename from cypress/integration/deposit-admin.spec.js rename to cypress/e2e/deposit-admin.cy.js diff --git a/cypress/integration/directory.spec.js b/cypress/e2e/directory.cy.js rename from cypress/integration/directory.spec.js rename to cypress/e2e/directory.cy.js diff --git a/cypress/integration/errors.spec.js b/cypress/e2e/errors.cy.js rename from cypress/integration/errors.spec.js rename to cypress/e2e/errors.cy.js diff --git a/cypress/integration/guided-tour.spec.js b/cypress/e2e/guided-tour.cy.js rename from cypress/integration/guided-tour.spec.js rename to cypress/e2e/guided-tour.cy.js diff --git a/cypress/integration/home.spec.js b/cypress/e2e/home.cy.js rename from cypress/integration/home.spec.js rename to cypress/e2e/home.cy.js diff --git a/cypress/integration/language-select.spec.js b/cypress/e2e/language-select.cy.js rename from cypress/integration/language-select.spec.js rename to cypress/e2e/language-select.cy.js diff --git a/cypress/integration/layout.spec.js b/cypress/e2e/layout.cy.js rename from cypress/integration/layout.spec.js rename to cypress/e2e/layout.cy.js diff --git a/cypress/integration/mailmap.spec.js b/cypress/e2e/mailmap.cy.js rename from cypress/integration/mailmap.spec.js rename to cypress/e2e/mailmap.cy.js diff --git a/cypress/integration/origin-browse.spec.js b/cypress/e2e/origin-browse.cy.js rename from cypress/integration/origin-browse.spec.js rename to cypress/e2e/origin-browse.cy.js diff --git a/cypress/integration/origin-save.spec.js b/cypress/e2e/origin-save.cy.js rename from cypress/integration/origin-save.spec.js rename to cypress/e2e/origin-save.cy.js diff --git a/cypress/integration/origin-search.spec.js b/cypress/e2e/origin-search.cy.js rename from cypress/integration/origin-search.spec.js rename to cypress/e2e/origin-search.cy.js diff --git a/cypress/integration/origin-visits.spec.js b/cypress/e2e/origin-visits.cy.js rename from cypress/integration/origin-visits.spec.js rename to cypress/e2e/origin-visits.cy.js diff --git a/cypress/integration/persistent-identifiers.spec.js b/cypress/e2e/persistent-identifiers.cy.js rename from cypress/integration/persistent-identifiers.spec.js rename to cypress/e2e/persistent-identifiers.cy.js diff --git a/cypress/integration/revision-diff.spec.js b/cypress/e2e/revision-diff.cy.js rename from cypress/integration/revision-diff.spec.js rename to cypress/e2e/revision-diff.cy.js diff --git a/cypress/integration/sidebar.spec.js b/cypress/e2e/sidebar.cy.js rename from cypress/integration/sidebar.spec.js rename to cypress/e2e/sidebar.cy.js diff --git a/cypress/integration/vault.spec.js b/cypress/e2e/vault.cy.js rename from cypress/integration/vault.spec.js rename to cypress/e2e/vault.cy.js diff --git a/cypress/support/index.js b/cypress/support/e2e.js rename from cypress/support/index.js rename to cypress/support/e2e.js diff --git a/package.json b/package.json --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "clean-webpack-plugin": "^4.0.0", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.7.1", - "cypress": "^9.7.0", + "cypress": "^10.0.2", "cypress-hmr-restarter": "^2.0.3", "cypress-multi-reporters": "^1.6.0", "ejs": "^3.1.8", diff --git a/yarn.lock b/yarn.lock --- a/yarn.lock +++ b/yarn.lock @@ -3028,10 +3028,10 @@ debug "^4.1.1" lodash "^4.17.15" -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"