feat: refactor and test counting zone

btford · btford · commit 648a95dba119 · 2014-03-28T19:08:43.000-07:00
diff --git a/counting-zone.js b/counting-zone.js
@@ -1,21 +1,22 @@
 /*
  * See example/counting.html
  */
-zone.countingZone = {
+Zone.countingZone = {
   '-onZoneCreated': function () {
-    zone.countingZone.counter += 1;
+    Zone.countingZone.counter += 1;
   },
   '+onZoneLeave': function () {
-    zone.countingZone.counter -= 1;
-    if (zone.countingZone.counter === 0) {
+    Zone.countingZone.counter -= 1;
+    if (Zone.countingZone.counter <= 0) {
+      Zone.countingZone.counter = 0;
       this.onFlush();
     }
   },
-  reset: function () {
-    zone.countingZone.counter = 0;
+  '-run': function () {
+    Zone.countingZone.counter = 0;
   },
   counter: function () {
-    return zone.countingZone.counter;
+    return Zone.countingZone.counter;
   },
   onFlush: function () {}
 };
diff --git a/example/counting.html b/example/counting.html
@@ -26,22 +26,22 @@ <h1>Counting Pending Tasks</h1>
     /*
      * Zone that counts pending async tasks
      */
-    var myCountingZone = zone.fork(zone.countingZone).fork({
+    var myCountingZone = zone.fork(Zone.countingZone).fork({
       '+onZoneCreated': function () {
-        zone.countingZone.start || (zone.countingZone.start = Date.now());
+        Zone.countingZone.start || (Zone.countingZone.start = Date.now());
         this.print();
       },
       '-onZoneLeave': function (delegate) {
         this.print();
       },
       '+reset': function (delegate) {
-        zone.countingZone.start = 0;
+        Zone.countingZone.start = 0;
       },
       print: function () {
         counter = this.counter();
         output.innerHTML = counter ?
             'pending task count: ' + counter :
-            ' DONE! ' + (Date.now() - zone.countingZone.start)/1000 + 's';
+            ' DONE! ' + (Date.now() - Zone.countingZone.start)/1000 + 's';
       }
     });
 
diff --git a/test/counting-zone.spec.js b/test/counting-zone.spec.js
@@ -0,0 +1,34 @@
+'use strict';
+
+
+describe('Zone.countingZone', function () {
+  var flushSpy = jasmine.createSpy('flush'),
+      countingZone = zone.fork(Zone.countingZone).fork({
+        onFlush: flushSpy
+      });
+
+  beforeEach(function () {
+    jasmine.Clock.useMock();
+    flushSpy.reset();
+  });
+
+  it('should flush at the end of a run', function () {
+    countingZone.run(function () {});
+    expect(flushSpy).toHaveBeenCalled();
+    expect(countingZone.counter()).toBe(0);
+  });
+
+  it('should work', function () {
+    countingZone.run(function () {
+
+      setTimeout(function () {}, 0);
+      expect(countingZone.counter()).toBe(1);
+
+      //jasmine.Clock.tick(0);
+
+      //expect(countingZone.counter()).toBe(0);
+    });
+
+    //jasmine.Clock.tick(0);
+  });
+});
