diff --git a/.travis.yml b/.travis.yml index a05effad37..042e3f6a6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,7 @@ script: - npm run build - rm -rf node_modules/ng2-bootstrap - npm i ./dist - #angular-cli test coverage is broken - #- npm run test-coverage + - npm run test-coverage - npm run test after_success: diff --git a/karma.conf.js b/karma.conf.js index 1a74f89667..2d7216a571 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -6,18 +6,18 @@ const customLaunchers = require('./scripts/sauce-browsers').customLaunchers; module.exports = function (config) { const configuration = { basePath: '', - frameworks: ['jasmine', 'angular-cli'], + frameworks: ['jasmine', '@angular/cli'], plugins: [ require('karma-jasmine'), require('karma-chrome-launcher'), require('karma-remap-istanbul'), - require('angular-cli/plugins/karma') + require('@angular/cli/plugins/karma') ], files: [ {pattern: './scripts/test.ts', watched: false} ], preprocessors: { - './scripts/test.ts': ['angular-cli'] + './scripts/test.ts': ['@angular/cli'] }, remapIstanbulReporter: { reports: {