fix(jasmine): spelling error of 'describe' in jasmine patch prevented…

… application of sync zone Looks like a spelling error was preventing the jasmine patch from patching "describe". This in turn meant that the describe would not run in the sync zone. Closes #412
angular · Aug 22, 2016 · d38ccde · d38ccde
1 parent d4dd351
commit d38ccde
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 33 deletions.
diff --git a/lib/jasmine/jasmine.ts b/lib/jasmine/jasmine.ts
@@ -31,7 +31,7 @@
 
   // Monkey patch all of the jasmine DSL so that each function runs in appropriate zone.
   const jasmineEnv = jasmine.getEnv();
-  ['desribe', 'xdescribe', 'fdescribe'].forEach((methodName) => {
+  ['describe', 'xdescribe', 'fdescribe'].forEach((methodName) => {
     let originalJasmineFn: Function = jasmineEnv[methodName];
     jasmineEnv[methodName] = function(description: string, specDefinitions: Function) {
       return originalJasmineFn.call(this, description,  wrapDescribeInZone(specDefinitions));

diff --git a/test/browser/XMLHttpRequest.spec.ts b/test/browser/XMLHttpRequest.spec.ts
@@ -1,7 +1,11 @@
 import {ifEnvSupports} from '../test-util';
 
 describe('XMLHttpRequest', function () {
-  var testZone = Zone.current.fork({name: 'test'});
+  var testZone: Zone;
+
+  beforeEach(() => {
+    testZone = Zone.current.fork({name: 'test'});
+  });
 
   it('should intercept XHRs and treat them as MacroTasks', function(done) {
     var req: any;

diff --git a/test/common/Promise.spec.ts b/test/common/Promise.spec.ts
@@ -23,22 +23,26 @@ function flushMicrotasks() {
 
 describe('Promise', ifEnvSupports('Promise', function () {
   if (!global.Promise) return;
-  var testZone = Zone.current.fork({name: 'TestZone'});
-
-  var log;
-  var pZone = Zone.current.fork({
-    name: 'promise-zone',
-    onScheduleTask: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
-                     task: MicroTask): any =>
-    {
-      log.push('scheduleTask');
-      parentZoneDelegate.scheduleTask(targetZone, task);
-    }
-  });
-
-  var queueZone = Zone.current.fork(new MicroTaskQueueZoneSpec());
+  var log: string[];
+  var queueZone: Zone;
+  var testZone: Zone;
+  var pZone: Zone;
 
   beforeEach(() => {
+    testZone = Zone.current.fork({name: 'TestZone'});
+
+    pZone = Zone.current.fork({
+      name: 'promise-zone',
+      onScheduleTask: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
+                       task: MicroTask): any =>
+      {
+        log.push('scheduleTask');
+        parentZoneDelegate.scheduleTask(targetZone, task);
+      }
+    });
+
+    queueZone = Zone.current.fork(new MicroTaskQueueZoneSpec());
+
     log = [];
   });
 
@@ -91,12 +95,12 @@ describe('Promise', ifEnvSupports('Promise', function () {
     queueZone.run(() => {
       var flush = Zone.current.get('flush');
       var queue = Zone.current.get('queue');
-      var p = new Promise(function (resolve, reject) {
+      var p = new Promise<string>(function (resolve, reject) {
         resolve('RValue');
-      }).then((v) => {
+      }).then((v: string) => {
         log.push(v);
         return 'second value';
-      }).then((v) => {
+      }).then((v: string) => {
         log.push(v);
       });
       expect(queue.length).toEqual(1);
@@ -110,12 +114,12 @@ describe('Promise', ifEnvSupports('Promise', function () {
     queueZone.run(() => {
       var flush = Zone.current.get('flush');
       var queue = Zone.current.get('queue');
-      var p = new Promise(function (resolve, reject) {
+      var p = new Promise<string>(function (resolve, reject) {
         resolve(Promise.resolve('RValue'));
-      }).then((v) => {
+      }).then((v: string) => {
         log.push(v);
         return Promise.resolve('second value');
-      }).then((v) => {
+      }).then((v: string) => {
         log.push(v);
       });
       expect(queue.length).toEqual(1);

diff --git a/test/zone-spec/long-stack-trace-zone.spec.ts b/test/zone-spec/long-stack-trace-zone.spec.ts
@@ -1,17 +1,18 @@
 describe('longStackTraceZone', function () {
-  var log;
-
-  var lstz = Zone.current.fork(Zone['longStackTraceZoneSpec']).fork({
-    name: 'long-stack-trace-zone-test',
-    onHandleError: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
-                   error: any): boolean => {
-      parentZoneDelegate.handleError(targetZone, error);
-      log.push(error.stack);
-      return false;
-    }
-  });
+  let log;
+  let lstz: Zone;
 
   beforeEach(function () {
+    lstz = Zone.current.fork(Zone['longStackTraceZoneSpec']).fork({
+      name: 'long-stack-trace-zone-test',
+      onHandleError: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
+                      error: any): boolean => {
+        parentZoneDelegate.handleError(targetZone, error);
+        log.push(error.stack);
+        return false;
+      }
+    });
+
     log = [];
   });