more reliable HMR test cases

sokra · sokra · commit 59527bf3c7cf · 2016-06-29T14:42:21.000+02:00
diff --git a/test/hotCases/chunks/dynamic-system-import/index.js b/test/hotCases/chunks/dynamic-system-import/index.js
@@ -4,13 +4,12 @@ it("should import a changed chunk (dynamic import)", function(done) {
 	}
 	load(1).then(function(chunk) {
 		chunk.value.should.be.eql(1);
-		NEXT(require("../../update")(done));
-		setTimeout(function() {
+		NEXT(require("../../update")(done, true, function() {
 			chunk.value.should.be.eql(2);
 			load(2).then(function(chunk2) {
 				chunk2.value.should.be.eql(2);
 				done();
 			}).catch(done);
-		}, 300);
+		}));
 	}).catch(done);
 });
diff --git a/test/hotCases/chunks/system-import/index.js b/test/hotCases/chunks/system-import/index.js
@@ -3,8 +3,7 @@ it("should import a changed chunk", function(done) {
 		chunk.value.should.be.eql(1);
 		chunk.value2.should.be.eql(3);
 		chunk.counter.should.be.eql(0);
-		NEXT(require("../../update")(done));
-		setTimeout(function() {
+		NEXT(require("../../update")(done, true, function() {
 			chunk.value.should.be.eql(2);
 			chunk.value2.should.be.eql(4);
 			chunk.counter.should.be.eql(1);
@@ -14,6 +13,6 @@ it("should import a changed chunk", function(done) {
 				chunk2.counter.should.be.eql(0);
 				done();
 			}).catch(done);
-		}, 300);
+		}));
 	}).catch(done);
 });
diff --git a/test/hotCases/errors/events/index.js b/test/hotCases/errors/events/index.js
@@ -14,12 +14,11 @@ it("should fire the correct events", function(done) {
 	};
 
 	function waitForUpdate(fn) {
-		NEXT(require("../../update")(done, options));
-		setTimeout(function() {
+		NEXT(require("../../update")(done, options, function() {
 			try {
 				fn();
 			} catch(e) { done(e); }
-		}, 300);
+		}));
 	}
 
 	waitForUpdate(function() {
diff --git a/test/hotCases/errors/unaccepted-ignored/index.js b/test/hotCases/errors/unaccepted-ignored/index.js
@@ -5,12 +5,7 @@ var options = { ignoreUnaccepted: true };
 
 it("should ignore unaccepted module updates", function(done) {
 	function waitForUpdate(fn) {
-		NEXT(require("../../update")(done, options));
-		setTimeout(function() {
-			try {
-				fn();
-			} catch(e) { done(e); }
-		}, 300);
+		NEXT(require("../../update")(done, options, fn));
 	}
 
 	a.should.be.eql(2);
diff --git a/test/hotCases/update.js b/test/hotCases/update.js
@@ -1,6 +1,6 @@
-module.exports = function(done, options) {
+module.exports = function(done, options, callback) {
 	return function() {
-		module.hot.check(options || true).catch(function(err) {
+		module.hot.check(options || true).then(callback || function() {}).catch(function(err) {
 			done(err);
 		});
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-module.exports = function(done, options) {`
	`1`	`+module.exports = function(done, options, callback) {`
`2`	`2`	`return function() {`
`3`		`- module.hot.check(options \|\| true).catch(function(err) {`
	`3`	`+ module.hot.check(options \|\| true).then(callback \|\| function() {}).catch(function(err) {`
`4`	`4`	`done(err);`
`5`	`5`	`});`
`6`	`6`	`}`