find-cypress-specs 1.13.0 → 1.14.2

package/README.md

@@ -1,4 +1,4 @@
-# find-cypress-specs [![renovate-app badge][renovate-badge]][renovate-app] ![cypress version](https://img.shields.io/badge/cypress-9.5.1-brightgreen) [![ci](https://github.com/bahmutov/find-cypress-specs/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/bahmutov/find-cypress-specs/actions/workflows/ci.yml)
+# find-cypress-specs [![renovate-app badge][renovate-badge]][renovate-app] ![cypress version](https://img.shields.io/badge/cypress-9.5.2-brightgreen) [![ci](https://github.com/bahmutov/find-cypress-specs/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/bahmutov/find-cypress-specs/actions/workflows/ci.yml)
 
 > Find Cypress spec files using the config settings
 
@@ -77,6 +77,14 @@ $ npx find-cypress-specs --names --tagged <single tag>
 # finds all specs and tests, then filters the output by a single tag
 ```
 
+## Test names filtered by multiple tags
+
+```bash
+$ npx find-cypress-specs --names --tagged <tag1>,<tag2>,<tag3>,...
+# finds all specs and tests, then filters the output showing all tests
+# tagged with tag1 or tag2 or tag3 or ...
+```
+
 ## Details
 
 Cypress uses the resolved [configuration values](https://on.cypress.io/configuration) to find the spec files to run. It searches the `integrationFolder` for all patterns listed in `testFiles` and removes any files matching the `ignoreTestFiles` patterns.

package/bin/find.js

@@ -7,8 +7,7 @@ const { addCounts } = require('../src/count')
 const { stringAllInfo } = require('../src/print')
 
 const fs = require('fs')
-const pluralize = require('pluralize')
-const { getTestNames, formatTestList, countTags } = require('find-test-names')
+const { getTestNames, countTags } = require('find-test-names')
 const consoleTable = require('console.table')
 const debug = require('debug')('find-cypress-specs')
 
@@ -74,9 +73,13 @@ if (args['--names'] || args['--tags']) {
 
     if (args['--names']) {
       if (args['--tagged']) {
-        // filter all collected tests to those that have the given tag
-        debug('filtering all tests by tag "%s"', args['--tagged'])
-        pickTaggedTestsFrom(jsonResults, args['--tagged'])
+        // filter all collected tests to those that have the given tag(s)
+        const splitTags = args['--tagged']
+          .split(',')
+          .map((s) => s.trim())
+          .filter(Boolean)
+        debug('filtering all tests by tag "%o"', splitTags)
+        pickTaggedTestsFrom(jsonResults, splitTags)
         // recompute the number of tests
         addCounts(jsonResults)
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "find-cypress-specs",
-  "version": "1.13.0",
+  "version": "1.14.2",
   "description": "Find Cypress spec files using the config settings",
   "main": "src",
   "files": [
@@ -40,7 +40,7 @@
   "homepage": "https://github.com/bahmutov/find-cypress-specs#readme",
   "devDependencies": {
     "ava": "^4.0.0",
-    "cypress": "9.5.1",
+    "cypress": "9.5.2",
     "execa-wrap": "^1.4.0",
     "prettier": "^2.5.1",
     "semantic-release": "19.0.2"
@@ -49,7 +49,7 @@
     "arg": "^5.0.1",
     "console.table": "^0.10.0",
     "debug": "^4.3.3",
-    "find-test-names": "^1.14.1",
+    "find-test-names": "^1.15.1",
     "globby": "^11.0.4",
     "minimatch": "^3.0.4",
     "pluralize": "^8.0.0",

package/src/tagged.js

@@ -1,22 +1,35 @@
 const { addCounts } = require('./count')
 
+function arraysOverlap(a, b) {
+  if (!Array.isArray(a) || !Array.isArray(b)) {
+    return false
+  }
+
+  if (a.length < b.length) {
+    return a.some((item) => b.includes(item))
+  } else {
+    return b.some((item) => a.includes(item))
+  }
+}
+
 // note: modifies the tests in place
 function pickTaggedTests(tests, tag) {
   if (!Array.isArray(tests)) {
     return false
   }
+  const tags = Array.isArray(tag) ? tag : [tag]
   const filteredTests = tests.filter((test) => {
     if (test.type === 'test') {
-      return test.tags && test.tags.includes(tag)
+      return test.tags && arraysOverlap(test.tags, tags)
     } else if (test.type === 'suite') {
-      if (test.tags && test.tags.includes(tag)) {
+      if (test.tags && arraysOverlap(test.tags, tags)) {
         return true
       }
 
       // maybe there is some test inside this suite
       // with the tag? Filter all other tests
       return (
-        pickTaggedTests(test.tests, tag) || pickTaggedTests(test.suites, tag)
+        pickTaggedTests(test.tests, tags) || pickTaggedTests(test.suites, tags)
       )
     }
   })
@@ -51,4 +64,9 @@ function pickTaggedTestsFrom(json, tag) {
   return result
 }
 
-module.exports = { pickTaggedTestsFrom, removeEmptyNodes, pickTaggedTests }
+module.exports = {
+  arraysOverlap,
+  pickTaggedTestsFrom,
+  removeEmptyNodes,
+  pickTaggedTests,
+}