fix(validation): don't warn about the commandRunner options

stryker-mutator · Jul 3, 2020 · 2128b9a · 2128b9a
1 parent 8aa2b8f
commit 2128b9a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/packages/api/schema/stryker-core.json b/packages/api/schema/stryker-core.json
@@ -4,6 +4,17 @@
   "description": "JSON schema for the Stryker Mutator configuration file",
   "type": "object",
   "definitions": {
+    "commandRunnerOptions": {
+      "title": "CommandRunnerOptions",
+      "type": "object",
+      "properties": {
+        "command": {
+          "description": "The command to test each mutant. For example \"npm run mocha\". Defaults to \"npm test\".",
+          "type": "string",
+          "default": "npm test"
+        }
+      }
+    },
     "logLevel": {
       "title": "LogLevel",
       "type": "string",
@@ -200,6 +211,11 @@
       "type": "boolean",
       "default": true
     },
+    "commandRunner": {
+      "description": "Options used by the command test runner. Note: these options will only be used when the command test runner is activated (this is the default)",
+      "$ref": "#/definitions/commandRunnerOptions",
+      "default": {}
+    },
     "coverageAnalysis": {
       "description": "Indicates which coverage analysis strategy to use. During mutation testing, stryker will try to only run the tests that cover a particular line of code.\n\n'perTest': Analyse coverage per test.\n'all': Analyse the coverage for the entire test suite.\n'off' (default): Don't use coverage analysis",
       "type": "string",

diff --git a/packages/core/src/test-runner/CommandTestRunner.ts b/packages/core/src/test-runner/CommandTestRunner.ts
@@ -1,17 +1,13 @@
 import { exec } from 'child_process';
 import * as os from 'os';
 
-import { StrykerOptions } from '@stryker-mutator/api/core';
+import { StrykerOptions, CommandRunnerOptions } from '@stryker-mutator/api/core';
 import { RunResult, RunStatus, TestRunner, TestStatus } from '@stryker-mutator/api/test_runner';
 import { errorToString } from '@stryker-mutator/util';
 
 import { kill } from '../utils/objectUtils';
 import Timer from '../utils/Timer';
 
-export interface CommandRunnerSettings {
-  command: string;
-}
-
 /**
  * A test runner that uses a (bash or cmd) command to execute the tests.
  * Does not know hom many tests are executed or any code coverage results,
@@ -32,17 +28,12 @@ export default class CommandTestRunner implements TestRunner {
     return this.runnerName === name.toLowerCase();
   }
 
-  private readonly settings: CommandRunnerSettings;
+  private readonly settings: CommandRunnerOptions;
 
   private timeoutHandler: undefined | (() => Promise<void>);
 
   constructor(private readonly workingDir: string, options: StrykerOptions) {
-    this.settings = Object.assign(
-      {
-        command: 'npm test',
-      },
-      options.commandRunner
-    );
+    this.settings = options.commandRunner;
   }
 
   public run(): Promise<RunResult> {

diff --git a/packages/core/test/integration/command-test-runner/CommandTestRunner.it.spec.ts b/packages/core/test/integration/command-test-runner/CommandTestRunner.it.spec.ts
@@ -4,8 +4,9 @@ import { RunStatus, TestStatus } from '@stryker-mutator/api/test_runner';
 import { factory } from '@stryker-mutator/test-helpers';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
+import { CommandRunnerOptions } from '@stryker-mutator/api/core';
 
-import CommandTestRunner, { CommandRunnerSettings } from '../../../src/test-runner/CommandTestRunner';
+import CommandTestRunner from '../../../src/test-runner/CommandTestRunner';
 import * as objectUtils from '../../../src/utils/objectUtils';
 
 describe(`${CommandTestRunner.name} integration`, () => {
@@ -48,7 +49,7 @@ describe(`${CommandTestRunner.name} integration`, () => {
     expect(killSpy).called;
   });
 
-  function createSut(settings?: CommandRunnerSettings) {
+  function createSut(settings?: CommandRunnerOptions) {
     const strykerOptions = factory.strykerOptions();
     if (settings) {
       strykerOptions.commandRunner = settings;

diff --git a/packages/core/test/unit/test-runner/CommandTestRunner.spec.ts b/packages/core/test/unit/test-runner/CommandTestRunner.spec.ts
@@ -6,8 +6,9 @@ import { errorToString } from '@stryker-mutator/util';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { factory } from '@stryker-mutator/test-helpers';
+import { CommandRunnerOptions } from '@stryker-mutator/api/core';
 
-import CommandTestRunner, { CommandRunnerSettings } from '../../../src/test-runner/CommandTestRunner';
+import CommandTestRunner from '../../../src/test-runner/CommandTestRunner';
 import * as objectUtils from '../../../src/utils/objectUtils';
 import Timer, * as timerModule from '../../../src/utils/Timer';
 import ChildProcessMock from '../../helpers/ChildProcessMock';
@@ -120,7 +121,7 @@ describe(CommandTestRunner.name, () => {
     return resultPromise;
   }
 
-  function createSut(settings?: CommandRunnerSettings, workingDir = 'workingDir') {
+  function createSut(settings?: CommandRunnerOptions, workingDir = 'workingDir') {
     const strykerOptions = factory.strykerOptions();
     if (settings) {
       strykerOptions.commandRunner = settings;