From 2357b52479ebd3ca689a84d95cc937e4ef78e044 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 31 May 2016 13:36:29 +0100 Subject: [PATCH] fix coverage ts problem --- ng2-components/ng2-alfresco-core/karma.conf.js | 2 +- ng2-components/ng2-alfresco-core/package.json | 2 +- .../ng2-alfresco-datatable/karma.conf.js | 2 +- .../ng2-alfresco-datatable/package.json | 2 +- .../ng2-alfresco-documentlist/karma.conf.js | 15 +++++++++------ .../ng2-alfresco-documentlist/package.json | 12 ++++++------ ng2-components/ng2-alfresco-login/karma.conf.js | 2 +- ng2-components/ng2-alfresco-login/package.json | 2 +- ng2-components/ng2-alfresco-search/karma.conf.js | 2 +- ng2-components/ng2-alfresco-search/package.json | 2 +- ng2-components/ng2-alfresco-upload/karma.conf.js | 2 +- ng2-components/ng2-alfresco-upload/package.json | 2 +- ng2-components/ng2-alfresco-viewer/karma.conf.js | 2 +- ng2-components/ng2-alfresco-viewer/package.json | 4 ++-- ng2-components/ng2-alfresco-viewer/tslint.json | 3 --- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ng2-components/ng2-alfresco-core/karma.conf.js b/ng2-components/ng2-alfresco-core/karma.conf.js index bc172e56e5..ba531e9e33 100644 --- a/ng2-components/ng2-alfresco-core/karma.conf.js +++ b/ng2-components/ng2-alfresco-core/karma.conf.js @@ -72,7 +72,7 @@ module.exports = function (config) { reporters: [ {type: 'text'}, {type: 'text-summary'}, - {type: 'json', subdir: '.', file: 'coverage-final.json'}, + {type: 'json', file: 'coverage-final.json'}, {type: 'html'} ] }, diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 30e3ebd8ef..9afe4b3361 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -20,7 +20,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "karma start karma.conf.js --reporters kjhtml ", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html", + "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html", "coverage": "http-server -c-1 -o -p 9875 ./coverage/report", "prepublish": "npm run build" }, diff --git a/ng2-components/ng2-alfresco-datatable/karma.conf.js b/ng2-components/ng2-alfresco-datatable/karma.conf.js index 9b707f91ac..c14a451472 100644 --- a/ng2-components/ng2-alfresco-datatable/karma.conf.js +++ b/ng2-components/ng2-alfresco-datatable/karma.conf.js @@ -72,7 +72,7 @@ module.exports = function (config) { reporters: [ {type: 'text'}, {type: 'text-summary'}, - {type: 'json', subdir: '.', file: 'coverage-final.json'}, + {type: 'json', file: 'coverage-final.json'}, {type: 'html'} ] }, diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index 7307ed4ad1..e3fcd14ead 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -20,7 +20,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "karma start karma.conf.js --reporters kjhtml ", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html", + "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html", "coverage": "http-server -c-1 -o -p 9875 ./coverage/report", "prepublish": "npm run build" }, diff --git a/ng2-components/ng2-alfresco-documentlist/karma.conf.js b/ng2-components/ng2-alfresco-documentlist/karma.conf.js index 04e0b32d88..8b0a1feda7 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma.conf.js +++ b/ng2-components/ng2-alfresco-documentlist/karma.conf.js @@ -59,11 +59,12 @@ module.exports = function (config) { 'karma-jasmine', 'karma-coverage', 'karma-chrome-launcher', - 'karma-mocha-reporter' + 'karma-mocha-reporter', + 'karma-jasmine-html-reporter' ], // Coverage reporter generates the coverage - reporters: ['mocha', 'coverage'], + reporters: ['mocha', 'coverage', 'kjhtml'], // Source files that you wanna generate coverage for. // Do not include tests or libraries (these files will be instrumented by Istanbul) @@ -72,11 +73,13 @@ module.exports = function (config) { }, coverageReporter: { + dir: 'coverage/', + subdir: 'report', reporters: [ - {type: 'json', subdir: '.', file: 'coverage-final.json'} + {type: 'text'}, + {type: 'json', file: 'coverage-final.json'}, + {type: 'html'} ] - }, - - singleRun: true + } }) }; diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 547fbf77a1..3e1485eb35 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -17,12 +17,12 @@ "copy-i18n": "copyfiles './i18n/**/*.json' dist", "licensecheck": "license-check", "tsc": "tsc", - "pretest": "npm run build", - "test": "karma start karma.conf.js", - "test-browser": "karma start karma.conf.js --reporters kjhtml ", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html", - "coverage": "http-server -c-1 -o -p 9875 ./coverage", - "prepublish": "npm run build" + "pretest": "npm run build", + "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", + "test-browser": "karma start karma.conf.js --reporters kjhtml ", + "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html", + "coverage": "http-server -c-1 -o -p 9875 ./coverage/report", + "prepublish": "npm run build" }, "repository": { "type": "git", diff --git a/ng2-components/ng2-alfresco-login/karma.conf.js b/ng2-components/ng2-alfresco-login/karma.conf.js index 7506a784eb..60b5377520 100644 --- a/ng2-components/ng2-alfresco-login/karma.conf.js +++ b/ng2-components/ng2-alfresco-login/karma.conf.js @@ -74,7 +74,7 @@ module.exports = function (config) { reporters: [ {type: 'text'}, {type: 'text-summary'}, - {type: 'json', subdir: '.', file: 'coverage-final.json'}, + {type: 'json', file: 'coverage-final.json'}, {type: 'html'} ] }, diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 5b226ff03f..7aec66501f 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -21,7 +21,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "karma start karma.conf.js --reporters kjhtml ", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html", + "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html", "coverage": "http-server -c-1 -o -p 9875 ./coverage/report", "prepublish": "npm run build" }, diff --git a/ng2-components/ng2-alfresco-search/karma.conf.js b/ng2-components/ng2-alfresco-search/karma.conf.js index d2e5a1e3a0..17aa656b91 100644 --- a/ng2-components/ng2-alfresco-search/karma.conf.js +++ b/ng2-components/ng2-alfresco-search/karma.conf.js @@ -71,7 +71,7 @@ module.exports = function (config) { reporters: [ {type: 'text'}, {type: 'text-summary'}, - {type: 'json', subdir: '.', file: 'coverage-final.json'}, + {type: 'json', file: 'coverage-final.json'}, {type: 'html'} ] }, diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 843a30b0d5..1db21d2a9b 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -19,7 +19,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "karma start karma.conf.js --reporters kjhtml ", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html", + "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html", "coverage": "http-server -c-1 -o -p 9875 ./coverage/report", "prepublish": "npm run build" }, diff --git a/ng2-components/ng2-alfresco-upload/karma.conf.js b/ng2-components/ng2-alfresco-upload/karma.conf.js index 1e1434c90e..19bc811f4e 100644 --- a/ng2-components/ng2-alfresco-upload/karma.conf.js +++ b/ng2-components/ng2-alfresco-upload/karma.conf.js @@ -74,7 +74,7 @@ module.exports = function (config) { subdir: 'report', reporters: [ {type: 'text'}, - {type: 'json', subdir: '.', file: 'coverage-final.json'}, + {type: 'json', file: 'coverage-final.json'}, {type: 'html'} ] }, diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 91fc25d09e..cdad9f7609 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -20,7 +20,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "karma start karma.conf.js --reporters kjhtml ", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html", + "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html", "coverage": "http-server -c-1 -o -p 9875 ./coverage/report", "prepublish": "npm run build" }, diff --git a/ng2-components/ng2-alfresco-viewer/karma.conf.js b/ng2-components/ng2-alfresco-viewer/karma.conf.js index efda133746..26abb1a959 100644 --- a/ng2-components/ng2-alfresco-viewer/karma.conf.js +++ b/ng2-components/ng2-alfresco-viewer/karma.conf.js @@ -71,7 +71,7 @@ module.exports = function (config) { subdir: 'report', reporters: [ {type: 'text'}, - {type: 'json', subdir: '.', file: 'coverage-final.json'}, + {type: 'json', file: 'coverage-final.json'}, {type: 'html'} ] } diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index b3b3ac714e..0cbe3c472a 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-viewer", "description": "Alfresco documents viewer", - "version": "0.1.5", + "version": "0.1.6", "author": "Eugenio Romano", "scripts": { "typings": "typings install", @@ -20,7 +20,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "karma start karma.conf.js --reporters kjhtml ", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html", + "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html", "coverage": "http-server -c-1 -o -p 9875 ./coverage/report", "prepublish": "npm run build" }, diff --git a/ng2-components/ng2-alfresco-viewer/tslint.json b/ng2-components/ng2-alfresco-viewer/tslint.json index aaea73819b..828c3d4f6c 100644 --- a/ng2-components/ng2-alfresco-viewer/tslint.json +++ b/ng2-components/ng2-alfresco-viewer/tslint.json @@ -1,7 +1,4 @@ { - "rulesDirectory": [ - "node_modules/codelyzer" - ], "rules": { "align": [ true,