Fix cucumber get test cases

Fixes cucumber/cucumber-js#1489
Closes: purpleteam-labs/purpleteam#13

Author: binarymist

src/api/app/models/app.js

@@ -142,13 +142,6 @@ class App {
     const configuration = await cucumberCli.getConfiguration();
     const pickleFilter = (() => new (require('@cucumber/cucumber/lib/pickle_filter')).default(configuration.pickleFilterOptions))(); // eslint-disable-line global-require, new-cap
 
-    const flatten = (o) => [].concat(...Object.keys(o)
-      .map((k) => (typeof o[k] === 'object'
-        ? flatten(o[k])
-        : ({ [k]: o[k] }))));
-
-    const activeTags = flatten(pickleFilter.tagFilter.tagExpressionNode).map((tagObj) => tagObj.value);
-
     const streamToArray = async (readableStream) => new Promise((resolve, reject) => {
       const items = [];
       readableStream.on('data', (item) => items.push(item));
@@ -157,11 +150,22 @@ class App {
     });
 
     const activeFeatureFileUris = async () => {
-      const envelopes = await streamToArray(GherkinStreams.fromPaths(configuration.featurePaths, { includeSource: false, includeGherkinDocument: false, includePickles: true }));
-      const tagUriMaps = envelopes.map((e) => ({ tagName: e.pickle.tags[0].name, fileUri: e.pickle.uri }));
-      const activeTagUriMaps = tagUriMaps.filter((tU) => activeTags.includes(tU.tagName));
-      const activeUris = activeTagUriMaps.reduce((accum, cV) => [...accum, ...(accum.includes(cV.fileUri) ? [] : [cV.fileUri])], []);
-      return activeUris;
+      const envelopes = await streamToArray(GherkinStreams.fromPaths(configuration.featurePaths, { includeSource: false, includeGherkinDocument: true, includePickles: true }));
+      let gherkinDocument = null;
+      const pickles = [];
+
+      envelopes.forEach((e) => {
+        if (e.gherkinDocument) {
+          gherkinDocument = e.gherkinDocument;
+        } else if (e.pickle && gherkinDocument) {
+          const { pickle } = e;
+          if (pickleFilter.matches({ gherkinDocument, pickle })) pickles.push({ pickle });
+        }
+      });
+
+      return pickles
+        .map((p) => p.pickle.uri)
+        .reduce((accum, cV) => [...accum, ...(accum.includes(cV) ? [] : [cV])], []);
     };
 
     return activeFeatureFileUris();

test/api/app/models/app.js

@@ -56,29 +56,26 @@ test('Given tagExpression: (@app_scan or @simple_math) - when getActiveFeatureFi
 
 // Since cucumber.getTestCasesFromFilesystem was removed, the following test cases fail, including the ones not yet implemented.
 
-test.failing('Given tagExpression: (@app_scan and @simple_math) - when getActiveFeatureFileUris is invoked - then no active feature file Uris should be returned', async (t) => {
+test('Given tagExpression: (@app_scan and @simple_math) - when getActiveFeatureFileUris is invoked - then no active feature file Uris should be returned', async (t) => {
   t.plan(1);
   // Active feature files are based on the cucumber.tagExpression defined in config.
   // https://cucumber.io/docs/cucumber/api/#tag-expressions
   // https://github.com/cucumber/cucumber/tree/master/tag-expressions#migrating-from-old-style-tags
   const tagExpression = '(@app_scan and @simple_math)';
   const activeFeatureFileUris = await setupGetActiveFeatureFileUris({ tagExpression });
   t.deepEqual(activeFeatureFileUris, []);
-  // What we get is: [`${appRootDir}/testResources/features/app_scan.feature`, `${appRootDir}/testResources/features/simple_math.feature`]
 });
 
-test.failing('Given tagExpression: (not @simple_math) - when getActiveFeatureFileUris is invoked - then active feature file Uris app_scan.feature should be returned', async (t) => {
+test('Given tagExpression: (not @simple_math) - when getActiveFeatureFileUris is invoked - then active feature file Uris app_scan.feature should be returned', async (t) => {
   t.plan(1);
   // Active feature files are based on the cucumber.tagExpression defined in config.
   // https://cucumber.io/docs/cucumber/api/#tag-expressions
   // https://github.com/cucumber/cucumber/tree/master/tag-expressions#migrating-from-old-style-tags
   const tagExpression = '(not @simple_math)';
   const activeFeatureFileUris = await setupGetActiveFeatureFileUris({ tagExpression });
   t.deepEqual(activeFeatureFileUris, [`${appRootDir}/testResources/features/app_scan.feature`]);
-  // What we get is: [`${appRootDir}/testResources/features/simple_math.feature`]
 });
 
-// The following are also not catered for currently.
 // Ideas for creating feature files with tags to test for here: https://cucumber.io/docs/cucumber/api/#tags
 
 // @wip and not @slow