From 378164768d200d157af1cc83369aa2f36bd48472 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Fri, 28 Jun 2024 10:08:26 +0100
Subject: [PATCH] fix(testing): pin cypress to 13.11.0 to avoid Xvfb parallel
 issue

---
 e2e/cypress/src/cypress-legacy.test.ts |  3 +--
 packages/cypress/migrations.json       | 12 ++++++++++++
 packages/cypress/src/utils/versions.ts |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/e2e/cypress/src/cypress-legacy.test.ts b/e2e/cypress/src/cypress-legacy.test.ts
index 118267b80924b..8630c91f93d05 100644
--- a/e2e/cypress/src/cypress-legacy.test.ts
+++ b/e2e/cypress/src/cypress-legacy.test.ts
@@ -9,8 +9,7 @@ import {
 
 const TEN_MINS_MS = 600_000;
 
-// TODO(colum): Re-enable after investigation into Cypress 13.12 and Xvfb
-xdescribe('Cypress E2E Test runner (legacy)', () => {
+describe('Cypress E2E Test runner (legacy)', () => {
   beforeAll(() => {
     newProject({ packages: ['@nx/angular', '@nx/react'] });
   });
diff --git a/packages/cypress/migrations.json b/packages/cypress/migrations.json
index dfcc9cccf84ca..40218ed9b55e0 100644
--- a/packages/cypress/migrations.json
+++ b/packages/cypress/migrations.json
@@ -98,6 +98,18 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "19.4.1": {
+      "version": "19.4.1-beta.0",
+      "requires": {
+        "cypress": "^13.0.0"
+      },
+      "packages": {
+        "cypress": {
+          "version": "~13.12.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }
diff --git a/packages/cypress/src/utils/versions.ts b/packages/cypress/src/utils/versions.ts
index 5cea67207f2e9..81df5b9db67d0 100644
--- a/packages/cypress/src/utils/versions.ts
+++ b/packages/cypress/src/utils/versions.ts
@@ -2,7 +2,7 @@ export const nxVersion = require('../../package.json').version;
 export const eslintPluginCypressVersion = '^2.13.4';
 export const typesNodeVersion = '18.16.9';
 export const cypressViteDevServerVersion = '^2.2.1';
-export const cypressVersion = '^13.8.0';
+export const cypressVersion = '~13.12.0';
 export const cypressWebpackVersion = '^3.8.0';
 export const viteVersion = '~5.0.0';
 export const htmlWebpackPluginVersion = '^5.5.0';