From ff88bb43d29711cd6d6c575f6855590455463ae3 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Fri, 19 Aug 2016 09:42:31 -0700
Subject: [PATCH] fix(tasks): do not drain the microtask queue early.

Fixes a bug where a event task invoked inside another task
would drain the microtask queue too early. This would mean that microtasks
would be called unexpectedly in the middle of what should have been
a block of synchronous code.
---
 lib/jasmine/jasmine.ts       | 11 ++++++++++-
 test/browser/element.spec.ts | 24 ++++++++++++++----------
 test/jasmine-patch.spec.ts   |  5 +++++
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/lib/jasmine/jasmine.ts b/lib/jasmine/jasmine.ts
index 890fa3c1f..1818d9aee 100644
--- a/lib/jasmine/jasmine.ts
+++ b/lib/jasmine/jasmine.ts
@@ -102,7 +102,16 @@
     execute() {
       if(Zone.current !== ambientZone) throw new Error("Unexpected Zone: " + Zone.current.name);
       testProxyZone = ambientZone.fork(new ProxyZoneSpec());
-      super.execute();
+      if (!Zone.currentTask) {
+        // if we are not running in a task then if someone would register a
+        // element.addEventListener and then calling element.click() the
+        // addEventListener callback would think that it is the top most task and would
+        // drain the microtask queue on element.click() which would be incorrect.
+        // For this reason we always force a task when running jasmine tests.
+        Zone.current.scheduleMicroTask('jasmine.execute().forceTask', () => super.execute());
+      } else {
+        super.execute();
+      }
     }
   };
 })();
diff --git a/test/browser/element.spec.ts b/test/browser/element.spec.ts
index 327f8398c..8ad23653e 100644
--- a/test/browser/element.spec.ts
+++ b/test/browser/element.spec.ts
@@ -51,16 +51,15 @@ describe('element', function () {
   });
 
   it('should not call microtasks early when an event is invoked', function(done) {
-    // we have to run this test in setTimeout to guarantee that we are running in an existing task
-    setTimeout(() => {
-      var log = '';
+    var log = '';
+    button.addEventListener('click', () => {
       Zone.current.scheduleMicroTask('test', () => log += 'microtask;');
-      button.addEventListener('click', () => log += 'click;');
-      button.click();
-
-      expect(log).toEqual('click;');
-      done();
+      log += 'click;'
     });
+    button.click();
+
+    expect(log).toEqual('click;');
+    done();
   });
 
   it('should call microtasks early when an event is invoked', function(done) {
@@ -80,11 +79,16 @@ describe('element', function () {
      *    eager drainage.
      * 3. Pay the cost of throwing an exception in event tasks and verifying that we are the
      *    top most frame.
+     *
+     * For now we are choosing to ignore it and assume that this arrises in tests only.
+     * As an added measure we make sure that all jasmine tests always run in a task. See: jasmine.ts
      */
     global[Zone['__symbol__']('setTimeout')](() => {
       var log = '';
-      Zone.current.scheduleMicroTask('test', () => log += 'microtask;');
-      button.addEventListener('click', () => log += 'click;');
+      button.addEventListener('click', () => {
+        Zone.current.scheduleMicroTask('test', () => log += 'microtask;');
+        log += 'click;'
+      });
       button.click();
 
       expect(log).toEqual('click;microtask;');
diff --git a/test/jasmine-patch.spec.ts b/test/jasmine-patch.spec.ts
index 345191feb..4c2b1d5f7 100644
--- a/test/jasmine-patch.spec.ts
+++ b/test/jasmine-patch.spec.ts
@@ -1,3 +1,8 @@
+beforeEach(() => {
+  // assert that each jasmine run has a task, so that drainMicrotask works properly.
+  expect(Zone.currentTask).toBeTruthy();
+});
+
 describe('jasmine', () => {
   let throwOnAsync = false;
   let beforeEachZone: Zone = null;