Commit ea70d3a8 authored by Ward Bell's avatar Ward Bell

chore: update for "angular-in-memory-web-api" & latest testing setup

parent 607adf63
...@@ -56,7 +56,7 @@ function importSystemJsExtras(){ ...@@ -56,7 +56,7 @@ function importSystemJsExtras(){
return System.import('systemjs.config.extras.js') return System.import('systemjs.config.extras.js')
.catch(function(reason) { .catch(function(reason) {
console.log( console.log(
'WARNING: System.import could not load "systemjs.config.extras.js"; continuing without it.' 'Warning: System.import could not load the optional "systemjs.config.extras.js". Did you omit it by accident? Continuing without it.'
); );
console.log(reason); console.log(reason);
}); });
......
...@@ -14,7 +14,8 @@ module.exports = function(config) { ...@@ -14,7 +14,8 @@ module.exports = function(config) {
plugins: [ plugins: [
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-htmlfile-reporter') require('karma-jasmine-html-reporter'), // click "Debug" in browser to see it
require('karma-htmlfile-reporter') // crashing w/ strange socket error
], ],
customLaunchers: { customLaunchers: {
...@@ -80,7 +81,8 @@ module.exports = function(config) { ...@@ -80,7 +81,8 @@ module.exports = function(config) {
exclude: [], exclude: [],
preprocessors: {}, preprocessors: {},
reporters: ['progress', 'html'], // disabled HtmlReporter; suddenly crashing w/ strange socket error
reporters: ['progress', 'kjhtml'],//'html'],
// HtmlReporter configuration // HtmlReporter configuration
htmlReporter: { htmlReporter: {
......
...@@ -32,31 +32,35 @@ ...@@ -32,31 +32,35 @@
"@angular/router": "3.0.0", "@angular/router": "3.0.0",
"@angular/upgrade": "2.0.0", "@angular/upgrade": "2.0.0",
"systemjs": "0.19.27", "systemjs": "0.19.38",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"reflect-metadata": "^0.1.3", "reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.12", "rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.23", "zone.js": "^0.6.23",
"angular2-in-memory-web-api": "0.0.20", "angular-in-memory-web-api": "~0.1.0",
"bootstrap": "^3.3.6" "bootstrap": "^3.3.6"
}, },
"devDependencies": { "devDependencies": {
"concurrently": "^2.2.0", "concurrently": "^2.2.0",
"lite-server": "^2.2.0", "lite-server": "^2.2.2",
"typescript": "^2.0.2", "typescript": "^2.0.3",
"typings": "^1.0.4", "typings": "^1.4.0",
"canonical-path": "0.0.2", "canonical-path": "0.0.2",
"http-server": "^0.9.0", "http-server": "^0.9.0",
"tslint": "^3.7.4", "tslint": "^3.15.1",
"lodash": "^4.11.1", "lodash": "^4.16.1",
"jasmine-core": "~2.4.1", "jasmine-core": "~2.5.2",
"karma": "^1.2.0", "karma": "^1.3.0",
"karma-chrome-launcher": "^0.2.3", "karma-chrome-launcher": "^2.0.0",
"karma-cli": "^0.1.2", "karma-cli": "^1.0.1",
"karma-htmlfile-reporter": "^0.2.2", "karma-htmlfile-reporter": "^0.3.4",
"karma-jasmine": "^0.3.8", "karma-jasmine": "^1.0.2",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-phantomjs-launcher": "^1.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^1.8.0",
"protractor": "^3.3.0", "protractor": "^3.3.0",
"rimraf": "^2.5.2" "rimraf": "^2.5.2"
}, },
......
...@@ -22,10 +22,11 @@ ...@@ -22,10 +22,11 @@
'@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
'@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
'@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
'@angular/upgrade': 'npm:@angular/upgrade/bundles/upgrade.umd.js',
// other libraries // other libraries
'rxjs': 'npm:rxjs', 'rxjs': 'npm:rxjs',
'angular2-in-memory-web-api': 'npm:angular2-in-memory-web-api', 'angular-in-memory-web-api': 'npm:angular-in-memory-web-api',
}, },
// packages tells the System loader how to load when no filename and/or no extension // packages tells the System loader how to load when no filename and/or no extension
packages: { packages: {
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
rxjs: { rxjs: {
defaultExtension: 'js' defaultExtension: 'js'
}, },
'angular2-in-memory-web-api': { 'angular-in-memory-web-api': {
main: './index.js', main: './index.js',
defaultExtension: 'js' defaultExtension: 'js'
} }
......
...@@ -78,7 +78,7 @@ function bootstrap (wallaby) { ...@@ -78,7 +78,7 @@ function bootstrap (wallaby) {
return System.import('systemjs.config.extras.js') return System.import('systemjs.config.extras.js')
.catch(function(reason) { .catch(function(reason) {
console.log( console.log(
'WARNING: System.import could not load "systemjs.config.extras.js"; continuing without it.' 'Warning: System.import could not load the optional "systemjs.config.extras.js". Did you omit it by accident? Continuing without it.'
); );
console.log(reason); console.log(reason);
}); });
......
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