chore: fix mocha junit reporter when running mocha <6

cypress-io · May 7, 2024 · 39ab043 · 39ab043
1 parent f14a11a
commit 39ab043
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git 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/lib/util_spec.js b/cli/test/lib/util_spec.js
@@ -21,6 +21,7 @@ describe('util', () => {
   context('.isBrokenGtkDisplay', () => {
     it('detects only GTK message', () => {
       os.platform.returns('linux')
+      os.arch.returns('x64')
       const text = '[some noise here] Gtk: cannot open display: 99'
 
       expect(util.isBrokenGtkDisplay(text)).to.be.true

diff --git 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
@@ -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);