diff --git a/build/tasks/test.js b/build/tasks/test.js index 7188475..d45f4e5 100644 --- a/build/tasks/test.js +++ b/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(); }); diff --git a/config.js b/config.js index df4fbfc..b208e07 100644 --- a/config.js +++ b/config.js @@ -1,5 +1,4 @@ System.config({ - baseURL: "/", defaultJSExtensions: true, transpiler: "babel", babelOptions: { @@ -22,7 +21,7 @@ System.config({ "aurelia-templating": "github:aurelia/templating@0.14.4", "babel": "npm:babel-core@5.8.22", "babel-runtime": "npm:babel-runtime@5.8.20", - "core-js": "npm:core-js@1.1.0", + "core-js": "npm:core-js@1.1.1", "github:aurelia/binding@0.8.6": { "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.9.2", "aurelia-metadata": "github:aurelia/metadata@0.7.3", @@ -77,7 +76,7 @@ System.config({ "process": "github:jspm/nodelibs-process@0.1.1", "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, - "npm:core-js@1.1.0": { + "npm:core-js@1.1.1": { "fs": "github:jspm/nodelibs-fs@0.1.2", "process": "github:jspm/nodelibs-process@0.1.1", "systemjs-json": "github:systemjs/plugin-json@0.1.0" diff --git a/package.json b/package.json index 6736aa5..f20c85f 100644 --- a/package.json +++ b/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/bower-traceur@0.0.87", - "traceur-runtime": "github:jmcriffey/bower-traceur-runtime@0.0.87" + "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": [], diff --git a/test/fixtures/test-element.js b/test/fixtures/test-element.js index 5944948..3ffdff0 100644 --- a/test/fixtures/test-element.js +++ b/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 { diff --git a/test/unit/dialog-service.spec.js b/test/unit/dialog-service.spec.js index 49a9175..8928038 100644 --- a/test/unit/dialog-service.spec.js +++ b/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();