Merge pull request #21 from drivesoftware/upgrade-karma-jspm

chore(build):

build/tasks/test.js

@@ -1,34 +1,36 @@
 var gulp = require('gulp');
-var karma = require('karma').server;
+var karma = require('karma');
 
 /**
  * Run test once and exit
  */
 gulp.task('test', function (done) {
-    karma.start({
+    var server = new karma.Server({
         configFile: __dirname + '/../../karma.conf.js',
         singleRun: true
     }, function(e) {
         done();
     });
+    server.start();
 });
 
 /**
  * Watch for file changes and re-run tests on each change
  */
 gulp.task('tdd', function (done) {
-    karma.start({
+    var server = new karma.Server({
         configFile: __dirname + '/../../karma.conf.js'
     }, function(e) {
         done();
     });
+    server.start();
 });
 
 /**
  * Run test once with code coverage and exit
  */
 gulp.task('cover', function (done) {
-  karma.start({
+  var server = new karma.Server({
     configFile: __dirname + '/../../karma.conf.js',
     singleRun: true,
     reporters: ['coverage'],
@@ -43,4 +45,5 @@ gulp.task('cover', function (done) {
   }, function (e) {
     done();
   });
+  server.start();
 });

config.js

@@ -1,5 +1,4 @@
 System.config({
-  baseURL: "/",
   defaultJSExtensions: true,
   transpiler: "babel",
   babelOptions: {
@@ -22,7 +21,7 @@ System.config({
     "aurelia-templating": "github:aurelia/[email protected]",
     "babel": "npm:[email protected]",
     "babel-runtime": "npm:[email protected]",
-    "core-js": "npm:[email protected].0",
+    "core-js": "npm:[email protected].1",
     "github:aurelia/[email protected]": {
       "aurelia-dependency-injection": "github:aurelia/[email protected]",
       "aurelia-metadata": "github:aurelia/[email protected]",
@@ -77,7 +76,7 @@ System.config({
       "process": "github:jspm/[email protected]",
       "systemjs-json": "github:systemjs/[email protected]"
     },
-    "npm:[email protected].0": {
+    "npm:[email protected].1": {
       "fs": "github:jspm/[email protected]",
       "process": "github:jspm/[email protected]",
       "systemjs-json": "github:systemjs/[email protected]"

package.json

@@ -34,43 +34,42 @@
     "devDependencies": {
       "babel": "npm:babel-core@^5.8.22",
       "babel-runtime": "npm:babel-runtime@^5.8.20",
-      "core-js": "npm:core-js@^1.1.0",
-      "traceur": "github:jmcriffey/[email protected]",
-      "traceur-runtime": "github:jmcriffey/[email protected]"
+      "core-js": "npm:core-js@^1.1.0"
     }
   },
   "devDependencies": {
-    "aurelia-tools": "^0.1.6",
-    "babel-dts-generator": "^0.2.5",
-    "conventional-changelog": "0.0.11",
-    "del": "^1.1.0",
+    "aurelia-tools": "^0.1.11",
+    "babel-dts-generator": "^0.2.7",
+    "conventional-changelog": "^0.4.2",
+    "del": "^1.2.1",
     "event-stream": "^3.3.1",
-    "gulp": "^3.8.10",
-    "gulp-babel": "^5.1.0",
+    "gulp": "^3.9.0",
+    "gulp-babel": "^5.2.1",
     "gulp-bump": "^0.3.1",
-    "gulp-changed": "^1.2.1",
+    "gulp-changed": "^1.3.0",
     "gulp-concat": "^2.6.0",
+    "gulp-eslint": "^1.0.0",
     "gulp-insert": "^0.4.0",
     "gulp-jshint": "^1.9.0",
     "gulp-less": "^3.0.3",
     "gulp-minify-css": "^1.2.0",
     "gulp-rename": "^1.2.2",
     "gulp-yuidoc": "^0.1.2",
-    "jasmine-core": "^2.1.3",
-    "jshint-stylish": "^1.0.0",
+    "jasmine-core": "^2.3.4",
+    "jshint-stylish": "^2.0.1",
     "jspm": "^0.16.0",
-    "karma": "^0.12.28",
+    "karma": "^0.13.9",
     "karma-babel-preprocessor": "^5.2.1",
-    "karma-chrome-launcher": "^0.1.7",
-    "karma-coverage": "^0.3.1",
-    "karma-jasmine": "^0.3.2",
-    "karma-jspm": "^1.1.5",
-    "object.assign": "^1.0.3",
-    "require-dir": "^0.1.0",
-    "run-sequence": "^1.0.2",
+    "karma-chrome-launcher": "^0.2.0",
+    "karma-coverage": "^0.5.0",
+    "karma-jasmine": "^0.3.6",
+    "karma-jspm": "^2.0.1",
+    "object.assign": "^4.0.1",
+    "require-dir": "^0.3.0",
+    "run-sequence": "^1.1.2",
     "through2": "^2.0.0",
     "vinyl-paths": "^1.0.0",
-    "yargs": "^2.1.1"
+    "yargs": "^3.21.0"
   },
   "aurelia": {
     "usedBy": [],

test/fixtures/test-element.js

@@ -1,4 +1,4 @@
-import {customElement} from 'aurelia-framework';
+import {customElement} from 'aurelia-templating';
 
 @customElement('test-element')
 export class TestElement {

test/unit/dialog-service.spec.js

@@ -22,7 +22,6 @@ describe('the Dialog Service', () => {
     let model = new TestModel();
     let settings = { viewModel: TestElement, model: model };
     let result = dialogService.open(settings);
-    expect(dialogService.model).toEqual(model);
     result.then(resp => {
       spyOn(resp.renderer, 'showDialog');
       expect(resp.renderer.showDialog).toHaveBeenCalled();