fix(karma): fixes included:false pattern being ignored

Closes karma-runner#1530

lib/file-list.js

@@ -222,11 +222,20 @@ Object.defineProperty(List.prototype, 'files', {
       return from(self.buckets.get(p.pattern) || []).sort(byPath)
     })
 
-    var included = this._patterns.filter(function (pattern) {
-      return pattern.included
-    })
-    .map(function (p) {
-      return from(self.buckets.get(p.pattern) || []).sort(byPath)
+    // excluded is a map of excluded paths
+    var excluded = _.reduce(_.flatten(this._patterns.filter(function (pattern) {
+      return !pattern.included
+    }).map(function (p) {
+      return from(self.buckets.get(p.pattern) || [])
+    })), function (result, file) {
+      result[file.path] = true
+      return result
+    }, {})
+
+    var included = this._patterns.map(function (p) {
+      return from(self.buckets.get(p.pattern)).filter(function (pattern) {
+        return !excluded[pattern.path]
+      }).sort(byPath)
     })
 
     var uniqFlat = function (list) {

test/unit/file-list.spec.js

@@ -21,6 +21,7 @@ function findFile (path, files) {
 
 var PATTERN_LIST = {
   '/some/*.js': ['/some/a.js', '/some/b.js'],
+  '/some/a.js': ['/some/a.js'],
   '*.txt': ['/c.txt', '/a.txt', '/b.txt'],
   '/a.*': ['/a.txt']
 }
@@ -133,15 +134,16 @@ describe('FileList', () => {
     it('returns a flat array of included files', () => {
       var files = [
         new config.Pattern('/a.*', true, false), // included: false
+        new config.Pattern('/some/a.js', true, false), // included: false
         new config.Pattern('/some/*.js') // included: true
       ]
 
       list = new List(files, [], emitter, preprocess)
 
       return list.refresh().then(() => {
         expect(pathsFrom(list.files.included)).not.to.contain('/a.txt')
+        expect(pathsFrom(list.files.included)).not.to.contain('/some/a.js')
         expect(pathsFrom(list.files.included)).to.deep.equal([
-          '/some/a.js',
           '/some/b.js'
         ])
       })