chore: Improve JUnit generation

src/custom-reporter.ts

@@ -1,5 +1,5 @@
 /**
- * This is an extension of MochaJunitReporter
+ * This is an extension of mocha-junit-reporter
  */
 
 import xml from 'xml';
@@ -23,7 +23,7 @@
 const Base = Mocha.reporters.Base;
 const debug = Debug('mocha-junit-reporter');
 
 let createStatsCollector: (arg0: any) => void;
 let mocha6plus = false;
 
 try {
@@ -49,7 +49,7 @@
 const INVALID_CHARACTERS_REGEX =
   /[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007f-\u0084\u0086-\u009f\uD800-\uDFFF\uFDD0-\uFDFF\uFFFF\uC008]/g; //eslint-disable-line no-control-regex
 
 function findReporterOptions(options: any): any {
   debug('Checking for options in', options);
   if (!options) {
     debug('No options provided');
@@ -75,7 +75,7 @@
     }, {});
 }
 
 function configureDefaults(options: any): any {
   const config = findReporterOptions(options);
   debug('options', config);
   config.mochaFile = getSetting(
@@ -109,7 +109,7 @@
   return config;
 }
 
 function updateOptionsForAntMode(options: any) {
   options.antHostname = getSetting(
     options.antHostname,
     'ANT_HOSTNAME',
@@ -121,7 +121,7 @@
   }
 }
 
 function updateOptionsForJenkinsMode(options: any) {
   if (options.useFullSuiteTitle === undefined) {
     options.useFullSuiteTitle = true;
   }
@@ -149,10 +149,10 @@
  * @param {function} transform - a transformation function to be used when loading values from the environment
  */
 function getSetting(
   value: any,
   key: string,
   defaultVal: any,
   transform: any | undefined = undefined,
 ) {
   if (process.env[key] !== undefined) {
     const envVal = process.env[key];
@@ -345,7 +345,6 @@
 };
 
 MochaJUnitReporter.prototype.getSauceTestcaseData = function (testcase: any) {
-  // console.log(testcase);
   return {
     id: testcase.order,
     screenshot: 0,

src/cypress-runner.ts

@@ -1,4 +1,4 @@
-import { mergeJunitFile } from './sauce-reporter';
+import { mergeJUnitFile } from './sauce-reporter';
 import path from 'path';
 import fs from 'fs';
 import {
@@ -38,15 +38,15 @@ async function report(
   }
 
   try {
-    mergeJunitFile(
+    mergeJUnitFile(
       specFiles,
       runCfg.resultsDir,
       suiteName,
       browserName,
       platformName,
     );
   } catch (e) {
-    console.error('Failed to generate junit file:', e);
+    console.warn('Skipping JUnit file generation:', e);
   }
 
   try {

src/sauce-reporter.ts

@@ -4,7 +4,7 @@ import { escapeXML } from 'sauce-testrunner-utils';
 import convert from 'xml-js';
 import { XmlSuiteContainer } from './types';
 
-export function mergeJunitFile(
+export function mergeJUnitFile(
   specFiles: any[],
   resultsFolder: string,
   testName: string,
@@ -22,16 +22,21 @@ export function mergeJunitFile(
   } = { compact: true, spaces: 4 };
   const testsuites = [];
   for (let i = 0; i < specFiles.length; i++) {
-    const xmlData = fs.readFileSync(
-      path.join(resultsFolder, `${specFiles[i]}.xml`),
-      'utf8',
-    );
+    const specJUnitFile = path.join(resultsFolder, `${specFiles[i]}.xml`);
+    if (!fs.existsSync(specJUnitFile)) {
+      console.warn(
+        `JUnit file not found for spec: ${specFiles[i]}. Proceeding without it...`,
+      );
+      continue;
+    }
+    const xmlData = fs.readFileSync(specJUnitFile, 'utf8');
     const jsObj = convert.xml2js(xmlData, opts) as XmlSuiteContainer;
     if (jsObj.testsuites && jsObj.testsuites.testsuite) {
       testsuites.push(...jsObj.testsuites.testsuite);
     }
   }
   if (testsuites.length === 0) {
+    console.warn('JUnit file generation skipped: no test suites detected.');
     return;
   }