From d3be13182dab7514aaf5a45dfa725d180d4afeca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 21:12:22 +0000 Subject: [PATCH 1/3] build(deps-dev): Bump cypress from 9.7.0 to 10.3.0 Bumps [cypress](https://github.com/cypress-io/cypress) from 9.7.0 to 10.3.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js) - [Commits](https://github.com/cypress-io/cypress/compare/v9.7.0...v10.3.0) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5ff0ed4f6..1452539af 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" @@ -6755,9 +6755,9 @@ } }, "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": { @@ -23940,9 +23940,9 @@ "peer": true }, "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 f2e1e0e97..2931fee7e 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" From c7fb25e3f85247d09c0c0e111b29615580f4e99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 6 Jul 2022 23:37:39 +0200 Subject: [PATCH 2/3] Adapt cypress config and file names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- cypress.config.js | 17 +++++++++++++++++ cypress.json | 7 ------- cypress/{integration => e2e}/boardFeatures.js | 0 cypress/{integration => e2e}/cardFeatures.js | 0 cypress/{integration => e2e}/deckDashboard.js | 0 cypress/{integration => e2e}/stackFeatures.js | 0 cypress/support/{index.js => e2e.js} | 0 7 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 cypress.config.js delete mode 100644 cypress.json rename cypress/{integration => e2e}/boardFeatures.js (100%) rename cypress/{integration => e2e}/cardFeatures.js (100%) rename cypress/{integration => e2e}/deckDashboard.js (100%) rename cypress/{integration => e2e}/stackFeatures.js (100%) rename cypress/support/{index.js => e2e.js} (100%) 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 From 7ac40d2d996e07ee09247e348a7310b24ceb42c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 7 Jul 2022 08:45:46 +0200 Subject: [PATCH 3/3] Bump cypress action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .github/workflows/cypress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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