From 268534b3e171a3aa2a5dfc74107a72a77539e8a5 Mon Sep 17 00:00:00 2001 From: Eugene Arshinov Date: Mon, 26 Aug 2019 21:28:12 +0300 Subject: [PATCH] Repair `npm run test` --- angular.json | 3 ++- karma.conf.js | 14 +++----------- package.json | 4 ++-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/angular.json b/angular.json index b05c7e4..89793f5 100644 --- a/angular.json +++ b/angular.json @@ -65,6 +65,7 @@ "karmaConfig": "karma.conf.js", "scripts": [], "styles": [], + "tsConfig": "demo/src/tsconfig.json", "assets": [ "demo/src/assets" ] @@ -111,4 +112,4 @@ "prefix": "" } } -} \ No newline at end of file +} diff --git a/karma.conf.js b/karma.conf.js index c6d7f3d..7b94c20 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -13,26 +13,18 @@ module.exports = function (config) { require('karma-coverage-istanbul-reporter'), require('@angular-devkit/build-angular/plugins/karma') ], - files: [ - {pattern: './scripts/test.ts', watched: false} - ], - preprocessors: { - './scripts/test.ts': ['@angular-devkit/build-angular'] - }, coverageIstanbulReporter: { dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ], fixWebpackSourcePaths: false }, - - reporters: config.angularCli && config.angularCli.codeCoverage - ? ['dots', 'coverage-istanbul'] - : ['dots'], + + reporters: ['dots', 'coverage-istanbul'], port: 9876, colors: true, logLevel: config.LOG_INFO, autoWatch: true, browsers: ['Chrome'], - singleRun: false, + singleRun: true, customLaunchers: { Chrome_travis_ci: { base: 'Chrome', diff --git a/package.json b/package.json index f5b3f62..59b5de2 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,8 @@ "build.watch": "ngm build -p src --watch --skip-bundles", "start": "ng serve --aot", "pretest": "run-s lint build link", - "test": "ng test -sr", - "test-coverage": "ng test -sr -cc", + "test": "ng test", + "test-coverage": "ng test --code-coverage", "version": "npm run flow.changelog && git add -A" }, "main": "bundles/ng2-file-upload.umd.js",