From 4240180228988d7ac3f6081d5bf3cb0d7357d730 Mon Sep 17 00:00:00 2001 From: ScottFreeCode Date: Thu, 15 Jun 2017 18:43:32 -0400 Subject: [PATCH] Fix: don't try to use Node entry point or the karma conf file; also, *do* cover browser shims since we're getting browser coverage now --- karma.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 9ae9008a3b..b58ffbdc85 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -18,7 +18,7 @@ module.exports = function (config) { var bundleDirpath; var filesBase = [ // make browserify bundle these properly (if nothing else, this is necessary for coverage transform; unclear whether it makes a difference as to how browserify gets them otherwise, as it doesn't print any debug logs about them without it) - { pattern: '*.js', included: false, served: false }, + { pattern: 'browser-entry.js', included: false, served: false }, { pattern: 'lib/**/*.js', included: false, served: false } ]; var cfg = { @@ -162,7 +162,7 @@ module.exports = function (config) { subdir: '.', includeAllSources: true }; - cfg.browserify.transform = [ workaroundMultiplePreprocessorIncompatibility({ ignore: ['**/lib/browser/**', '**/node_modules/**', '**/test/**'], instrumenter: nyc, instrumenterConfig: { autoWrap: true, embedSource: true, produceSourceMap: true, noCompact: false } }) ]; + cfg.browserify.transform = [ workaroundMultiplePreprocessorIncompatibility({ ignore: ['**/node_modules/**', '**/test/**'], instrumenter: nyc, instrumenterConfig: { autoWrap: true, embedSource: true, produceSourceMap: true, noCompact: false } }) ]; console.error('Reporting coverage to ' + cfg.coverageReporter.dir); }