fixed coverage; fixed chrome not launching; fixed jenkins test task (#…

…611) Merging at this fixes errors during build on Jenkins
microsoft · Jan 17, 2017 · 104fec7 · 104fec7
1 parent 002de56
commit 104fec7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -98,7 +98,7 @@ module.exports = function(config) {
       "/base/out/src/views/htmlcontent/src/": '/base/out/src/views/htmlcontent/dist/'
     },
     exclude: [],
-    reporters: ['progress','karma-remap-istanbul', 'junit'],
+    reporters: ['progress', 'junit'],
     customLaunchers: {
         Chrome_travis_ci: {
             base: 'Chrome',
@@ -113,22 +113,23 @@ module.exports = function(config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['Chrome'],
+    browsers: ['Chrome_travis_ci'],
     singleRun: true
   }
 
   if (coverconfig && coverconfig.enabled) {
-    config.preprocessors = {
+    configuration.preprocessors = {
       'out/src/views/htmlcontent/dist/**/!(*spec)*.js': 'coverage'
     };
-    config.reporters.push('coverage');
-    config.coverageReporter = {
+    configuration.reporters.push('coverage');
+    configuration.reporters.push('karma-remap-istanbul')
+    configuration.coverageReporter = {
       dir : 'coverage/',
       reporters: [
         {type: 'json'}
       ]
     };
-    config.remapIstanbulReporter = {
+    configuration.remapIstanbulReporter = {
       reports: {
         json: 'coverage/coverage-html.json',
         // uncomment below for html only coverage

diff --git a/tasks/covertasks.js b/tasks/covertasks.js
@@ -42,4 +42,4 @@ gulp.task('cover:combine', () => {
 });
 
 // for running on the jenkins build system
-gulp.task('cover:jenkins', gulp.series('cover:clean', 'html:test', 'cover:enableconfig', 'ext:test', 'cover:combine'));
+gulp.task('cover:jenkins', gulp.series('cover:clean', 'cover:enableconfig', 'html:test', 'ext:test', 'cover:combine'));