[CSR-2066] feat: get full test suite from JSON file

packages/cmd/src/lib/fs.ts

@@ -16,8 +16,16 @@ export async function readJsonFile<T>(filePath: string): Promise<T> {
 
 export async function writeFileAsync(filePath: string, content: string) {
   try {
-    await fs.writeFile(filePath, content, 'utf8');
-    return filePath;
+    // Check if file exists
+    try {
+      await fs.access(filePath);
+      // If we reach here, file exists
+      return filePath;
+    } catch {
+      // File doesn't exist, create it
+      await fs.writeFile(filePath, content, 'utf8');
+      return filePath;
+    }
   } catch (err) {
     error(`Error writing file at ${filePath}:`, err);
     throw err;

packages/cmd/src/services/upload/discovery/junit/scanner.ts

@@ -1,21 +1,7 @@
-import fs from 'fs-extra';
-
 import { debug as _debug } from '@debug';
 import { dim, error } from '@logger';
-import { join } from 'path';
-import { parseStringPromise } from 'xml2js';
-import {
-  TestCase,
-  TestSuite,
-  TestSuites,
-} from '../../../../services/convert/types';
-import {
-  ensureArray,
-  generateTestId,
-  getSuiteName,
-  getTestTitle,
-} from '../../../../services/convert/utils';
-import { FullSuiteProject, FullSuiteTest, FullTestSuite } from '../types';
+import fs from 'fs-extra';
+import { getFullTestSuiteFilePath } from '../../../../services/upload';
 
 const debug = _debug.extend('junit-discovery');
 
@@ -25,56 +11,16 @@ export async function jUnitScanner(reportDir: string) {
   try {
     debug('running scanner: %o', reportDir);
 
-    // jUnitFile is the path to the JUnit xml file with all the tests suite and results
-    const xmlFilePath = join(reportDir, 'currents.results.xml');
+    // jUnitFile is the path to the JUnit JSON file with the full test suite data
+    const fullTestSuitePath = getFullTestSuiteFilePath(reportDir);
 
-    // eslint-disable-next-line turbo/no-undeclared-env-vars
-    process.env.CURRENTS_DISCOVERY_PATH = xmlFilePath;
+    process.env.CURRENTS_DISCOVERY_PATH = fullTestSuitePath;
 
-    const fileContent = fs.readFileSync(xmlFilePath, 'utf-8');
+    const fileContent = fs.readFileSync(fullTestSuitePath, 'utf-8');
 
-    const jsonContent = await parseStringPromise(fileContent, {
-      explicitArray: false,
-      mergeAttrs: true,
-    });
-
-    return parseToFullTestSuite(jsonContent);
+    return JSON.parse(fileContent);
   } catch (err) {
     error('Failed to obtain the junit full test suite:', err);
     return [];
   }
 }
-
-function parseToFullTestSuite(jsonContent: TestSuites) {
-  const fullTestSuite: FullTestSuite = [];
-
-  const testsuites = ensureArray<TestSuite>(jsonContent.testsuites?.testsuite);
-
-  const fullSuiteProject: FullSuiteProject = {
-    name: jsonContent.testsuites?.name ?? 'No name',
-    tags: [],
-    tests: [],
-  };
-
-  testsuites?.forEach((suite) => {
-    const suiteName = getSuiteName(suite, testsuites);
-    const testcases = ensureArray<TestCase>(suite?.testcase);
-
-    testcases?.forEach((testcase) => {
-      const fullSuiteTest: FullSuiteTest = {
-        title: getTestTitle(testcase.name, suiteName),
-        spec: suiteName,
-        tags: [],
-        testId: generateTestId(
-          getTestTitle(testcase.name, suiteName).join(', '),
-          suiteName
-        ),
-      };
-
-      fullSuiteProject.tests.push(fullSuiteTest);
-    });
-  });
-  fullTestSuite.push(fullSuiteProject);
-
-  return fullTestSuite;
-}

packages/cmd/src/services/upload/index.ts

@@ -223,7 +223,7 @@ function getMarkerFilePath(reportDir: string) {
   return path.join(reportDir, 'upload.marker.json');
 }
 
-function getFullTestSuiteFilePath(reportDir: string) {
+export function getFullTestSuiteFilePath(reportDir: string) {
   return path.join(reportDir, 'fullTestSuite.json');
 }