chore: update karma to zone 0.6.15 (#2165)

* chore: update karma to zone 0.6.15

* chore: update karma to zone 0.6.16 (Ward's updates)

* chore: add changes to karma-shim

public/docs/_examples/karma-test-shim.js

@@ -28,20 +28,16 @@ System.config({
 });
 
 System.import('systemjs.config.js')
-  .then(function () {
+  .then(() => Promise.all([
-    return Promise.all([
       System.import('@angular/core/testing'),
       System.import('@angular/platform-browser-dynamic/testing')
-    ])
+    ]))
-  })
+  .then((providers) => {
-  .then(function (providers) {
+    var coreTesting = providers[0];
-    var testing = providers[0];
+    var browserTesting = providers[1];
-    var testingBrowser = providers[1];
+    coreTesting.TestBed.initTestEnvironment(
-
+      browserTesting.BrowserDynamicTestingModule,
-    testing.setBaseTestProviders(
+      browserTesting.platformBrowserDynamicTesting());
-      testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
-      testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
-
   })
   .then(function () {
     // Finally, load all spec files.

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/karma-test-shim.1.js

@@ -29,20 +29,16 @@ System.config({
 });
 
 System.import('systemjs.config.js')
-  .then(function () {
+  .then(() => Promise.all([
-    return Promise.all([
       System.import('@angular/core/testing'),
       System.import('@angular/platform-browser-dynamic/testing')
-    ])
+    ]))
-  })
+  .then((providers) => {
-  .then(function (providers) {
+    var coreTesting = providers[0];
-    var testing = providers[0];
+    var browserTesting = providers[1];
-    var testingBrowser = providers[1];
+    coreTesting.TestBed.initTestEnvironment(
-
+      browserTesting.BrowserDynamicTestingModule,
-    testing.setBaseTestProviders(
+      browserTesting.platformBrowserDynamicTesting());
-      testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
-      testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
-
   })
   .then(function () {
     // Finally, load all spec files.

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/karma.conf.ng1.js

@@ -19,10 +19,13 @@ module.exports = function(config) {
 
       // Polyfills
       'node_modules/core-js/client/shim.js',
-
-      // Reflect and Zone.js
       'node_modules/reflect-metadata/Reflect.js',
+
+      // zone.js
       'node_modules/zone.js/dist/zone.js',
+      'node_modules/zone.js/dist/long-stack-trace-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',
       'node_modules/zone.js/dist/fake-async-test.js',

public/docs/_examples/upgrade-phonecat-3-final/ts/karma.conf.ng1.js

@@ -19,10 +19,13 @@ module.exports = function(config) {
 
       // Polyfills
       'node_modules/core-js/client/shim.js',
-
-      // Reflect and Zone.js
       'node_modules/reflect-metadata/Reflect.js',
+
+      // zone.js
       'node_modules/zone.js/dist/zone.js',
+      'node_modules/zone.js/dist/long-stack-trace-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',
       'node_modules/zone.js/dist/fake-async-test.js',

public/docs/_examples/webpack/ts/config/karma-test-shim.js

@@ -5,10 +5,12 @@ require('core-js/es6');
 require('reflect-metadata');
 
 require('zone.js/dist/zone');
+require('zone.js/dist/long-stack-trace-zone');
+require('zone.js/dist/proxy');
+require('zone.js/dist/sync-test');
+require('zone.js/dist/jasmine-patch');
 require('zone.js/dist/async-test');
 require('zone.js/dist/fake-async-test');
-require('zone.js/dist/sync-test');
-require('zone.js/dist/proxy-zone');
 
 var appContext = require.context('../src', true, /\.spec\.ts/);