From da82020be4dcd4296bcc2794ea3ca5b50296a2c7 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Wed, 31 May 2023 11:56:48 +1000
Subject: [PATCH] Cypress config for ci

---
 test/cypress/config/ci.js    | 22 ++++++++++++++++++++++
 test/cypress/config/ci.json  | 14 --------------
 test/cypress/config/dev.json | 14 --------------
 3 files changed, 22 insertions(+), 28 deletions(-)
 create mode 100644 test/cypress/config/ci.js
 delete mode 100644 test/cypress/config/ci.json
 delete mode 100644 test/cypress/config/dev.json

diff --git a/test/cypress/config/ci.js b/test/cypress/config/ci.js
new file mode 100644
index 0000000..83a8f79
--- /dev/null
+++ b/test/cypress/config/ci.js
@@ -0,0 +1,22 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+	requestTimeout:        30000,
+	defaultCommandTimeout: 20000,
+	reporter:              'cypress-multi-reporters',
+	reporterOptions:       {
+		configFile: 'multi-reporter.json'
+	},
+	videosFolder:      'results/videos',
+	screenshotsFolder: 'results/screenshots',
+	env:               {
+		swaggerBase: '{{baseUrl}}/api/schema',
+		RETRIES:     4
+	},
+	e2e: {
+		// baseUrl: '{{baseUrl}}',
+		setupNodeEvents(on, config) {
+			return require('../plugins/index.js')(on, config);
+		},
+	}
+});
diff --git a/test/cypress/config/ci.json b/test/cypress/config/ci.json
deleted file mode 100644
index e11df47..0000000
--- a/test/cypress/config/ci.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"requestTimeout": 30000,
-	"defaultCommandTimeout": 20000,
-	"reporter": "cypress-multi-reporters",
-	"reporterOptions": {
-		"configFile": "multi-reporter.json"
-	},
-	"videosFolder": "results/videos",
-	"screenshotsFolder": "results/screenshots",
-	"env": {
-		"swaggerBase": "{{baseUrl}}/api/schema",
-		"RETRIES": 4
-	}
-}
diff --git a/test/cypress/config/dev.json b/test/cypress/config/dev.json
deleted file mode 100644
index 19492c3..0000000
--- a/test/cypress/config/dev.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"requestTimeout": 30000,
-	"defaultCommandTimeout": 20000,
-	"reporter": "cypress-multi-reporters",
-	"reporterOptions": {
-		"configFile": "multi-reporter.json"
-	},
-	"videos": false,
-	"screenshotsFolder": "results/screenshots",
-	"env": {
-		"swaggerBase": "{{baseUrl}}/api/schema",
-		"RETRIES": 0
-	}
-}