fix(spec): fix angular#760, fakeAsyncTestSpec should handle microtask…

… with additional args
JiaLiPassion · Apr 27, 2017 · 2639a27 · 2639a27
1 parent bb6aadc
commit 2639a27
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 3 deletions.
diff --git a/lib/zone-spec/fake-async-test.ts b/lib/zone-spec/fake-async-test.ts
@@ -16,6 +16,12 @@
     isPeriodic: boolean;
   }
 
+  interface MicroTaskScheduledFunction {
+    func: Function;
+    args: any[];
+    target: any;
+  }
+
   class Scheduler {
     // Next scheduler id.
     public nextId: number = 0;
@@ -117,7 +123,7 @@
     }
 
     private _scheduler: Scheduler = new Scheduler();
-    private _microtasks: Function[] = [];
+    private _microtasks: MicroTaskScheduledFunction[] = [];
     private _lastError: Error = null;
     private _uncaughtPromiseErrors: {rejection: any}[] =
         (Promise as any)[(Zone as any).__symbol__('uncaughtPromiseErrors')];
@@ -238,7 +244,7 @@
       };
       while (this._microtasks.length > 0) {
         let microtask = this._microtasks.shift();
-        microtask();
+        microtask.func.apply(microtask.target, microtask.args);
       }
       flushErrors();
     }
@@ -262,7 +268,22 @@
     onScheduleTask(delegate: ZoneDelegate, current: Zone, target: Zone, task: Task): Task {
       switch (task.type) {
         case 'microTask':
-          this._microtasks.push(task.invoke);
+          let args = task.data && (task.data as any).args;
+          // should pass additional arguments to callback if have any
+          // currently we know process.nextTick will have such additional
+          // arguments
+          let addtionalArgs: any[];
+          if (args) {
+            let callbackIndex = (task.data as any).callbackIndex;
+            if (typeof args.length === 'number' && args.length > callbackIndex + 1) {
+              addtionalArgs = Array.prototype.slice.call(args, callbackIndex + 1);
+            }
+          }
+          this._microtasks.push({
+            func: task.invoke,
+            args: addtionalArgs,
+            target: task.data && (task.data as any).target
+          });
           break;
         case 'macroTask':
           switch (task.source) {

diff --git a/test/zone-spec/fake-async-test.spec.ts b/test/zone-spec/fake-async-test.spec.ts
@@ -7,8 +7,16 @@
  */
 
 import '../../lib/zone-spec/fake-async-test';
+
+import {isNode} from '../../lib/common/utils';
 import {ifEnvSupports} from '../test-util';
 
+function supportNode() {
+  return isNode;
+}
+
+(supportNode as any).message = 'support node';
+
 describe('FakeAsyncTestZoneSpec', () => {
   let FakeAsyncTestZoneSpec = (Zone as any)['FakeAsyncTestZoneSpec'];
   let testZoneSpec: any;
@@ -527,4 +535,35 @@ describe('FakeAsyncTestZoneSpec', () => {
                }).toThrowError('Cannot make XHRs from within a fake async test.');
              });
            }));
+
+  describe('node process', ifEnvSupports(supportNode, () => {
+             it('should be able to schedule microTask with additional arguments', () => {
+               const process = global['process'];
+               const nextTick = process && process['nextTick'];
+               if (!nextTick) {
+                 return;
+               }
+               fakeAsyncTestZone.run(() => {
+                 let tickRun = false;
+                 let cbArgRun = false;
+                 nextTick(
+                     (strArg: string, cbArg: Function) => {
+                       tickRun = true;
+                       expect(strArg).toEqual('stringArg');
+                       cbArg();
+                     },
+                     'stringArg',
+                     () => {
+                       cbArgRun = true;
+                     });
+
+                 expect(tickRun).toEqual(false);
+
+                 testZoneSpec.flushMicrotasks();
+                 expect(tickRun).toEqual(true);
+                 expect(cbArgRun).toEqual(true);
+               });
+
+             });
+           }));
 });