dc/ng2-file-upload
4
0
Fork 0
Code Issues 395 Pull Requests 27 Packages Projects Releases 4 Wiki Activity

Fixing test execution on CI

Browse Source
This commit is contained in:
Adrian Fâciu
2017-10-01 17:07:54 +03:00
parent 6bdf60fac4
commit 0df30f996f
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
karma.conf.js
View File

@@ -10,7 +10,7 @@ module.exports = function (config) {
plugins: [ plugins: [
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-remap-istanbul'), require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma') require('@angular/cli/plugins/karma')
], ],
files: [ files: [
@@ -19,18 +19,16 @@ module.exports = function (config) {
preprocessors: { preprocessors: {
'./scripts/test.ts': ['@angular/cli'] './scripts/test.ts': ['@angular/cli']
}, },
remapIstanbulReporter: { coverageIstanbulReporter: {
reports: { reports: [ 'html', 'lcovonly' ],
html: 'coverage', fixWebpackSourcePaths: false
lcovonly: './coverage/coverage.lcov'
}
}, },
angularCli: { angularCli: {
config: './angular-cli.json', config: './angular-cli.json',
environment: 'dev' environment: 'dev'
}, },
reporters: config.angularCli && config.angularCli.codeCoverage reporters: config.angularCli && config.angularCli.codeCoverage
? ['dots', 'karma-remap-istanbul'] ? ['dots', 'coverage-istanbul']
: ['dots'], : ['dots'],
port: 9876, port: 9876,
colors: true, colors: true,

5
package.json
View File

@@ -49,6 +49,7 @@
"@angular/core": "^2.3.1 || >=4.0.0" "@angular/core": "^2.3.1 || >=4.0.0"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "1.0.0",
"@angular/common": "2.4.3", "@angular/common": "2.4.3",
"@angular/compiler": "2.4.3", "@angular/compiler": "2.4.3",
"@angular/compiler-cli": "2.4.3", "@angular/compiler-cli": "2.4.3",
@@ -64,7 +65,6 @@
"@types/marked": "0.0.28", "@types/marked": "0.0.28",
"@types/node": "7.0.0", "@types/node": "7.0.0",
"@types/webpack": "^2.2.1", "@types/webpack": "^2.2.1",
"@angular/cli": "1.0.0",
"bootstrap": "3.3.7", "bootstrap": "3.3.7",
"chokidar-cli": "1.2.0", "chokidar-cli": "1.2.0",
"classlist-polyfill": "1.0.3", "classlist-polyfill": "1.0.3",
@@ -87,6 +87,7 @@
"karma": "1.4.0", "karma": "1.4.0",
"karma-chrome-launcher": "^2.0.0", "karma-chrome-launcher": "^2.0.0",
"karma-cli": "^1.0.1", "karma-cli": "^1.0.1",
"karma-coverage-istanbul-reporter": "^1.3.0",
"karma-jasmine": "^1.0.2", "karma-jasmine": "^1.0.2",
"karma-remap-istanbul": "0.4.0", "karma-remap-istanbul": "0.4.0",
"karma-sauce-launcher": "1.1.0", "karma-sauce-launcher": "1.1.0",
@@ -94,9 +95,9 @@
"lodash": "4.17.4", "lodash": "4.17.4",
"markdown-loader": "^0.1.7", "markdown-loader": "^0.1.7",
"marked": "0.3.6", "marked": "0.3.6",
"ngx-bootstrap": "1.6.6",
"ng2-page-scroll": "4.0.0-beta.2", "ng2-page-scroll": "4.0.0-beta.2",
"ngm-cli": "0.4.0", "ngm-cli": "0.4.0",
"ngx-bootstrap": "1.6.6",
"npm-run-all": "^4.0.1", "npm-run-all": "^4.0.1",
"pre-commit": "1.2.2", "pre-commit": "1.2.2",
"protractor": "5.0.0", "protractor": "5.0.0",