Skip to content

M
Moecube Store
Commit 104e0774 authored by Ward Bell's avatar Ward Bell
Browse files
Options

chore: update testing setup to use systemjs.config.js

parent 52cc512d
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 152 deletions
karma-test-shim.js
View file @ 104e0774
...@@ -22,72 +22,33 @@ var allSpecFiles = Object.keys(window.__karma__.files) ...@@ -22,72 +22,33 @@ var allSpecFiles = Object.keys(window.__karma__.files)
.filter(isSpecFile) .filter(isSpecFile)
.filter(isBuiltFile); .filter(isBuiltFile);
////////////////////////// System.config({
// Load our SystemJS configuration.
// map tells the System loader where to look for things
var map = {
'app': 'app',
'@angular': 'node_modules/@angular',
'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
'rxjs': 'node_modules/rxjs'
};
// packages tells the System loader how to load when no filename and/or no extension
var packages = {
'app': { main: 'main.js', defaultExtension: 'js' },
'rxjs': { defaultExtension: 'js' },
'angular2-in-memory-web-api': { defaultExtension: 'js' },
};
var ngPackageNames = [
'common',
'compiler',
'core',
'http',
'platform-browser',
'platform-browser-dynamic',
'router',
'router-deprecated',
'upgrade',
];
// Add package entries for angular packages
ngPackageNames.forEach(function(pkgName) {
// Bundled (~40 requests): DOESN'T WORK IN KARMA OR WALLABY (YET?)
//packages['@angular/'+pkgName] = { main: pkgName + '.umd.js', defaultExtension: 'js' };
// Individual files (~300 requests):
packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' };
});
var config = {
baseURL: '/base', baseURL: '/base',
map: map, packageWithIndex: true // sadly, we can't use umd packages (yet?)
packages: packages });
}
System.config(config);
//////////////
Promise.all([
System.import('@angular/core/testing'),
System.import('@angular/platform-browser-dynamic/testing')
]).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() { System.import('systemjs.config.js')
// Finally, load all spec files. .then(function () {
// This will run the tests directly. return Promise.all([
return Promise.all( System.import('@angular/core/testing'),
allSpecFiles.map(function (moduleName) { System.import('@angular/platform-browser-dynamic/testing')
return System.import(moduleName); ])
})); })
}).then(__karma__.start, __karma__.error); .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() {
// Finally, load all spec files.
// This will run the tests directly.
return Promise.all(
allSpecFiles.map(function (moduleName) {
return System.import(moduleName);
}));
})
.then(__karma__.start, __karma__.error);
karma.conf.js
View file @ 104e0774
...@@ -42,6 +42,7 @@ module.exports = function(config) { ...@@ -42,6 +42,7 @@ module.exports = function(config) {
{pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false},
{pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false}, {pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false},
{pattern: 'systemjs.config.js', included: false, watched: false},
'karma-test-shim.js', 'karma-test-shim.js',
// transpiled application & spec code paths loaded via module imports // transpiled application & spec code paths loaded via module imports
......
systemjs.config.js
View file @ 104e0774
...@@ -32,15 +32,20 @@ ...@@ -32,15 +32,20 @@
'upgrade', 'upgrade',
]; ];
// Add package entries for angular packages // Individual files (~300 requests):
ngPackageNames.forEach(function(pkgName) { function packIndex(pkgName) {
packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' };
}
// Bundled (~40 requests): // Bundled (~40 requests):
function packUmd(pkgName) {
packages['@angular/'+pkgName] = { main: pkgName + '.umd.js', defaultExtension: 'js' }; packages['@angular/'+pkgName] = { main: pkgName + '.umd.js', defaultExtension: 'js' };
};
// Individual files (~300 requests): var setPackageConfig = System.packageWithIndex ? packIndex : packUmd;
//packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' };
}); // Add package entries for angular packages
ngPackageNames.forEach(setPackageConfig);
var config = { var config = {
map: map, map: map,
......
wallaby.js
View file @ 104e0774
...@@ -8,6 +8,7 @@ module.exports = function () { ...@@ -8,6 +8,7 @@ module.exports = function () {
files: [ files: [
// System.js for module loading // System.js for module loading
{pattern: 'node_modules/systemjs/dist/system.js', instrument: false}, {pattern: 'node_modules/systemjs/dist/system.js', instrument: false},
{pattern: 'systemjs.config.js', instrument: false},
// Polyfills // Polyfills
{pattern: 'node_modules/core-js/client/shim.min.js', instrument: false}, {pattern: 'node_modules/core-js/client/shim.min.js', instrument: false},
...@@ -38,89 +39,39 @@ module.exports = function () { ...@@ -38,89 +39,39 @@ module.exports = function () {
bootstrap: function (wallaby) { bootstrap: function (wallaby) {
wallaby.delayStart(); wallaby.delayStart();
systemConfig();
Promise.all([ System.config({
System.import('@angular/core/testing'), packageWithIndex: true // sadly, we can't use umd packages (yet?)
System.import('@angular/platform-browser-dynamic/testing')
])
.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);
// Load all spec files
return Promise.all(wallaby.tests.map(function (specFile) {
return System.import(specFile);
}));
})
.then(function () {
wallaby.start();
})
.catch(function (e) {
setTimeout(function () {
throw e;
}, 0);
}); });
////////////////////////// System.import('systemjs.config.js')
// SystemJS configuration. .then(function () {
function systemConfig() { return Promise.all([
System.import('@angular/core/testing'),
// map tells the System loader where to look for things System.import('@angular/platform-browser-dynamic/testing')
var map = { ])
'app': 'app', })
.then(function (providers) {
'@angular': 'node_modules/@angular', var testing = providers[0];
'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api', var testingBrowser = providers[1];
'rxjs': 'node_modules/rxjs'
}; testing.setBaseTestProviders(
testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
// packages tells the System loader how to load when no filename and/or no extension testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
var packages = {
'app': { main: 'main.js', defaultExtension: 'js' }, // Load all spec files
'rxjs': { defaultExtension: 'js' }, return Promise.all(wallaby.tests.map(function (specFile) {
'angular2-in-memory-web-api': { defaultExtension: 'js' }, return System.import(specFile);
}; }));
})
var ngPackageNames = [ .then(function () {
'common', wallaby.start();
'compiler', })
'core', .catch(function (e) {
'http', setTimeout(function () {
'platform-browser', throw e;
'platform-browser-dynamic', }, 0);
'router',
'router-deprecated',
'upgrade',
];
// Add package entries for angular packages
ngPackageNames.forEach(function(pkgName) {
// Bundled (~40 requests): DOESN'T WORK IN WALLABY OR KARMA (YET?)
// packages['@angular/'+pkgName] = { main: pkgName + '.umd.js', defaultExtension: 'js' };
// Individual files (~300 requests):
packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' };
}); });
var config = {
map: map,
packages: packages
}
System.config(config);
}
//////////////////
} }
}; };
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment