Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit d38ccde

Browse files
abierbaummhevery
authored andcommitted
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
1 parent d4dd351 commit d38ccde

File tree

4 files changed

+42
-33
lines changed

4 files changed

+42
-33
lines changed

lib/jasmine/jasmine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
// Monkey patch all of the jasmine DSL so that each function runs in appropriate zone.
3333
const jasmineEnv = jasmine.getEnv();
34-
['desribe', 'xdescribe', 'fdescribe'].forEach((methodName) => {
34+
['describe', 'xdescribe', 'fdescribe'].forEach((methodName) => {
3535
let originalJasmineFn: Function = jasmineEnv[methodName];
3636
jasmineEnv[methodName] = function(description: string, specDefinitions: Function) {
3737
return originalJasmineFn.call(this, description, wrapDescribeInZone(specDefinitions));

test/browser/XMLHttpRequest.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import {ifEnvSupports} from '../test-util';
22

33
describe('XMLHttpRequest', function () {
4-
var testZone = Zone.current.fork({name: 'test'});
4+
var testZone: Zone;
5+
6+
beforeEach(() => {
7+
testZone = Zone.current.fork({name: 'test'});
8+
});
59

610
it('should intercept XHRs and treat them as MacroTasks', function(done) {
711
var req: any;

test/common/Promise.spec.ts

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,26 @@ function flushMicrotasks() {
2323

2424
describe('Promise', ifEnvSupports('Promise', function () {
2525
if (!global.Promise) return;
26-
var testZone = Zone.current.fork({name: 'TestZone'});
27-
28-
var log;
29-
var pZone = Zone.current.fork({
30-
name: 'promise-zone',
31-
onScheduleTask: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
32-
task: MicroTask): any =>
33-
{
34-
log.push('scheduleTask');
35-
parentZoneDelegate.scheduleTask(targetZone, task);
36-
}
37-
});
38-
39-
var queueZone = Zone.current.fork(new MicroTaskQueueZoneSpec());
26+
var log: string[];
27+
var queueZone: Zone;
28+
var testZone: Zone;
29+
var pZone: Zone;
4030

4131
beforeEach(() => {
32+
testZone = Zone.current.fork({name: 'TestZone'});
33+
34+
pZone = Zone.current.fork({
35+
name: 'promise-zone',
36+
onScheduleTask: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
37+
task: MicroTask): any =>
38+
{
39+
log.push('scheduleTask');
40+
parentZoneDelegate.scheduleTask(targetZone, task);
41+
}
42+
});
43+
44+
queueZone = Zone.current.fork(new MicroTaskQueueZoneSpec());
45+
4246
log = [];
4347
});
4448

@@ -91,12 +95,12 @@ describe('Promise', ifEnvSupports('Promise', function () {
9195
queueZone.run(() => {
9296
var flush = Zone.current.get('flush');
9397
var queue = Zone.current.get('queue');
94-
var p = new Promise(function (resolve, reject) {
98+
var p = new Promise<string>(function (resolve, reject) {
9599
resolve('RValue');
96-
}).then((v) => {
100+
}).then((v: string) => {
97101
log.push(v);
98102
return 'second value';
99-
}).then((v) => {
103+
}).then((v: string) => {
100104
log.push(v);
101105
});
102106
expect(queue.length).toEqual(1);
@@ -110,12 +114,12 @@ describe('Promise', ifEnvSupports('Promise', function () {
110114
queueZone.run(() => {
111115
var flush = Zone.current.get('flush');
112116
var queue = Zone.current.get('queue');
113-
var p = new Promise(function (resolve, reject) {
117+
var p = new Promise<string>(function (resolve, reject) {
114118
resolve(Promise.resolve('RValue'));
115-
}).then((v) => {
119+
}).then((v: string) => {
116120
log.push(v);
117121
return Promise.resolve('second value');
118-
}).then((v) => {
122+
}).then((v: string) => {
119123
log.push(v);
120124
});
121125
expect(queue.length).toEqual(1);

test/zone-spec/long-stack-trace-zone.spec.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
describe('longStackTraceZone', function () {
2-
var log;
3-
4-
var lstz = Zone.current.fork(Zone['longStackTraceZoneSpec']).fork({
5-
name: 'long-stack-trace-zone-test',
6-
onHandleError: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
7-
error: any): boolean => {
8-
parentZoneDelegate.handleError(targetZone, error);
9-
log.push(error.stack);
10-
return false;
11-
}
12-
});
2+
let log;
3+
let lstz: Zone;
134

145
beforeEach(function () {
6+
lstz = Zone.current.fork(Zone['longStackTraceZoneSpec']).fork({
7+
name: 'long-stack-trace-zone-test',
8+
onHandleError: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
9+
error: any): boolean => {
10+
parentZoneDelegate.handleError(targetZone, error);
11+
log.push(error.stack);
12+
return false;
13+
}
14+
});
15+
1516
log = [];
1617
});
1718

0 commit comments

Comments
 (0)