find-cypress-specs 1.33.3 → 1.34.0

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-12.12.0-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-12.13.0-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
 
@@ -143,7 +143,9 @@ cypress/e2e/featureA/user.js (2 tests, 1 pending)
 found 2 specs (4 tests, 1 pending)
 ```
 
-Where the tags are listed inside `[ ... ]` (see [cypress-grep](https://github.com/cypress-io/cypress-grep)) and the [pending tests](https://glebbahmutov.com/blog/cypress-test-statuses/) are marked with `⊙` character.
+Where the tags are listed inside `[ ... ]` (see [@bahmutov/cy-grep](https://github.com/bahmutov/cy-grep)) and the [pending tests](https://glebbahmutov.com/blog/cypress-test-statuses/) are marked with `⊙` character.
+
+Required tags are marked with `[[ ... ]]`.
 
 You can print the results in JSON format using `--json` or `-j` option.
 

package/bin/find.js

@@ -169,6 +169,7 @@ if (args['--test-counts']) {
         const source = fs.readFileSync(file, 'utf8')
         const result = getTestNames(source, true)
         const specTagCounts = countTags(result.structure)
+        // debug(specTagCounts)
         const specHasTags = Object.keys(specTagCounts).some((tag) =>
           splitTags.includes(tag),
         )
@@ -197,9 +198,14 @@ if (args['--test-counts']) {
       tagged: args['--tagged'],
       skipped: args['--skipped'],
     })
+    debug('json results from getTests')
+    debug(jsonResults)
+    debug('tag test counts')
+    debug(tagTestCounts)
 
     if (args['--names']) {
       if (args['--count']) {
+        debug('names and count')
         let n = 0
         Object.keys(jsonResults).forEach((filename) => {
           const skippedCount = jsonResults[filename].counts.pending

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "find-cypress-specs",
-  "version": "1.33.3",
+  "version": "1.34.0",
   "description": "Find Cypress spec files using the config settings",
   "main": "src",
   "files": [
@@ -33,7 +33,8 @@
     "deps-changed": "DEBUG=find-cypress-specs node ./bin/find --branch main --parent --trace-imports cypress --time-trace --cache-trace",
     "demo-component": "DEBUG=find-cypress-specs node ./bin/find --component --names",
     "demo-exclusive": "npm run test-names --prefix test-exclusive --silent",
-    "version-badge": "update-badge cypress"
+    "version-badge": "update-badge cypress",
+    "count-all-tags": "npm run count-all-tags --prefix test-required-tags"
   },
   "repository": {
     "type": "git",
@@ -50,7 +51,7 @@
   "homepage": "https://github.com/bahmutov/find-cypress-specs#readme",
   "devDependencies": {
     "ava": "^4.0.0",
-    "cypress": "12.12.0",
+    "cypress": "12.13.0",
     "dependency-version-badge": "^1.11.0",
     "execa-wrap": "^1.4.0",
     "prettier": "^2.5.1",
@@ -64,7 +65,7 @@
     "arg": "^5.0.1",
     "console.table": "^0.10.0",
     "debug": "^4.3.3",
-    "find-test-names": "1.28.7",
+    "find-test-names": "1.28.8",
     "globby": "^11.0.4",
     "minimatch": "^3.0.4",
     "pluralize": "^8.0.0",

package/src/index.js

@@ -254,6 +254,7 @@ function collectResults(structure, results) {
       name: t.name,
       type: t.type,
       tags: t.tags,
+      requiredTags: t.requiredTags,
     }
     if (t.pending) {
       info.pending = t.pending
@@ -261,6 +262,9 @@ function collectResults(structure, results) {
     if (t.exclusive) {
       info.exclusive = t.exclusive
     }
+    debug('structure for %s', t.name)
+    debug(info)
+
     results.push(info)
     if (t.type === 'suite') {
       if (t.suites && t.suites.length) {
@@ -382,9 +386,14 @@ function getTests(specs, options = {}) {
       // enable if need to debug the parsed test
       // console.dir(result.structure, { depth: null })
       collectResults(result.structure, jsonResults[filename].tests)
+      debug('collected results for file %s', filename)
 
       if (tags) {
+        debug('counting tags', tags)
         const specTagCounts = countTags(result.structure)
+        debug('spec tag counts')
+        debug(specTagCounts)
+
         Object.keys(specTagCounts).forEach((tag) => {
           if (!(tag in tagTestCounts)) {
             tagTestCounts[tag] = specTagCounts[tag]
@@ -400,6 +409,8 @@ function getTests(specs, options = {}) {
   })
 
   addCounts(jsonResults)
+  debug('added counts')
+  debug(jsonResults)
 
   if (tagged) {
     // filter all collected tests to those that have the given tag(s)
@@ -409,6 +420,7 @@ function getTests(specs, options = {}) {
       .filter(Boolean)
     debug('filtering all tests by tag %o', splitTags)
     pickTaggedTestsFrom(jsonResults, splitTags)
+    // debug(jsonResults)
     // recompute the number of tests
     addCounts(jsonResults)
   } else if (skipped) {

package/src/tagged.js

@@ -12,6 +12,18 @@ function arraysOverlap(a, b) {
   }
 }
 
+function combineTags(tags, requiredTags) {
+  if (tags && requiredTags) {
+    return [].concat(tags).concat(requiredTags)
+  }
+  if (tags) {
+    return [...tags]
+  }
+  if (requiredTags) {
+    return [...requiredTags]
+  }
+}
+
 // note: modifies the tests in place
 function pickTaggedTests(tests, tag) {
   if (!Array.isArray(tests)) {
@@ -20,9 +32,11 @@ function pickTaggedTests(tests, tag) {
   const tags = Array.isArray(tag) ? tag : [tag]
   const filteredTests = tests.filter((test) => {
     if (test.type === 'test') {
-      return test.tags && arraysOverlap(test.tags, tags)
+      const allTags = combineTags(test.tags, test.requiredTags)
+      return allTags && arraysOverlap(allTags, tags)
     } else if (test.type === 'suite') {
-      if (test.tags && arraysOverlap(test.tags, tags)) {
+      const allTags = combineTags(test.tags, test.requiredTags)
+      if (allTags && arraysOverlap(test.tags, tags)) {
         return true
       }