fix: change --junit to --output-format=junit

Author: serpi90

packages/selenium-side-runner/src/index.js

@@ -70,11 +70,11 @@ program
   )
   .option(
     '--output-directory [directory]',
-    'Write test results to files, results written in JSON'
+    'Write test results to files, format is defined by --output-format'
   )
   .option(
-    '--junit',
-    'Write test results to files, results written in JUnit XML format'
+    '--output-format [jest | junit]',
+    'Format for the output. (default: jest)'
   )
   .option(
     '--force',
@@ -184,6 +184,51 @@ configuration.baseUrl = program.baseUrl
   ? program.baseUrl
   : configuration.baseUrl
 
+configuration.outputFormat = () => ({
+  jestArguments: [],
+  jestConfiguration: {},
+  packageJsonConfiguration: {},
+})
+if (program.outputDirectory) {
+  const outputDirectory = path.isAbsolute(program.outputDirectory)
+    ? program.outputDirectory
+    : path.join('..', program.outputDirectory)
+  const outputFormatConfigurations = {
+    jest(project) {
+      return {
+        jestArguments: [
+          '--json',
+          '--outputFile',
+          path.join(outputDirectory, `${project.name}.json`),
+        ],
+        jestConfiguration: {},
+        packageJsonConfiguration: {},
+      }
+    },
+    junit(project) {
+      return {
+        jestArguments: [],
+        jestConfiguration: { reporters: ['default', 'jest-junit'] },
+        packageJsonConfiguration: {
+          'jest-junit': {
+            outputDirectory: outputDirectory,
+            outputName: `${project.name}.xml`,
+          },
+        },
+      }
+    },
+  }
+  const format = program.outputFormat ? program.outputFormat : 'jest'
+  configuration.outputFormat = outputFormatConfigurations[format]
+  if (!configuration.outputFormat) {
+    const allowedFormats = Object.keys(outputFormatConfigurations).join(', ')
+    winston.error(
+      `'${format}'is not an output format, allowed values: ${allowedFormats}`
+    )
+    process.exit(1)
+  }
+}
+
 winston.debug(util.inspect(configuration))
 
 let projectPath
@@ -207,7 +252,7 @@ function runProject(project) {
     return Promise.reject(
       new Error(
         `The project ${
-          project.name
+        project.name
         } has no test suites defined, create a suite using the IDE.`
       )
     )
@@ -232,18 +277,9 @@ function runProject(project) {
           ],
           testEnvironment: 'jest-environment-selenium',
           testEnvironmentOptions: configuration,
-          ...(program.junit ? { reporters: ['default', 'jest-junit'] } : {}),
+          ...configuration.outputFormat(project).jestConfiguration,
         },
-        ...(program.junit && program.outputDirectory
-          ? {
-              'jest-junit': {
-                outputDirectory: path.isAbsolute(program.outputDirectory)
-                  ? program.outputDirectory
-                  : '../' + program.outputDirectory,
-                outputName: `${project.name}.xml`,
-              },
-            }
-          : {}),
+        ...configuration.outputFormat(project).packageJsonConfiguration,
         dependencies: project.dependencies || {},
       },
       null,
@@ -269,7 +305,7 @@ function runProject(project) {
           writeJSFile(
             path.join(projectPath, sanitizeFileName(suite.name)),
             `// This file was generated using Selenium IDE\nconst tests = require("./commons.js");${
-              code.globalConfig
+            code.globalConfig
             }${suite.code}${cleanup}`
           )
         } else if (suite.tests.length) {
@@ -283,7 +319,7 @@ function runProject(project) {
                 sanitizeFileName(test.name)
               ),
               `// This file was generated using Selenium IDE\nconst tests = require("../commons.js");${
-                code.globalConfig
+              code.globalConfig
               }${test.code}`
             )
           })
@@ -333,18 +369,7 @@ function runJest(project) {
       `{**/*${program.filter}*/*.test.js,**/*${program.filter}*.test.js}`,
     ]
       .concat(program.maxWorkers ? ['-w', program.maxWorkers] : [])
-      .concat(
-        program.outputDirectory && !program.junit
-          ? [
-              '--json',
-              '--outputFile',
-              path.isAbsolute(program.outputDirectory)
-                ? path.join(program.outputDirectory, `${project.name}.json`)
-                : '../' +
-                  path.join(program.outputDirectory, `${project.name}.json`),
-            ]
-          : []
-      )
+      .concat(configuration.outputFormat(project).jestArguments)
     const opts = {
       cwd: path.join(process.cwd(), projectPath),
       stdio: 'inherit',