JestProcess.stop returns promise to support more sequential flow

marcinczenko · Jan 30, 2018 · 5727128 · 5727128
1 parent 6714a90
commit 5727128
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/JestExt.ts b/src/JestExt.ts
@@ -207,8 +207,9 @@ export class JestExt {
         if (response) {
           this.jestProcess.runJestWithUpdateForSnapshots(() => {
             if (this.pluginSettings.restartJestOnSnapshotUpdate) {
-              this.jestProcessManager.stopAll()
-              this.startProcess()
+              this.jestProcessManager.stopJestProcess(this.jestProcess).then(() => {
+                this.startProcess()
+              })
               vscode.window.showInformationMessage('Updated Snapshots and restarted Jest.')
             } else {
               vscode.window.showInformationMessage('Updated Snapshots. It will show in your next test run.')

diff --git a/src/JestProcessManagement/JestProcess.ts b/src/JestProcessManagement/JestProcess.ts
@@ -6,6 +6,7 @@ export class JestProcess {
   private projectWorkspace: ProjectWorkspace
   private onExitCallback: Function
   private jestSupportEvents: Map<string, (...args: any[]) => void>
+  private resolve: Function
   private keepAliveCounter: number
   public keepAlive: boolean
   public watchMode: boolean
@@ -28,6 +29,9 @@ export class JestProcess {
           this.startRunner()
         } else if (this.onExitCallback) {
           this.onExitCallback(this)
+          if (this.stopRequested) {
+            this.resolve()
+          }
         }
       }
     })
@@ -72,6 +76,9 @@ export class JestProcess {
     this.keepAliveCounter = 1
     this.jestSupportEvents.clear()
     this.runner.closeProcess()
+    return new Promise(resolve => {
+      this.resolve = resolve
+    })
   }
 
   public runJestWithUpdateForSnapshots(callback) {

diff --git a/src/JestProcessManagement/JestProcessManager.ts b/src/JestProcessManagement/JestProcessManager.ts
@@ -102,7 +102,7 @@ export class JestProcessManager {
 
   public stopJestProcess(jestProcess) {
     this.removeJestProcessReference(jestProcess)
-    jestProcess.stop()
+    return jestProcess.stop()
   }
 
   public get numberOfProcesses() {