Improve WatchTestCases

sokra · sokra · commit 21e1e6f8d5ec · 2018-05-01T16:09:44.000+02:00
diff --git a/test/WatchTestCases.test.js b/test/WatchTestCases.test.js
@@ -5,6 +5,7 @@ const path = require("path");
 const fs = require("fs");
 const vm = require("vm");
 const mkdirp = require("mkdirp");
+const rimraf = require("rimraf");
 const checkArrayExpectation = require("./checkArrayExpectation");
 const { remove } = require("./helpers/remove");
 
@@ -76,9 +77,7 @@ describe("WatchTestCases", () => {
 						"js",
 						"watch-src",
 						category.name,
-						`${testName}-${Math.random()
-							.toPrecision(21)
-							.slice(2)}`
+						testName
 					);
 					const testDirectory = path.join(casesPath, category.name, testName);
 					const runs = fs
@@ -89,7 +88,9 @@ describe("WatchTestCases", () => {
 						})
 						.map(name => ({ name }));
 
-					let exportedTests = [];
+					beforeAll(done => {
+						rimraf(tempDirectory, done);
+					});
 
 					it(
 						testName + " should compile",
@@ -201,6 +202,8 @@ describe("WatchTestCases", () => {
 										)
 											return;
 
+										const exportedTests = [];
+
 										function _it(title, fn) {
 											exportedTests.push({ title, fn, timeout: 45000 });
 										}
@@ -293,38 +296,43 @@ describe("WatchTestCases", () => {
 										if (exportedTests.length < 1)
 											return done(new Error("No tests exported by test case"));
 
-										runIdx++;
-										if (runIdx < runs.length) {
-											run = runs[runIdx];
-											waitMode = true;
-											setTimeout(() => {
-												waitMode = false;
-												currentWatchStepModule.step = run.name;
-												copyDiff(
-													path.join(testDirectory, run.name),
-													tempDirectory,
-													false
-												);
-											}, 1500);
-										} else {
-											watching.close();
+										const continueStep = () => {
+											runIdx++;
+											if (runIdx < runs.length) {
+												run = runs[runIdx];
+												waitMode = true;
+												setTimeout(() => {
+													waitMode = false;
+													currentWatchStepModule.step = run.name;
+													copyDiff(
+														path.join(testDirectory, run.name),
+														tempDirectory,
+														false
+													);
+												}, 1500);
+											} else {
+												watching.close();
 
-											const asyncSuite = describe("exported tests", () => {
-												exportedTests.forEach(
-													({ title, fn, timeout }) =>
-														fn
-															? fit(title, fn, timeout)
-															: fit(title, () => {}).pend("Skipped")
-												);
-											});
-											// workaround for jest running clearSpies on the wrong suite (invoked by clearResourcesForRunnable)
-											asyncSuite.disabled = true;
+												done();
+											}
+										};
 
-											jasmine
-												.getEnv()
-												.execute([asyncSuite.id], asyncSuite)
-												.then(done, done);
-										}
+										// Run the tests
+										const asyncSuite = describe(`step ${run.name}`, () => {
+											exportedTests.forEach(
+												({ title, fn, timeout }) =>
+													fn
+														? fit(title, fn, timeout)
+														: fit(title, () => {}).pend("Skipped")
+											);
+										});
+										// workaround for jest running clearSpies on the wrong suite (invoked by clearResourcesForRunnable)
+										asyncSuite.disabled = true;
+
+										jasmine
+											.getEnv()
+											.execute([asyncSuite.id], asyncSuite)
+											.then(continueStep, done);
 									}
 								);
 							}, 300);
