fix(error): fix #706, handleError when onHasTask throw error (#709)

angular · Apr 10, 2017 · f514c11 · f514c11
1 parent 44d507d
commit f514c11
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/zone.ts b/lib/zone.ts
@@ -1091,6 +1091,7 @@ const Zone: ZoneType = (function(global: any) {
             this._hasTaskZS.onHasTask(
                 this._hasTaskDlgt, this._hasTaskCurrZone, targetZone, isEmpty);
       } catch (err) {
+        this.handleError(targetZone, err);
       }
     }
 

diff --git a/test/common/zone.spec.ts b/test/common/zone.spec.ts
@@ -394,6 +394,25 @@ describe('Zone', function() {
         JSON.stringify(macro);
       }).not.toThrow();
     });
+
+    it('should call onHandleError callback when zoneSpec onHasTask throw error', () => {
+      const spy = jasmine.createSpy('error');
+      const hasTaskZone = Zone.current.fork({
+        name: 'hasTask',
+        onHasTask: (delegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
+                    hasTasState: HasTaskState) => {
+          throw new Error('onHasTask Error');
+        },
+        onHandleError:
+            (delegate: ZoneDelegate, currentZone: Zone, targetZone: Zone, error: Error) => {
+              spy(error.message);
+              return delegate.handleError(targetZone, error);
+            }
+      });
+
+      const microTask = hasTaskZone.scheduleMicroTask('test', () => {}, null, () => {});
+      expect(spy).toHaveBeenCalledWith('onHasTask Error');
+    });
   });
 });