fix(zones): bump zone version to 0.6.15 (angular#10953)

juliemr · kara · commit bb7d55244d15 · 2016-08-19T14:35:26.000-07:00
This fixes issues with microtasks being called too early
in certain tests.
diff --git a/karma-js.conf.js b/karma-js.conf.js
@@ -19,7 +19,7 @@ module.exports = function(config) {
 
       'node_modules/zone.js/dist/zone.js',
       'node_modules/zone.js/dist/long-stack-trace-zone.js',
-      'node_modules/zone.js/dist/proxy-zone.js',
+      'node_modules/zone.js/dist/proxy.js',
       'node_modules/zone.js/dist/sync-test.js',
       'node_modules/zone.js/dist/jasmine-patch.js',
       'node_modules/zone.js/dist/async-test.js',
diff --git a/modules/@angular/compiler-cli/integrationtest/test/init.ts b/modules/@angular/compiler-cli/integrationtest/test/init.ts
@@ -13,5 +13,5 @@ require('reflect-metadata');
 require('zone.js/dist/zone-node.js');
 require('zone.js/dist/long-stack-trace-zone.js');
 require('zone.js/dist/sync-test.js');
-require('zone.js/dist/proxy-zone.js');
+require('zone.js/dist/proxy.js');
 require('zone.js/dist/jasmine-patch.js');
diff --git a/modules/@angular/core/testing/async.ts b/modules/@angular/core/testing/async.ts
@@ -70,7 +70,7 @@ function runInTestZone(fn: Function, finishCallback: Function, failCallback: Fun
   if (ProxyZoneSpec === undefined) {
     throw new Error(
         'ProxyZoneSpec is needed for the async() test helper but could not be found. ' +
-        'Please make sure that your environment includes zone.js/dist/proxy-zone.js');
+        'Please make sure that your environment includes zone.js/dist/proxy.js');
   }
   const proxyZoneSpec = ProxyZoneSpec.get();
   ProxyZoneSpec.assertPresent();
diff --git a/modules/@angular/router/karma.conf.js b/modules/@angular/router/karma.conf.js
@@ -21,7 +21,7 @@ module.exports = function(config) {
       // Zone.js dependencies
       'node_modules/zone.js/dist/zone.js',
       'node_modules/zone.js/dist/long-stack-trace-zone.js',
-      'node_modules/zone.js/dist/proxy-zone.js',
+      'node_modules/zone.js/dist/proxy.js',
       'node_modules/zone.js/dist/sync-test.js',
       'node_modules/zone.js/dist/jasmine-patch.js',
       'node_modules/zone.js/dist/async-test.js',
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
@@ -5774,7 +5774,7 @@
       }
     },
     "zone.js": {
-      "version": "0.6.14"
+      "version": "0.6.15"
     }
   },
   "name": "angular-srcs",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "es6-shim": "^0.35.0",
     "reflect-metadata": "^0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.14"
+    "zone.js": "^0.6.15"
   },
   "devDependencies": {
     "@types/angularjs": "^1.5.13-alpha",
diff --git a/tools/cjs-jasmine/index-tools.ts b/tools/cjs-jasmine/index-tools.ts
@@ -6,7 +6,7 @@ var JasmineRunner = require('jasmine');
 var path = require('path');
 // require('es6-shim/es6-shim.js');
 require('zone.js/dist/long-stack-trace-zone.js');
-require('zone.js/dist/proxy-zone.js');
+require('zone.js/dist/proxy.js');
 require('zone.js/dist/sync-test.js');
 require('zone.js/dist/async-test.js');
 require('zone.js/dist/fake-async-test.js');
diff --git a/tools/cjs-jasmine/index.ts b/tools/cjs-jasmine/index.ts
@@ -7,7 +7,7 @@ var path = require('path');
 require('source-map-support').install();
 // require('es6-shim/es6-shim.js');
 require('zone.js/dist/long-stack-trace-zone.js');
-require('zone.js/dist/proxy-zone.js');
+require('zone.js/dist/proxy.js');
 require('zone.js/dist/sync-test.js');
 require('zone.js/dist/async-test.js');
 require('zone.js/dist/fake-async-test.js');

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ function runInTestZone(fn: Function, finishCallback: Function, failCallback: Fun`
`70`	`70`	`if (ProxyZoneSpec === undefined) {`
`71`	`71`	`throw new Error(`
`72`	`72`	`'ProxyZoneSpec is needed for the async() test helper but could not be found. ' +`
`73`		`- 'Please make sure that your environment includes zone.js/dist/proxy-zone.js');`
	`73`	`+ 'Please make sure that your environment includes zone.js/dist/proxy.js');`
`74`	`74`	`}`
`75`	`75`	`const proxyZoneSpec = ProxyZoneSpec.get();`
`76`	`76`	`ProxyZoneSpec.assertPresent();`
Original file line number	Diff line number	Diff line change
`@@ -5774,7 +5774,7 @@`
`5774`	`5774`	`}`
`5775`	`5775`	`},`
`5776`	`5776`	`"zone.js": {`
`5777`		`- "version": "0.6.14"`
	`5777`	`+ "version": "0.6.15"`
`5778`	`5778`	`}`
`5779`	`5779`	`},`
`5780`	`5780`	`"name": "angular-srcs",`