Fix issues with switching to gulp

Author: dalelotts

gulpfile.js

@@ -5,6 +5,7 @@
 var gulp = require('gulp');
 var jshint = require('gulp-jshint');
 var karma = require('karma').server;
+var lodash = require('lodash');
 var plato = require('gulp-plato');
 var karmaConfig = __dirname + '/karma.conf.js';
 var paths = require('./paths');
@@ -14,27 +15,38 @@ gulp.task('complexity', function () {
     .pipe(plato('complexity'));
 });
 
+var testConfig = function (options) {
+  var travisOptions = process.env.TRAVIS &&
+    {
+      browsers: ['Firefox']
+    };
+
+  return lodash.assign(options, travisOptions);
+};
+
 gulp.task('test', function (done) {
-  karma.start({
-    configFile: karmaConfig,
-    singleRun: true,
-    reporters: ['progress', 'coverage', 'threshold']
-  }, done);
+  karma.start(testConfig(
+    {
+      configFile: karmaConfig,
+      singleRun: true,
+      reporters: ['progress', 'coverage', 'threshold']
+    }
+  ), done);
 });
 
 gulp.task('tdd', function (done) {
   gulp.watch(paths.all, ['lint']);
 
   karma.start({
-    configFile: paths.karmaConfig
+    configFile: karmaConfig
   }, done);
 });
 
 gulp.task('lint', function () {
   return gulp
     .src(paths.lint)
     .pipe(jshint('.jshintrc'))
-    .pipe(jshint.reporter('default', { verbose: true }))
+    .pipe(jshint.reporter('default', {verbose: true}))
     .pipe(jshint.reporter('jshint-stylish'))
     .pipe(jshint.reporter('fail'));
 });

package.json

@@ -29,13 +29,14 @@
     "karma-jasmine": "^0.3.2",
     "karma-phantomjs-launcher": "^0.1.2",
     "karma-threshold-reporter": "^0.1.12",
+    "lodash": "^3.5.0",
     "matchdep": "^0.3.0",
     "phantomjs": "^1.9.12",
     "run-browser": "^2.0.2",
     "tape": "^3.5.0"
   },
   "scripts": {
-    "test": "npm run test-browserify && gulp --verbose",
+    "test": "npm run test-browserify && gulp",
     "test-browserify": "run-browser test/commonjs/browserify.test.js -b",
     "postinstall": "./node_modules/bower/bin/bower install"
   },

paths.js

@@ -10,13 +10,13 @@ var bower = [
 ];
 var sourceFiles = ['src/**/*.js'];
 var testFiles = ['test/**/*.spec.js'];
-var miscFiles = ['test/karma.conf.js', 'demo/**/*.js'];
+var miscFiles = ['demo/**/*.js'];
 var bumpFiles = ['package.json', 'bower.json', 'README.md', 'src/js/*.js', 'src/css/*.css'];
 
 module.exports = {
   all: bower.concat(sourceFiles).concat(testFiles).concat(miscFiles),
   app: sourceFiles,
   bump: bumpFiles,
-  lint: ['GruntFile.js', 'gulpfile.js', 'paths.js', 'test/**/*.test.js'].concat(sourceFiles).concat(testFiles).concat(miscFiles),
+  lint: ['GruntFile.js', 'gulpfile.js', 'karma.conf.js', 'paths.js', 'test/**/*.test.js'].concat(sourceFiles).concat(testFiles).concat(miscFiles),
   test: testFiles
 };