From 66f8c0b37f77eb8c862bcbbfbc518c61e619b439 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 22 Sep 2023 12:02:19 +0530
Subject: [PATCH] chore: Fix cypress configuration to support cy13

---
 cypress.config.js           |  1 +
 cypress/support/commands.js | 24 ++++++++++++++++--------
 cypress/support/e2e.js      |  4 ----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/cypress.config.js b/cypress.config.js
index 2fdf10ca14..96f89b8152 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -20,6 +20,7 @@ module.exports = defineConfig({
 		setupNodeEvents(on, config) {
 			return require("./cypress/plugins/index.js")(on, config);
 		},
+		testIsolation: false,
 		baseUrl: "http://test_site_ui:8000",
 		specPattern: ["./cypress/integration/*.js", "**/ui_test_*.js"],
 	},
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 23b03549fa..7252044fc1 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -32,16 +32,24 @@ Cypress.Commands.add("login", (email, password) => {
 		email = Cypress.config("testUser") || "Administrator";
 	}
 	if (!password) {
-		password = Cypress.env("adminPassword");
+		password = Cypress.env("adminPassword") || "admin";
 	}
-	return cy.request({
-		url: "/api/method/login",
-		method: "POST",
-		body: {
-			usr: email,
-			pwd: password,
+	cy.session(
+		[email, password] || "",
+		() => {
+			return cy.request({
+				url: "/api/method/login",
+				method: "POST",
+				body: {
+					usr: email,
+					pwd: password,
+				},
+			});
 		},
-	});
+		{
+			cacheAcrossSpecs: true,
+		}
+	);
 });
 
 Cypress.Commands.add("call", (method, args) => {
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
index 8ce8317a2f..10fb3771af 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -23,7 +23,3 @@ Cypress.on("uncaught:exception", (err, runnable) => {
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
-
-Cypress.Cookies.defaults({
-	preserve: "sid",
-});