Merge pull request #222 from fpirsch/fix-faketimers

stefanpenner · web-flow · commit 9fef04c77d94 · 2016-08-09T08:08:47.000-07:00
Increase compatiblity with faking time in test tools
diff --git a/lib/es6-promise/asap.js b/lib/es6-promise/asap.js
@@ -73,8 +73,11 @@ function useMessageChannel() {
 }
 
 function useSetTimeout() {
+  // Store setTimeout reference so es6-promise will be unaffected by
+  // other code modifying setTimeout (like sinon.useFakeTimers())
+  var globalSetTimeout = setTimeout;
   return function() {
-    setTimeout(flush, 1);
+    globalSetTimeout(flush, 1);
   };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,11 @@ function useMessageChannel() {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`function useSetTimeout() {`
	`76`	`+ // Store setTimeout reference so es6-promise will be unaffected by`
	`77`	`+ // other code modifying setTimeout (like sinon.useFakeTimers())`
	`78`	`+ var globalSetTimeout = setTimeout;`
`76`	`79`	`return function() {`
`77`		`- setTimeout(flush, 1);`
	`80`	`+ globalSetTimeout(flush, 1);`
`78`	`81`	`};`
`79`	`82`	`}`
`80`	`83`