fix: multiple feature tag bug

Author: rwaldron

bin/run.js

@@ -217,12 +217,12 @@ function filterByFeatureInclude(test) {
   if (!featuresInclude) {
     return true;
   }
-  return featuresInclude.filter(feature => (test.attrs.features || []).includes(feature)).length > 0;
+  return featuresInclude.some(feature => (test.attrs.features || []).includes(feature));
 }
 
 function filterByFeatureExclude(test) {
   if (!featuresExclude) {
     return true;
   }
-  return featuresExclude.filter(feature => !(test.attrs.features || []).includes(feature)).length > 0;
+  return !featuresExclude.some(feature => (test.attrs.features || []).includes(feature));
 }

test/collateral/test/error.js

@@ -3,6 +3,7 @@ description: Fails by calling $ERROR
 expected:
   pass: false
   message: failure message
+features: [C]
 ---*/
 
 $ERROR('failure message');

test/collateral/test/negativeMessage.js

@@ -3,5 +3,5 @@ description: Should report the expected error indicated by the "negative" frontm
 negative: ExpectedError
 expected:
   pass: false
-features: [B]
+features: [B,C]
 ---*/

test/collateral/test/noStrict.js

@@ -3,5 +3,6 @@ description: Should not test in strict mode
 flags: [noStrict]
 expected:
   pass: true
+features: [A,B,C]
 ---*/
 x = 5;

test/collateral/test/rawNoStrict.js

@@ -3,6 +3,7 @@ description: Should not test in strict mode
 flags: [raw]
 expected:
   pass: true
+features: [C]
 ---*/
 var seemsStrict;
 try {

test/collateral/test/rawStrict.js

@@ -3,6 +3,7 @@ description: Should not test in strict mode (but allow strict mode to be enabled
 flags: [raw]
 expected:
   pass: true
+features: [C]
 ---*/
 'use strict';
 var seemsStrict;

test/test.js

@@ -138,28 +138,28 @@ const tests = [
       '--features-include=A',
       'collateral/test/**/*.js',
     ],
-    { cwd: 'test', recordsCount: 6 },
+    { cwd: 'test', recordsCount: 7 },
   ],
   [
     [
       '--features-exclude=B',
       'collateral/test/**/*.js',
     ],
-    { cwd: 'test', recordsCount: 14 },
+    { cwd: 'test', recordsCount: 13 },
   ],
   [
     [
       '--features-include=A,B',
       'collateral/test/**/*.js',
     ],
-    { cwd: 'test', recordsCount: 8 },
+    { cwd: 'test', recordsCount: 9 },
   ],
   [
     [
       '--features-exclude=A,B',
       'collateral/test/**/*.js',
     ],
-    { cwd: 'test', recordsCount: 16 },
+    { cwd: 'test', recordsCount: 9 },
   ],
   [
     [
@@ -169,6 +169,14 @@ const tests = [
     ],
     { cwd: 'test', recordsCount: 4 },
   ],
+  [
+    [
+      '--features-include=A,B,C',
+      '--features-exclude=C',
+      'collateral/test/**/*.js',
+    ],
+    { cwd: 'test', recordsCount: 6 },
+  ],
 ].reduce((accum, a) => {
   let b = a.slice();
 
@@ -204,7 +212,7 @@ function validate({ args, records, exitCode, options }) {
 
   if (options.reporter === 'json') {
     if (options.recordsCount) {
-      tap.test('--features-include/exclude', assert => {
+      tap.test(`\`${args.join(' ')}\`: ${options.recordsCount} test records found`, assert => {
         assert.equal(records.length, options.recordsCount, 'records.length matches expected records count');
         assert.end();
       });