partially fix coverage reporting

ZenyWay · Aug 18, 2018 · ff6b2a1 · ff6b2a1
1 parent b5ec30a
commit ff6b2a1
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 40 deletions.
diff --git a/package.json b/package.json
@@ -12,10 +12,11 @@
     "pretest": "mkdirp spec/reports && rimraf spec/reports/*",
     "test": "karma start spec/karma.conf.js --single-run",
     "test:debug": "karma start spec/karma.conf.js --no-single-run",
-    "test:coverage": "npm run pretest && karma start spec/karma-coverage.conf.js --single-run && remap-istanbul -i spec/reports/coverage/chrom*/coverage.json -o spec/reports/coverage -t html && http-server -c-1 -o -p 8888 spec/reports/coverage",
+    "test:coverage": "npm run test:ci && npm run test:coverage:serve",
+    "test:coverage:serve": "http-server -c-1 -o -p 8888 spec/reports/coverage/html",
     "pretest:ci": "mkdirp spec/reports/coverage && rimraf spec/reports/coverage",
+    "test:ci": "karma start spec/karma-coverage.conf.js --single-run",
     "test:ci:coveralls": "cat spec/reports/coverage/lcov.info | sed -e 's/SF:\\.\\.\\//SF:/' | coveralls",
-    "test:ci": "karma start spec/karma-coverage.conf.js --single-run && remap-istanbul -i spec/reports/coverage/chrom*/coverage.json -o spec/reports/coverage/lcov.info -t lcovonly",
     "test:web:serve": "http-server -c-1 -o -p 6510 spec/web",
     "pretest:web": "rimraf spec/web/*.js",
     "test:web": "npm run test:web:bundle && npm run test:web:serve",
@@ -58,25 +59,22 @@
     "bundle-collapser": "^1.3.0",
     "common-shakeify": "^0.4.6",
     "coveralls": "^3.0.2",
-    "eslint": "^5.3.0",
-    "eslint-plugin-typescript": "^0.12.0",
     "http-server": "^0.11.1",
-    "istanbul": "^0.4.5",
     "jasmine": "^3.2.0",
     "jasmine-core": "^3.2.1",
     "jasmine-ts": "^0.2.1",
     "karma": "^3.0.0",
     "karma-browserify": "^5.3.0",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.2",
+    "karma-coverage-istanbul-reporter": "^2.0.1",
     "karma-firefox-launcher": "^1.1.0",
     "karma-jasmine": "^1.1.2",
     "karma-jasmine-html-reporter": "^1.3.0",
     "karma-junit-reporter": "^1.2.0",
     "karma-safari-launcher": "^1.0.0",
+    "karma-source-map-support": "^1.3.0",
     "karma-spec-reporter": "0.0.32",
     "mkdirp": "^0.5.1",
-    "remap-istanbul": "^0.11.1",
     "rimraf": "^2.6.2",
     "standard": "^11.0.1",
     "ts-node": "^7.0.1",
@@ -85,7 +83,6 @@
     "tslint": "^5.11.0",
     "tslint-config-standard": "^7.1.0",
     "typescript": "^3.0.1",
-    "typescript-eslint-parser": "^18.0.0",
     "uglify-es": "3.3.9",
     "uglifyify": "^5.0.1",
     "watchify": "^3.11.0"
@@ -95,5 +92,20 @@
       "base64-js": "base64Js",
       "lru-cache": "lruCache"
     }
+  },
+  "nyc": {
+    "extension": [
+      ".ts",
+      ".tsx"
+    ],
+    "exclude": [
+      "**/*.d.ts",
+      "**/*.spec.ts"
+    ],
+    "temp-directory": "spec/reports/coverage",
+    "report-dir": "spec/reports/coverage",
+    "reporter": [
+      "html"
+    ]
   }
 }
diff --git a/spec/karma-coverage.conf.js b/spec/karma-coverage.conf.js
@@ -14,48 +14,39 @@
  * Limitations under the License.
  */
 //
+var path = require('path')
 var assign = require('tslib').__assign
 
 module.exports = function (config) {
   'use strict'
   require('./karma.conf.js')(config) // setup test config
   config.set({ // overwrites arrays
     plugins: (config.plugins || []).concat([
-      'karma-coverage'
+      'karma-coverage-istanbul-reporter'
     ]),
     browserify: assign({}, config.browserify, { // https://github.com/nikku/karma-browserify#plugins
       transform: (config.browserify.transform || []).concat([
         [
-          'browserify-istanbul', {
-            'ignore': '**/spec/**',
-            'instrumenterConfig': { 'embedSource': true }
+          'browserify-istanbul',
+          {
+            'ignore': [ '**/node_modules/**', '**/spec/**' ],
+            'instrumenterConfig': {
+              'compact': false,
+              'produceSourceMap': true
+            }
           }
         ]
       ])
     }),
     reporters: [
-      'spec', 'coverage'
+      'spec', 'coverage-istanbul'
     ],
-    coverageReporter: {
-      dir: './reports/coverage',
-      reporters: [
-        {
-          type: 'json',
-          subdir: browsername,
-          file: 'coverage.json'
-        }
-      ]
+    coverageIstanbulReporter: {
+      dir: path.join(__dirname, 'reports/coverage'),
+      reports: ['json', 'html', 'lcovonly', 'text-summary'],
+      'report-config': {
+        html: { subdir: 'html' }
+      }
     }
   })
-/*
-  config.set({ // overwrites arrays
-    coverageReporter: assign({}, config.coverageReporter, {
-      dir: '../reports/coverage/proxy'
-    })
-  })
-*/
-}
-
-function browsername (browser) {
-  return browser.toLowerCase().split(/[ /-]/)[0]
 }
diff --git a/spec/karma.conf.js b/spec/karma.conf.js
@@ -38,7 +38,7 @@ module.exports = function (config) {
       'reports/**/*',
       'support/**/*'
     ],
-    frameworks: [ 'browserify', 'jasmine' ], // include browserify first
+    frameworks: [ 'browserify', 'source-map-support', 'jasmine' ], // include browserify first
     browsers: browsers,
     customLaunchers: {
       'Chrome--no-sandbox': { // TravisCI
@@ -50,6 +50,7 @@ module.exports = function (config) {
     singleRun: true,
     plugins: [
       'karma-browserify',
+      'karma-source-map-support',
       'karma-chrome-launcher',
       'karma-firefox-launcher',
       'karma-safari-launcher',
@@ -64,12 +65,7 @@ module.exports = function (config) {
     },
     browserify: { // https://github.com/nikku/karma-browserify#plugins
       debug: true,
-      plugin: [ [ 'tsify' ] ] /*,
-      configure: function (bundle) {
-        bundle.on('prebundle', function () {
-          bundle.require('_cut_', { expose: '' }) // stub dependencies
-        })
-      } */
+      plugin: [ [ 'tsify' ] ]
     },
     reporters: [ // 'progress' | 'dots' | 'kjhtml' | 'junit' | 'spec' | ' coverage'
       'spec', 'kjhtml', 'junit'