fix(core): fix angular#1153, ZoneTask.toString should always be a string

JiaLiPassion · Nov 21, 2018 · 78ffe47 · 78ffe47
1 parent 9ed5712
commit 78ffe47
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/lib/zone.ts b/lib/zone.ts
@@ -1240,7 +1240,7 @@ const Zone: ZoneType = (function(global: any) {
 
     public toString() {
       if (this.data && typeof this.data.handleId !== 'undefined') {
-        return this.data.handleId;
+        return this.data.handleId.toString();
       } else {
         return Object.prototype.toString.call(this);
       }

diff --git a/test/common/toString.spec.ts b/test/common/toString.spec.ts
@@ -47,3 +47,39 @@ describe('global function patch', () => {
        }));
   });
 });
+
+describe('ZoneTask', () => {
+  it('should return handleId.toString if handleId is available', () => {
+    let macroTask1: any = undefined;
+    let macroTask2: any = undefined;
+    let microTask: any = undefined;
+    const zone = Zone.current.fork({
+      name: 'timer',
+      onScheduleTask: (delegate: ZoneDelegate, curr: Zone, target: Zone, task: Task) => {
+        if (task.type === 'macroTask') {
+          if (!macroTask1) {
+            macroTask1 = task;
+          } else {
+            macroTask2 = task;
+          }
+        } else if (task.type === 'microTask') {
+          microTask = task;
+        }
+        return task;
+      }
+    });
+    zone.run(() => {
+      const id1 = setTimeout(() => {});
+      clearTimeout(id1);
+      const id2 = setTimeout(() => {});
+      clearTimeout(id2);
+      Promise.resolve().then(() => {});
+      expect(typeof macroTask1.toString()).toEqual('string');
+      expect(macroTask1.toString()).toEqual(id1.toString());
+      expect(typeof macroTask2.toString()).toEqual('string');
+      expect(macroTask2.toString()).toEqual(id2.toString());
+      expect(macroTask1.toString()).not.toEqual(macroTask2.toString());
+      expect(typeof microTask.toString()).toEqual('string');
+    });
+  });
+});