Merge pull request #1109 from bradleylandis/master

remove duplicates when combining results of multiple globs

lib/config.js

@@ -26,6 +26,7 @@ var Chars = require('./chars');
 var pad = require('./strutils').pad;
 var isa = require('./isa');
 var fileExists = require('./fileutils').fileExists;
+var uniqBy = require('lodash.uniqby');
 
 var knownBrowsers = require('./utils/known-browsers');
 var globAsync = Bluebird.promisify(glob);
@@ -412,7 +413,11 @@ Config.prototype.getFileSet = function(want, dontWant, callback) {
         return {src: f, attrs: attrs};
       }));
     });
-  }, []).asCallback(callback);
+  }, [])
+    .then(function(result) {
+      return uniqBy(result, 'src');
+    })
+    .asCallback(callback);
 };
 
 Config.prototype.getSrcFiles = function(callback) {

package.json

@@ -35,6 +35,7 @@
     "lodash.assignin": "^4.1.0",
     "lodash.clonedeep": "^4.4.1",
     "lodash.find": "^4.5.1",
+    "lodash.uniqby": "^4.7.0",
     "mkdirp": "^0.5.1",
     "mustache": "^2.2.1",
     "node-notifier": "^5.0.1",

tests/config_tests.js

@@ -338,6 +338,13 @@ describe('Config', function() {
         done();
       });
     });
+    it('does not return duplicates when file matches multiple globs', function(done) {
+      config.set('src_files', ['config_tests.js', 'config_tests.js']);
+      config.getSrcFiles(function(err, files) {
+        expect(files).to.deep.equal([fileEntry('config_tests.js')]);
+        done();
+      });
+    });
     it('excludes using src_files_ignore', function(done) {
       config.set('src_files', ['ci/*']);
       config.set('src_files_ignore', ['**/report*.js']);
@@ -468,6 +475,17 @@ describe('Config', function() {
         done();
       });
     });
+    it('does not return duplicates when file matches multiple globs', function(done) {
+      var egg = [ {
+        'attrs': [],
+        'src': 'testem.yml'
+      }];
+      config.set('src_files', ['t*.yml', 'testem.yml']);
+      config.getServeFiles(function(err, files) {
+        expect(files).to.deep.equal(egg);
+        done();
+      });
+    });
   });
 
   describe('getCSSFiles', function() {
@@ -482,6 +500,18 @@ describe('Config', function() {
         done();
       });
     });
+
+    it('does not return duplicates when file matches multiple globs', function(done) {
+      config.set('cwd', 'tests');
+      config.set('src_files', ['fixtures/styles/*.css', 'fixtures/styles/*.css']);
+      config.getSrcFiles(function(err, files) {
+        expect(files).to.deep.equal([
+          fileEntry(path.join('fixtures', 'styles', 'print.css')),
+          fileEntry(path.join('fixtures', 'styles', 'screen.css'))
+        ]);
+        done();
+      });
+    });
   });
 
   describe('browser_disconnect_timeout', function() {