From d8755693d7bff8cf3b4f1a312a18f0fae65211a1 Mon Sep 17 00:00:00 2001
From: Ryan Manuel <ryanm@cypress.io>
Date: Tue, 7 May 2024 10:10:49 -0500
Subject: [PATCH] chore: fix mocha junit reporter when running mocha <6
 (#29481)

* chore: fix mocha junit reporter when running mocha <6

* Update cli/test/lib/util_spec.js
---
 cli/test/lib/tasks/download_spec.js          |  4 ----
 cli/test/spec_helper.js                      |  3 +++
 patches/mocha-junit-reporter+2.2.0.dev.patch | 13 +++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 patches/mocha-junit-reporter+2.2.0.dev.patch

diff --git a/cli/test/lib/tasks/download_spec.js b/cli/test/lib/tasks/download_spec.js
index 7560fbf48fee..b808492e0389 100644
--- a/cli/test/lib/tasks/download_spec.js
+++ b/cli/test/lib/tasks/download_spec.js
@@ -488,10 +488,6 @@ describe('lib/tasks/download', function () {
   })
 
   context('architecture detection', () => {
-    beforeEach(() => {
-      sinon.stub(os, 'arch')
-    })
-
     context('Apple Silicon/M1', () => {
       function nockDarwinArm64 () {
         return nock('https://download.cypress.io')
diff --git a/cli/test/spec_helper.js b/cli/test/spec_helper.js
index 06dd030427b8..41ff9d6e8b12 100644
--- a/cli/test/spec_helper.js
+++ b/cli/test/spec_helper.js
@@ -97,8 +97,11 @@ sinon.stub = function (obj, method) {
 
 beforeEach(function () {
   sinon.stub(os, 'platform')
+  sinon.stub(os, 'arch')
   sinon.stub(os, 'release')
   sinon.stub(util, 'getOsVersionAsync').resolves('Foo-OsVersion')
+
+  os.arch.returns('x64')
 })
 
 afterEach(function () {
diff --git a/patches/mocha-junit-reporter+2.2.0.dev.patch b/patches/mocha-junit-reporter+2.2.0.dev.patch
new file mode 100644
index 000000000000..00934a95e96e
--- /dev/null
+++ b/patches/mocha-junit-reporter+2.2.0.dev.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/mocha-junit-reporter/index.js b/node_modules/mocha-junit-reporter/index.js
+index fbbed2e..de27092 100644
+--- a/node_modules/mocha-junit-reporter/index.js
++++ b/node_modules/mocha-junit-reporter/index.js
+@@ -366,7 +366,7 @@ MochaJUnitReporter.prototype.getTestcaseData = function(test, err) {
+       message = '';
+     }
+     var failureMessage = err.stack || message;
+-    if (!Base.hideDiff && err.expected !== undefined) {
++    if (!Base.hideDiff && err.expected !== undefined && mocha6plus) {
+         var oldUseColors = Base.useColors;
+         Base.useColors = false;
+         failureMessage += "\n" + Base.generateDiff(err.actual, err.expected);