Merge b2729ad into b4fb57e

package.json

@@ -64,6 +64,11 @@
           "type": "string",
           "default": ""
         },
+        "jest.cli.noColor": {
+          "description": "add jest cli option --no-color",
+          "type": "boolean",
+          "default": true
+        },
         "jest.rootPath": {
           "description": "The path to your frontend src folder",
           "type": "string",
@@ -218,7 +223,7 @@
     "elegant-spinner": "^1.0.1",
     "istanbul-lib-coverage": "^1.1.1",
     "istanbul-lib-source-maps": "^1.1.0",
-    "jest-editor-support": "22.4.0",
+    "jest-editor-support": "^23.0.0-alpha.6r",
     "jest-snapshot": "^22.1.2",
     "jest-test-typescript-parser": "^22.1.3",
     "micromatch": "^2.3.11"

src/JestProcessManagement/JestProcess.ts

@@ -1,5 +1,6 @@
 import { platform } from 'os'
 import { Runner, ProjectWorkspace } from 'jest-editor-support'
+import { getExtensionCliSettings } from '../extension'
 
 export class JestProcess {
   static readonly keepAliveLimit = 5
@@ -19,7 +20,8 @@ export class JestProcess {
     // Use a shell to run Jest command on Windows in order to correctly spawn `.cmd` files
     // For details see https://github.com/jest-community/vscode-jest/issues/98
     const useShell = platform() === 'win32'
-    this.runner = new Runner(this.projectWorkspace, { shell: useShell })
+    const cliSettings = getExtensionCliSettings()
+    this.runner = new Runner(this.projectWorkspace, { shell: useShell, noColor: cliSettings.noColor })
 
     this.restoreJestEvents()
 

src/extension.ts

@@ -92,3 +92,11 @@ function getExtensionSettings(): IPluginSettings {
     restartJestOnSnapshotUpdate: config.get<boolean>('restartJestOnSnapshotUpdate'),
   }
 }
+
+export function getExtensionCliSettings(): { noColor?: boolean } {
+  const config = vscode.workspace.getConfiguration('jest.cli')
+
+  return {
+    noColor: config.get<boolean>('noColor'),
+  }
+}

yarn.lock

@@ -2260,20 +2260,21 @@ jest-diff@^22.4.3:
     jest-get-type "^22.4.3"
     pretty-format "^22.4.3"
 
+jest-diff@^23.0.0-alpha.6r:
+  version "23.0.0-alpha.6r"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.0.0-alpha.6r.tgz#4dda1c7c9f8227496c417e4420cb889721ec11d7"
+  dependencies:
+    chalk "^2.0.1"
+    diff "^3.2.0"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.0.0-alpha.6r"
+
 jest-docblock@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19"
   dependencies:
     detect-newline "^2.1.0"
 
-jest-editor-support@22.4.0:
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/jest-editor-support/-/jest-editor-support-22.4.0.tgz#1f6e2359dbf90f84c1a8a16b911db5ef4333b0a0"
-  dependencies:
-    babel-traverse "^6.14.1"
-    babylon "^6.14.1"
-    jest-snapshot "^22.4.0"
-
 jest-editor-support@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-editor-support/-/jest-editor-support-22.4.3.tgz#3f9e6b60a6ecc2297ec39e0cad7b096e71aea159"
@@ -2282,6 +2283,14 @@ jest-editor-support@^22.4.3:
     babylon "^6.14.1"
     jest-snapshot "^22.4.3"
 
+jest-editor-support@^23.0.0-alpha.6r:
+  version "23.0.0-alpha.6r"
+  resolved "https://registry.yarnpkg.com/jest-editor-support/-/jest-editor-support-23.0.0-alpha.6r.tgz#68e7a0a8c1157206e1b3beb17c1868d4a19854d7"
+  dependencies:
+    babel-traverse "^6.14.1"
+    babylon "^6.14.1"
+    jest-snapshot "^23.0.0-alpha.6r"
+
 jest-environment-jsdom@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e"
@@ -2301,7 +2310,7 @@ jest-get-type@^21.2.0:
   version "21.2.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.2.0.tgz#f6376ab9db4b60d81e39f30749c6c466f40d4a23"
 
-jest-get-type@^22.4.3:
+jest-get-type@^22.1.0, jest-get-type@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
 
@@ -2347,6 +2356,14 @@ jest-matcher-utils@^22.4.3:
     jest-get-type "^22.4.3"
     pretty-format "^22.4.3"
 
+jest-matcher-utils@^23.0.0-alpha.6r:
+  version "23.0.0-alpha.6r"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.0.0-alpha.6r.tgz#890a7dc151e324708d221a5d9f05a4b268439b95"
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.0.0-alpha.6r"
+
 jest-message-util@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7"
@@ -2423,7 +2440,7 @@ jest-serializer@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.3.tgz#a679b81a7f111e4766235f4f0c46d230ee0f7436"
 
-jest-snapshot@^22.1.2, jest-snapshot@^22.4.0, jest-snapshot@^22.4.3:
+jest-snapshot@^22.1.2, jest-snapshot@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2"
   dependencies:
@@ -2434,6 +2451,17 @@ jest-snapshot@^22.1.2, jest-snapshot@^22.4.0, jest-snapshot@^22.4.3:
     natural-compare "^1.4.0"
     pretty-format "^22.4.3"
 
+jest-snapshot@^23.0.0-alpha.6r:
+  version "23.0.0-alpha.6r"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.0.0-alpha.6r.tgz#e43a533b6afc07837ce3ccea93b59f49fc4e11fc"
+  dependencies:
+    chalk "^2.0.1"
+    jest-diff "^23.0.0-alpha.6r"
+    jest-matcher-utils "^23.0.0-alpha.6r"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^23.0.0-alpha.6r"
+
 jest-test-typescript-parser@^22.1.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-test-typescript-parser/-/jest-test-typescript-parser-22.4.3.tgz#805d6e203c1aea5811e7019d998fe1917f130930"
@@ -3472,6 +3500,13 @@ pretty-format@^22.4.3:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
+pretty-format@^23.0.0-alpha.6r:
+  version "23.0.0-alpha.6r"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.0-alpha.6r.tgz#a50d8381a231f8ae231a8255d7e3de7a6c0d2fe5"
+  dependencies:
+    ansi-regex "^3.0.0"
+    ansi-styles "^3.2.0"
+
 private@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"