=BG= minor - requested code style changes

Author: bguiz

lib/test/karma.js

@@ -43,13 +43,13 @@ function getKarmaReporterPluginPath(reporterName) {
   }
   else {
     var reporterPath = (path.dirname(reporterName) === '.') ?
-      path.resolve('node_modules', 'karma-'+reporterName+'-reporter') :
+      path.resolve('node_modules', 'karma-' + reporterName + '-reporter') :
       reporterName;
     try {
       require(reporterPath);
     }
     catch (ex) {
-      throw 'Get Karma Reporter Plugin Path: Attempt to require reporter from path '+reporterPath+' with no success.';
+      throw 'Get Karma Reporter Plugin Path: Attempt to require reporter from path ' + reporterPath + ' with no success.';
     }
     return reporterPath;
   }
@@ -68,13 +68,9 @@ function getKarmaReporterName(reporterName) {
     throw 'Get Karma Reporter Name: Reporter name is unspecified';
   }
 
-  var name;
-  if (path.dirname(reporterName) === '.') {
-    name = reporterName;
-  }
-  else {
-    name = path.basename(reporterName);
-  }
+  var name = (path.dirname(reporterName) === '.') ?
+    reporterName :
+    path.basename(reporterName);
   var match = karmaReporterMatchNameRegex.exec(name);
   if (!!match && match.length === 2) {
     name = match[1];
@@ -115,18 +111,18 @@ function karmaCreateConfig(reporters, configFileName) {
     var filesAppend = JSON.stringify(files, null, '  ');
     var reportersAppend = JSON.stringify(reporters.map(getKarmaReporterName), null, '  ');
     var pluginsAppend = '[\n' + reporters.map(function(reporter) {
-      return 'require("'+getKarmaReporterPluginPath(reporter)+'")';
+      return 'require("' + getKarmaReporterPluginPath(reporter) + '")';
     }).join(',\n  ') + '\n]';
 
     //aggregate and append to karma.conf.js in the project root folder
     gulp
       .src(path.resolve(configFileName))
       .on('data', function(karmaConfigFile) {
-        var contents = karmaConfigFile.contents.toString();
-        contents = contents.replace(filesAppendRegex, filesAppend);
-        contents = contents.replace(reportersAppendRegex, reportersAppend);
-        contents = contents.replace(reportersAppendRegex, reportersAppend);
-        contents = contents.replace(pluginsAppendRegex, pluginsAppend);
+        var contents = karmaConfigFile.contents.toString()
+          .replace(filesAppendRegex, filesAppend)
+          .replace(reportersAppendRegex, reportersAppend)
+          .replace(reportersAppendRegex, reportersAppend)
+          .replace(pluginsAppendRegex, pluginsAppend);
         karmaConfigFile.contents = new Buffer(contents);
         stream.push(karmaConfigFile);
       })
@@ -206,7 +202,7 @@ function karmaRun(reporters, bannerWidth) {
 var yargsOptionDefiniton = {
   key: 'karmareporter',
   value: {
-    describe: 'Specify a custom Karma reporter to use. '+
+    describe: 'Specify a custom Karma reporter to use. ' +
       'Either a locally npm installed module, or an asolute path to one.',
     alias: ['k'],
     default: defaultReporterName,
@@ -218,15 +214,14 @@ var checkKarmaReporter = yargs.createCheck()
     return !argv.help;
   })
   .withTest({
-    'karmareporter': function(value) {
-      if (typeof value === 'undefined') {
-        return;
-      }
-      try {
-        getKarmaReporterPluginPath(value);
-      }
-      catch (ex) {
-        return 'Illegal value for "reporter"\n'+ex;
+    karmareporter: function(value) {
+      if (typeof value !== 'undefined') {
+        try {
+          getKarmaReporterPluginPath(value);
+        }
+        catch (ex) {
+          return 'Illegal value for "reporter"\n' + ex;
+        }
       }
     },
   })

lib/util/jshint-reporter.js

@@ -69,7 +69,7 @@ var checkJsHintReporter = yargs.createCheck()
     return !argv.help;
   })
   .withTest({
-    'reporter': function(value) {
+    reporter: function(value) {
       if (typeof value === 'undefined') {
         return;
       }

tasks/javascript.js

@@ -120,7 +120,7 @@ gulp.task('javascript:unit', function () {
     reporters = Array;
   }
   else if (typeof reporters === 'string' &&
-      reporters !== karma.yargsOption.value.default) {
+    reporters !== karma.yargsOption.value.default) {
     reporters = [reporters];
   }
   else {

templates/angularity/karma.conf.js

@@ -19,9 +19,10 @@ module.exports = function(config) {
     // list of files to exclude
     exclude: [],
 
-    // register any plugins which  are not siblings of karma in angularity global installation
-    // and thus need to be registered manually
-    plugins: config.plugins.concat(/*ANGULARITY_PLUGIN_LIST*/),
+    // register any plugins which are not siblings of karma in angularity global
+    // installation and thus need to be registered manually
+    // append to existing value to preserve plugins loaded automatically
+    plugins: [].concat(config.plugins, /*ANGULARITY_PLUGIN_LIST*/),
 
     // use dots reporter, as travis terminal does not support escaping sequences
     // possible values: 'dots', 'progress', 'junit', 'teamcity'