From dbeedaa2bc4cd9fe80d4fdd7debafd3d9ac71b8e Mon Sep 17 00:00:00 2001
From: andreiggr <andrei.ggr@gmail.com>
Date: Tue, 13 Sep 2022 14:13:18 +0300
Subject: [PATCH] update to cy10.7

---
 cypress.config.js                             | 26 +++++++++++++++++++
 cypress.json                                  | 17 ------------
 .../block-basics.cy.js}                       |  2 +-
 cypress/support/{index.js => e2e.js}          |  0
 package.json                                  |  5 ++--
 5 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 cypress.config.js
 delete mode 100644 cypress.json
 rename cypress/{integration/block-basics.js => e2e/block-basics.cy.js} (93%)
 rename cypress/support/{index.js => e2e.js} (100%)

diff --git a/cypress.config.js b/cypress.config.js
new file mode 100644
index 0000000..1705820
--- /dev/null
+++ b/cypress.config.js
@@ -0,0 +1,26 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  viewportWidth: 1280,
+  defaultCommandTimeout: 8888,
+  reporter: 'junit',
+  video: true,
+  reporterOptions: {
+    mochaFile: 'cypress/reports/cypress-[hash].xml',
+    jenkinsMode: true,
+    toConsole: true,
+  },
+  chromeWebSecurity: false,
+  retries: {
+    runMode: 8,
+    openMode: 0,
+  },
+  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:3000',
+  },
+})
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index a8894dd..0000000
--- a/cypress.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "baseUrl": "http://localhost:3000",
-  "viewportWidth": 1280,
-  "defaultCommandTimeout": 8888,
-  "reporter": "junit",
-  "video": true,
-  "reporterOptions": {
-    "mochaFile": "cypress/reports/cypress-[hash].xml",
-    "jenkinsMode": true,
-    "toConsole": true
-  },
-  "chromeWebSecurity": false,
-  "retries": {
-    "runMode": 8,
-    "openMode": 0
-  }
-}
diff --git a/cypress/integration/block-basics.js b/cypress/e2e/block-basics.cy.js
similarity index 93%
rename from cypress/integration/block-basics.js
rename to cypress/e2e/block-basics.cy.js
index 5cba365..e5bb015 100644
--- a/cypress/integration/block-basics.js
+++ b/cypress/e2e/block-basics.cy.js
@@ -1,4 +1,4 @@
-import { setupBeforeEach, tearDownAfterEach } from '../support';
+import { setupBeforeEach, tearDownAfterEach } from '../support/e2e';
 
 describe('Blocks Tests', () => {
   beforeEach(setupBeforeEach);
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.json b/package.json
index bc06029..a8ee404 100644
--- a/package.json
+++ b/package.json
@@ -25,9 +25,9 @@
     "@eeacms/volto-matomo"
   ],
   "dependencies": {
-    "@eeacms/volto-eea-map": "*",
     "@eeacms/volto-addons-forest": "*",
     "@eeacms/volto-datablocks": "*",
+    "@eeacms/volto-eea-map": "*",
     "@eeacms/volto-matomo": "*",
     "@eeacms/volto-openlayers-map": "0.1.4",
     "@eeacms/volto-plotlycharts": "*",
@@ -38,7 +38,8 @@
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",
-    "babel-plugin-transform-class-properties": "^6.24.1"
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "cypress": "10.7.0"
   },
   "scripts": {
     "release": "release-it",