find-cypress-specs 1.25.2 → 1.26.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.3.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.7.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
 
@@ -224,6 +224,8 @@ You can see how Cypress finds the specs using `DEBUG=cypress:cli,cypress:server:
 
 Run the utility with environment variable `DEBUG=find-cypress-specs` to see the verbose logs
 
+![Debug output](./images/debug.png)
+
 ## Videos
 
 - [Use Ava Snapshots And Execa-wrap To Write End-to-End Tests For CLI Utilities](https://youtu.be/rsw17RqP0G0)
@@ -237,6 +239,8 @@ Run the utility with environment variable `DEBUG=find-cypress-specs` to see the
 
 You can use this module via its NPM module API.
 
+### getSpecs
+
 ```js
 const { getSpecs } = require('find-cypress-specs')
 // somewhere in the cypress.config.js
@@ -246,6 +250,30 @@ setupNodeEvents(on, config) {
 }
 ```
 
+You can pass the `config` object to the `getSpecs` method. If there is no `config` parameter, it will read the config file automatically.
+
+```js
+const specs = getSpecs({
+  e2e: {
+    specPattern: '*/e2e/featureA/*.cy.ts',
+  },
+})
+// ['cypress/e2e/featureA/spec.cy.ts']
+```
+
+### getTests
+
+Returns an object with individual test information
+
+```js
+const { getTests } = require('find-cypress-specs')
+const { jsonResults, tagTestCounts } = getTests()
+// jsonResults is an object
+// with an entry per spec file
+```
+
+See [get-tests.js](./test/npm/get-tests.js) for details and examples.
+
 ## Small print
 
 Author: Gleb Bahmutov <gleb.bahmutov@gmail.com> © 2022

package/bin/find.js

@@ -1,9 +1,7 @@
 #!/usr/bin/env node
 
 const arg = require('arg')
-const { getSpecs, collectResults, findChangedFiles } = require('../src')
-const { pickTaggedTestsFrom, leavePendingTestsOnly } = require('../src/tagged')
-const { addCounts } = require('../src/count')
+const { getSpecs, findChangedFiles, getTests } = require('../src')
 const { stringAllInfo } = require('../src/print')
 
 const fs = require('fs')
@@ -60,92 +58,45 @@ debug('arguments %o', args)
 
 const specs = getSpecs()
 if (args['--names'] || args['--tags']) {
-  if (!specs.length) {
-    console.log('no specs found')
-  } else {
-    console.log('')
-    // counts the number of tests for each tag across all specs
-    const tagTestCounts = {}
-    const jsonResults = {}
-
-    specs.forEach((filename) => {
-      jsonResults[filename] = {
-        counts: {
-          tests: 0,
-          pending: 0,
-        },
-        tests: [],
-      }
-      const source = fs.readFileSync(filename, 'utf8')
-      const result = getTestNames(source, true)
-      // enable if need to debug the parsed test
-      // console.dir(result.structure, { depth: null })
-      collectResults(result.structure, jsonResults[filename].tests)
-
-      if (args['--tags']) {
-        const specTagCounts = countTags(result.structure)
-        Object.keys(specTagCounts).forEach((tag) => {
-          if (!(tag in tagTestCounts)) {
-            tagTestCounts[tag] = specTagCounts[tag]
-          } else {
-            tagTestCounts[tag] += specTagCounts[tag]
-          }
-        })
-      }
-    })
-
-    addCounts(jsonResults)
-
-    if (args['--names']) {
-      if (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)
-      } else if (args['--skipped']) {
-        debug('leaving only skipped (pending) tests')
-        leavePendingTestsOnly(jsonResults)
-        // recompute the number of tests
-        addCounts(jsonResults)
-      }
-
-      if (args['--count']) {
-        let n = 0
-        Object.keys(jsonResults).forEach((filename) => {
-          const skippedCount = jsonResults[filename].counts.pending
-          n += skippedCount
-        })
-        console.log(n)
-      } else {
-        if (args['--json']) {
-          console.log(JSON.stringify(jsonResults, null, 2))
-        } else {
-          const str = stringAllInfo(jsonResults)
-          console.log(str)
-        }
-        console.log('')
-      }
-    }
-
-    if (args['--tags']) {
-      const tagEntries = Object.entries(tagTestCounts)
-      const sortedTagEntries = tagEntries.sort((a, b) => {
-        // every entry is [tag, count], so compare the tags
-        return a[0].localeCompare(b[0])
+  // counts the number of tests for each tag across all specs
+  const { jsonResults, tagTestCounts } = getTests(specs, {
+    tags: args['--tags'],
+    tagged: args['--tagged'],
+    skipped: args['--skipped'],
+  })
+
+  if (args['--names']) {
+    if (args['--count']) {
+      let n = 0
+      Object.keys(jsonResults).forEach((filename) => {
+        const skippedCount = jsonResults[filename].counts.pending
+        n += skippedCount
       })
+      console.log(n)
+    } else {
       if (args['--json']) {
-        // assemble a json object with the tag counts
-        const tagResults = Object.fromEntries(sortedTagEntries)
-        console.log(JSON.stringify(tagResults, null, 2))
+        console.log(JSON.stringify(jsonResults, null, 2))
       } else {
-        const table = consoleTable.getTable(['Tag', 'Tests'], sortedTagEntries)
-        console.log(table)
+        const str = stringAllInfo(jsonResults)
+        console.log(str)
       }
+      console.log('')
+    }
+  }
+
+  if (args['--tags']) {
+    const tagEntries = Object.entries(tagTestCounts)
+    const sortedTagEntries = tagEntries.sort((a, b) => {
+      // every entry is [tag, count], so compare the tags
+      return a[0].localeCompare(b[0])
+    })
+    if (args['--json']) {
+      // assemble a json object with the tag counts
+      const tagResults = Object.fromEntries(sortedTagEntries)
+      console.log(JSON.stringify(tagResults, null, 2))
+    } else {
+      const table = consoleTable.getTable(['Tag', 'Tests'], sortedTagEntries)
+      console.log(table)
     }
   }
 } else if (args['--branch']) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "find-cypress-specs",
-  "version": "1.25.2",
+  "version": "1.26.0",
   "description": "Find Cypress spec files using the config settings",
   "main": "src",
   "files": [
@@ -14,9 +14,9 @@
     "test": "ava",
     "cy:run": "DEBUG=cypress:cli,cypress:server:specs cypress run",
     "demo": "DEBUG=find-cypress-specs node ./bin/find",
-    "demo-names": "node ./bin/find --names",
-    "demo-skipped-tests": "node ./bin/find --names --skipped",
-    "demo-count-skipped-tests": "node ./bin/find --names --skipped --count",
+    "demo-names": "DEBUG=find-cypress-specs node ./bin/find --names",
+    "demo-skipped-tests": "DEBUG=find-cypress-specs node ./bin/find --names --skipped",
+    "demo-count-skipped-tests": "DEBUG=find-cypress-specs node ./bin/find --names --skipped --count",
     "demo-tags": "node ./bin/find --tags",
     "demo-tags-json": "node ./bin/find --tags --json",
     "demo-names-and-tags": "node ./bin/find --names --tags",
@@ -44,11 +44,11 @@
   "homepage": "https://github.com/bahmutov/find-cypress-specs#readme",
   "devDependencies": {
     "ava": "^4.0.0",
-    "cypress": "12.3.0",
+    "cypress": "12.7.0",
     "execa-wrap": "^1.4.0",
     "prettier": "^2.5.1",
     "really-need": "^1.9.2",
-    "semantic-release": "20.0.4",
+    "semantic-release": "20.1.0",
     "sinon": "^13.0.1",
     "typescript": "^4.6.3"
   },
@@ -57,7 +57,7 @@
     "arg": "^5.0.1",
     "console.table": "^0.10.0",
     "debug": "^4.3.3",
-    "find-test-names": "1.25.0",
+    "find-test-names": "1.26.0",
     "globby": "^11.0.4",
     "minimatch": "^3.0.4",
     "pluralize": "^8.0.0",

package/src/index.js

@@ -1,3 +1,7 @@
+const { addCounts } = require('../src/count')
+const { getTestNames, countTags } = require('find-test-names')
+const { pickTaggedTestsFrom, leavePendingTestsOnly } = require('../src/tagged')
+
 const debug = require('debug')('find-cypress-specs')
 const fs = require('fs')
 const path = require('path')
@@ -155,8 +159,10 @@ function findCypressSpecsV10(opts = {}) {
   return filtered
 }
 
-function getSpecs() {
-  const options = getConfig()
+function getSpecs(options) {
+  if (typeof options === 'undefined') {
+    options = getConfig()
+  }
   return findCypressSpecs(options)
 }
 
@@ -266,6 +272,68 @@ function findChangedFiles(branch, useParent) {
   }
 }
 
+/**
+ * Collects all specs and for each finds all suits and tests with their tags.
+ */
+function getTests(specs, options = {}) {
+  if (!specs) {
+    specs = getSpecs()
+  }
+
+  const { tags, tagged, skipped } = options
+
+  // counts the number of tests for each tag across all specs
+  const tagTestCounts = {}
+  const jsonResults = {}
+
+  specs.forEach((filename) => {
+    jsonResults[filename] = {
+      counts: {
+        tests: 0,
+        pending: 0,
+      },
+      tests: [],
+    }
+    const source = fs.readFileSync(filename, 'utf8')
+    const result = getTestNames(source, true)
+    // enable if need to debug the parsed test
+    // console.dir(result.structure, { depth: null })
+    collectResults(result.structure, jsonResults[filename].tests)
+
+    if (tags) {
+      const specTagCounts = countTags(result.structure)
+      Object.keys(specTagCounts).forEach((tag) => {
+        if (!(tag in tagTestCounts)) {
+          tagTestCounts[tag] = specTagCounts[tag]
+        } else {
+          tagTestCounts[tag] += specTagCounts[tag]
+        }
+      })
+    }
+  })
+
+  addCounts(jsonResults)
+
+  if (tagged) {
+    // filter all collected tests to those that have the given tag(s)
+    const splitTags = 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)
+  } else if (skipped) {
+    debug('leaving only skipped (pending) tests')
+    leavePendingTestsOnly(jsonResults)
+    // recompute the number of tests
+    addCounts(jsonResults)
+  }
+
+  return { jsonResults, tagTestCounts }
+}
+
 module.exports = {
   getSpecs,
   // individual utilities
@@ -273,4 +341,5 @@ module.exports = {
   findCypressSpecs,
   collectResults,
   findChangedFiles,
+  getTests,
 }