diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 49d1bbbdd..48eab94ae 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -84,7 +84,7 @@ jobs: curl -v http://localhost:8081/index.php/login - name: Cypress run - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v4 with: record: true parallel: false diff --git a/cypress.config.js b/cypress.config.js new file mode 100644 index 000000000..9a1051dbe --- /dev/null +++ b/cypress.config.js @@ -0,0 +1,17 @@ +const { defineConfig } = require('cypress') + +module.exports = defineConfig({ + projectId: '1s7wkc', + viewportWidth: 1280, + viewportHeight: 720, + 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://nextcloud.local/index.php', + experimentalSessionAndOrigin: true, + specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}', + }, +}) diff --git a/cypress.json b/cypress.json deleted file mode 100644 index b6fbba8dd..000000000 --- a/cypress.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "baseUrl": "http://nextcloud.local/index.php", - "projectId": "1s7wkc", - "viewportWidth": 1280, - "viewportHeight": 720, - "experimentalSessionAndOrigin": true -} diff --git a/cypress/integration/boardFeatures.js b/cypress/e2e/boardFeatures.js similarity index 100% rename from cypress/integration/boardFeatures.js rename to cypress/e2e/boardFeatures.js diff --git a/cypress/integration/cardFeatures.js b/cypress/e2e/cardFeatures.js similarity index 100% rename from cypress/integration/cardFeatures.js rename to cypress/e2e/cardFeatures.js diff --git a/cypress/integration/deckDashboard.js b/cypress/e2e/deckDashboard.js similarity index 100% rename from cypress/integration/deckDashboard.js rename to cypress/e2e/deckDashboard.js diff --git a/cypress/integration/stackFeatures.js b/cypress/e2e/stackFeatures.js similarity index 100% rename from cypress/integration/stackFeatures.js rename to cypress/e2e/stackFeatures.js diff --git a/cypress/support/index.js b/cypress/support/e2e.js similarity index 100% rename from cypress/support/index.js rename to cypress/support/e2e.js diff --git a/package-lock.json b/package-lock.json index c80618a12..e8347c95c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "@nextcloud/webpack-vue-config": "^5.1.0", "@relative-ci/agent": "^3.1.3", "@vue/test-utils": "^1.3.0", - "cypress": "^9.7.0", + "cypress": "^10.3.0", "jest": "^28.1.2", "jest-serializer-vue": "^2.0.2", "vue-jest": "^3.0.7", @@ -6801,9 +6801,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.3.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.3.0.tgz", + "integrity": "sha512-txkQWKzvBVnWdCuKs5Xc08gjpO89W2Dom2wpZgT9zWZT5jXxqPIxqP/NC1YArtkpmp3fN5HW8aDjYBizHLUFvg==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -24014,9 +24014,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.3.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.3.0.tgz", + "integrity": "sha512-txkQWKzvBVnWdCuKs5Xc08gjpO89W2Dom2wpZgT9zWZT5jXxqPIxqP/NC1YArtkpmp3fN5HW8aDjYBizHLUFvg==", "dev": true, "requires": { "@cypress/request": "^2.88.10", diff --git a/package.json b/package.json index ca0d77cc0..ef9536378 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@nextcloud/webpack-vue-config": "^5.1.0", "@relative-ci/agent": "^3.1.3", "@vue/test-utils": "^1.3.0", - "cypress": "^9.7.0", + "cypress": "^10.3.0", "jest": "^28.1.2", "jest-serializer-vue": "^2.0.2", "vue-jest": "^3.0.7",