From 9df97b2622e4946991284c99d9222be5e59090c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E4=B9=99=E5=B1=B1?= <pipio1994@gmail.com>
Date: Sun, 26 Apr 2020 16:00:28 +0800
Subject: [PATCH] Address code review suggestion

---
 packages/jest-core/src/SearchSource.ts              |  3 +--
 .../jest-core/src/__tests__/SearchSource.test.ts    | 13 ++++++-------
 packages/jest-transform/src/shouldInstrument.ts     |  3 +--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/jest-core/src/SearchSource.ts b/packages/jest-core/src/SearchSource.ts
index 56ecfaa48ace..48c630f2adb4 100644
--- a/packages/jest-core/src/SearchSource.ts
+++ b/packages/jest-core/src/SearchSource.ts
@@ -352,8 +352,7 @@ export default class SearchSource {
     const dependencyResolver = this._getOrBuildDependencyResolver();
     const relatedSourcesSet = new Set<string>();
     changedFiles.forEach(filePath => {
-      const isTestFile = this.isTestFilePath(filePath);
-      if (isTestFile) {
+      if (this.isTestFilePath(filePath)) {
         const sourcePaths = dependencyResolver.resolve(filePath, {
           skipNodeResolution: this._context.config.skipNodeResolution,
         });
diff --git a/packages/jest-core/src/__tests__/SearchSource.test.ts b/packages/jest-core/src/__tests__/SearchSource.test.ts
index 307e2c2f68b0..0a6815062c85 100644
--- a/packages/jest-core/src/__tests__/SearchSource.test.ts
+++ b/packages/jest-core/src/__tests__/SearchSource.test.ts
@@ -538,7 +538,7 @@ describe('SearchSource', () => {
       '../../../jest-runtime/src/__tests__/test_root',
     );
 
-    beforeEach(done => {
+    beforeEach(async () => {
       const {options: config} = normalize(
         {
           haste: {
@@ -553,12 +553,11 @@ describe('SearchSource', () => {
         },
         {} as Config.Argv,
       );
-      Runtime.createContext(config, {maxWorkers, watchman: false}).then(
-        context => {
-          searchSource = new SearchSource(context);
-          done();
-        },
-      );
+      const context = await Runtime.createContext(config, {
+        maxWorkers,
+        watchman: false,
+      });
+      searchSource = new SearchSource(context);
     });
 
     it('return empty set if no SCM', () => {
diff --git a/packages/jest-transform/src/shouldInstrument.ts b/packages/jest-transform/src/shouldInstrument.ts
index 7f6ef058f7ad..b4d2d66e02d8 100644
--- a/packages/jest-transform/src/shouldInstrument.ts
+++ b/packages/jest-transform/src/shouldInstrument.ts
@@ -93,8 +93,7 @@ export default function shouldInstrument(
     return false;
   }
 
-  if (options.changedFiles) {
-    if (!options.changedFiles.has(filename)) {
+  if (options.changedFiles && !options.changedFiles.has(filename)) {
       if (!options.sourcesRelatedToTestsInChangedFiles) {
         return false;
       }