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

chore: update karma to zone 0.6.15 (#2165)

Browse Source 
* 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
This commit is contained in:
Jesús Rodríguez 2016-08-25 18:18:49 +02:00 committed by Ward Bell
parent 9f0ff2e2a9
commit 460e2070af
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/docs/_examples/karma-test-shim.js
View File

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

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

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

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

@ -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',

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

@ -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',

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

@ -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/);