honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: update zone.js to 0.5.1 

fix #1862
This commit is contained in:
Victor Berchet 2015-05-19 09:13:17 +02:00
parent ad95601e3c
commit 94272af45b
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
karma-js.conf.js
View File

@ -13,6 +13,7 @@ module.exports = function(config) {
// zone-microtask must be included first as it contains a Promise monkey patch // zone-microtask must be included first as it contains a Promise monkey patch
'node_modules/zone.js/dist/zone-microtask.js', 'node_modules/zone.js/dist/zone-microtask.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js', 'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/zone.js/dist/jasmine-patch.js',
'node_modules/traceur/bin/traceur-runtime.js', 'node_modules/traceur/bin/traceur-runtime.js',
'node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js', 'node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js',

7
modules/angular2/src/test_lib/fake_async.ts
View File

@ -25,10 +25,9 @@ interface FakeAsyncZone extends NgZoneZone {
* @returns {Function} The function wrapped to be executed in the fakeAsync zone * @returns {Function} The function wrapped to be executed in the fakeAsync zone
*/ */
export function fakeAsync(fn: Function): Function { export function fakeAsync(fn: Function): Function {
// TODO(vicb) re-enable once the jasmine patch from zone.js is applied if ((<FakeAsyncZone>global.zone)._inFakeAsyncZone) {
// if (global.zone._inFakeAsyncZone) { throw new Error('fakeAsync() calls can not be nested');
// throw new Error('fakeAsync() calls can not be nested'); }
//}
var fakeAsyncZone = <FakeAsyncZone>global.zone.fork({ var fakeAsyncZone = <FakeAsyncZone>global.zone.fork({
setTimeout: _setTimeout, setTimeout: _setTimeout,

12
modules/angular2/test/test_lib/fake_async_spec.ts
View File

@ -37,14 +37,10 @@ export function main() {
it('should work with inject()', it('should work with inject()',
inject([Parser], fakeAsync((parser) => { expect(parser).toBeAnInstanceOf(Parser); }))); inject([Parser], fakeAsync((parser) => { expect(parser).toBeAnInstanceOf(Parser); })));
if (!IS_DARTIUM) { it('should throw on nested calls', () => {
it('should throw on nested calls', () => { expect(() => { fakeAsync(() => { fakeAsync(() => null)(); })(); })
// TODO(vicb): re-enable once the jasmine patch from zone.js is applied .toThrowError('fakeAsync() calls can not be nested');
if (!IS_DARTIUM) return; });
expect(() => { fakeAsync(() => { fakeAsync(() => null)(); })(); })
.toThrowError('fakeAsync() calls can not be nested');
});
}
it('should flush microtasks before returning', () => { it('should flush microtasks before returning', () => {
var thenRan = false; var thenRan = false;

2
npm-shrinkwrap.clean.json
View File

@ -9567,7 +9567,7 @@
} }
}, },
"zone.js": { "zone.js": {
"version": "0.5.0" "version": "0.5.1"
} }
}, },
"name": "angular", "name": "angular",

6
npm-shrinkwrap.json generated
View File

@ -14792,9 +14792,9 @@
} }
}, },
"zone.js": { "zone.js": {
"version": "0.5.0", "version": "0.5.1",
"from": "https://registry.npmjs.org/zone.js/-/zone.js-0.5.0.tgz", "from": "zone.js@0.5.1",
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.5.0.tgz" "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.5.1.tgz"
} }
} }
} }

2
package.json
View File

@ -38,7 +38,7 @@
"systemjs": "^0.9.1", "systemjs": "^0.9.1",
"traceur": "0.0.87", "traceur": "0.0.87",
"which": "~1", "which": "~1",
"zone.js": "0.5.0" "zone.js": "0.5.1"
}, },
"devDependencies": { "devDependencies": {
"angular": "1.3.5", "angular": "1.3.5",