always set collectCoverageFrom

SimenB · SimenB · commit 6e7347eb2bb5 · 2019-11-17T20:11:54.000+01:00
diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts
@@ -1010,6 +1010,8 @@ export default function normalize(
     }
 
     newOptions.collectCoverageFrom = collectCoverageFrom;
+  } else if (!newOptions.collectCoverageFrom) {
+    newOptions.collectCoverageFrom = [];
   }
 
   return {
diff --git a/packages/jest-runtime/src/index.ts b/packages/jest-runtime/src/index.ts
@@ -178,14 +178,7 @@ class Runtime {
     }
   }
 
-  // TODO: Make this `static shouldInstrument = shouldInstrument;` after https://github.com/facebook/jest/issues/7846
-  static shouldInstrument(
-    filename: Config.Path,
-    options: ShouldInstrumentOptions,
-    config: Config.ProjectConfig,
-  ) {
-    return shouldInstrument(filename, options, config);
-  }
+  static shouldInstrument = shouldInstrument;
 
   static createContext(
     config: Config.ProjectConfig,

Original file line number	Diff line number	Diff line change
`@@ -1010,6 +1010,8 @@ export default function normalize(`
`1010`	`1010`	`}`
`1011`	`1011`
`1012`	`1012`	`newOptions.collectCoverageFrom = collectCoverageFrom;`
	`1013`	`+ } else if (!newOptions.collectCoverageFrom) {`
	`1014`	`+ newOptions.collectCoverageFrom = [];`
`1013`	`1015`	`}`
`1014`	`1016`
`1015`	`1017`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -178,14 +178,7 @@ class Runtime {`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		- // TODO: Make this `static shouldInstrument = shouldInstrument;` after https://github.com/facebook/jest/issues/7846
`182`		`- static shouldInstrument(`
`183`		`- filename: Config.Path,`
`184`		`- options: ShouldInstrumentOptions,`
`185`		`- config: Config.ProjectConfig,`
`186`		`- ) {`
`187`		`- return shouldInstrument(filename, options, config);`
`188`		`- }`
	`181`	`+ static shouldInstrument = shouldInstrument;`
`189`	`182`
`190`	`183`	`static createContext(`
`191`	`184`	`config: Config.ProjectConfig,`