always set collectCoverageFrom

jestjs · Nov 17, 2019 · 6e7347e · 6e7347e
1 parent 454a68e
commit 6e7347e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
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,