Re-wrap async done() in try-catch

Due to jestjs/jest#2059, turns out we need those try/catch blocks I tried to remove in the previous PR. Partially reverts lerna#682
evocateur · Mar 20, 2017 · b34a41d · b34a41d
1 parent d34be78
commit b34a41d
Show file tree

Hide file tree

Showing 6 changed files with 809 additions and 586 deletions.
diff --git a/test/BootstrapCommand.js b/test/BootstrapCommand.js
diff --git a/test/ExecCommand.js b/test/ExecCommand.js
@@ -62,8 +62,13 @@ describe("ExecCommand", () => {
 
       execCommand.runCommand(exitWithCode(0, (err) => {
         if (err) return done.fail(err);
-        assert.equal(calls, 2);
-        done();
+
+        try {
+          assert.equal(calls, 2);
+          done();
+        } catch (ex) {
+          done.fail(ex);
+        }
       }));
     });
 
@@ -92,8 +97,13 @@ describe("ExecCommand", () => {
 
       execCommand.runCommand(exitWithCode(0, (err) => {
         if (err) return done.fail(err);
-        assert.equal(calls, 2);
-        done();
+
+        try {
+          assert.equal(calls, 2);
+          done();
+        } catch (ex) {
+          done.fail(ex);
+        }
       }));
     });
 
@@ -117,8 +127,13 @@ describe("ExecCommand", () => {
 
         execCommand.runCommand(exitWithCode(0, (err) => {
           if (err) return done.fail(err);
-          assert.deepEqual(ranInPackages, ["package-1"]);
-          done();
+
+          try {
+            assert.deepEqual(ranInPackages, ["package-1"]);
+            done();
+          } catch (ex) {
+            done.fail(ex);
+          }
         }));
       });
     });

diff --git a/test/ImportCommand.js b/test/ImportCommand.js
@@ -45,15 +45,19 @@ describe("ImportCommand", () => {
       importCommand.runCommand(exitWithCode(0, (err) => {
         if (err) return done.fail(err);
 
-        assert.ok(!pathExists.sync(path.join(testDir, "lerna-debug.log")));
+        try {
+          assert.ok(!pathExists.sync(path.join(testDir, "lerna-debug.log")));
 
-        const lastCommit = ChildProcessUtilities.execSync("git log -1 --format=\"%s\"", { cwd: testDir });
-        assert.equal(lastCommit, "Init external commit");
+          const lastCommit = ChildProcessUtilities.execSync("git log -1 --format=\"%s\"", { cwd: testDir });
+          assert.equal(lastCommit, "Init external commit");
 
-        const packageJson = path.join(testDir, "packages", path.basename(externalDir), "package.json");
-        assert.ok(pathExists.sync(packageJson));
+          const packageJson = path.join(testDir, "packages", path.basename(externalDir), "package.json");
+          assert.ok(pathExists.sync(packageJson));
 
-        done();
+          done();
+        } catch (ex) {
+          done.fail(ex);
+        }
       }));
     });
 
@@ -75,13 +79,17 @@ describe("ImportCommand", () => {
       importCommand.runCommand(exitWithCode(0, (err) => {
         if (err) return done.fail(err);
 
-        const lastCommit = ChildProcessUtilities.execSync("git log -1 --format=\"%s\"", { cwd: testDir });
-        assert.equal(lastCommit, "Moved old-file to new-file");
+        try {
+          const lastCommit = ChildProcessUtilities.execSync("git log -1 --format=\"%s\"", { cwd: testDir });
+          assert.equal(lastCommit, "Moved old-file to new-file");
 
-        const newFilePath = path.join(testDir, "packages", path.basename(externalDir), "new-file");
-        assert.ok(pathExists.sync(newFilePath));
+          const newFilePath = path.join(testDir, "packages", path.basename(externalDir), "new-file");
+          assert.ok(pathExists.sync(newFilePath));
 
-        done();
+          done();
+        } catch (ex) {
+          done.fail(ex);
+        }
       }));
     });