Merge remote-tracking branch 'origin' into ryanm/fix/issue-with-optional-chainer

Author: ryanthemanuel

.circleci/config.yml

@@ -9,7 +9,7 @@ jobs:
   lint:
     description: Checks the code formatting
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.8.0
         environment:
           # we don't need Cypress to check code style
           CYPRESS_INSTALL_BINARY: '0'
@@ -71,7 +71,7 @@ jobs:
   publish:
     description: Publishes the new version of the plugin to NPM
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.8.0
     environment:
       # we don't need Cypress to do the release
       CYPRESS_INSTALL_BINARY: '0'
@@ -152,6 +152,7 @@ workflows:
                 - exclude-files
                 - frontend
                 - fullstack
+                - multiple-backends
                 - one-spec
                 - same-folder
                 - support-files
@@ -179,6 +180,7 @@ workflows:
             - test-exclude-files
             - test-frontend
             - test-fullstack
+            - test-multiple-backends
             - test-one-spec
             - test-same-folder
             - test-support-files

README.md

@@ -214,6 +214,18 @@ if (global.__coverage__) {
 }
 ```
 
+Or if you have multiple servers from which you are wanting to gather code coverage, you can pass an array to `url` as well:
+
+```json
+{
+  "env": {
+    "codeCoverage": {
+      "url": ["http://localhost:3000/__coverage__", "http://localhost:3001/__coverage__"]
+    }
+  }
+}
+```
+
 That should be enough - the code coverage from the server will be requested at the end of the test run and merged with the client-side code coverage, producing a combined report.
 
 ### expectBackendCoverageOnly

package-lock.json

@@ -78,7 +78,7 @@
     "rimraf": "6.0.1",
     "semantic-release": "17.4.7",
     "serve": "14.2.1",
-    "start-server-and-test": "2.0.5",
+    "start-server-and-test": "2.0.7",
     "webpack": "^5.68.0",
     "webpack-cli": "^5.1.4"
   }

package.json

@@ -137,8 +137,9 @@ const filterSupportFilesFromCoverage = (
 function fixSourcePaths(coverage) {
   Object.values(coverage).forEach((file) => {
     const { path: absolutePath, inputSourceMap } = file
+    if (!inputSourceMap) return
     const fileName = /([^\/\\]+)$/.exec(absolutePath)[1]
-    if (!inputSourceMap || !fileName) return
+    if (!fileName) return
 
     if (inputSourceMap.sourceRoot) inputSourceMap.sourceRoot = ''
     inputSourceMap.sources = inputSourceMap.sources.map((source) =>

support-utils.js

@@ -155,39 +155,49 @@ const registerHooks = () => {
       // we can only request server-side code coverage
       // if we are running end-to-end tests,
       // otherwise where do we send the request?
-      const url = Cypress._.get(
+      const captureUrls = Cypress._.get(
         Cypress.env('codeCoverage'),
         'url',
         '/__coverage__'
       )
-      cy.request({
-        url,
-        log: false,
-        failOnStatusCode: false
-      })
-        .then((r) => {
-          return Cypress._.get(r, 'body.coverage', null)
+      function captureCoverage(url, suffix = '') {
+        cy.request({
+          url,
+          log: false,
+          failOnStatusCode: false
         })
-        .then((coverage) => {
-          if (!coverage) {
-            // we did not get code coverage - this is the
-            // original failed request
-            const expectBackendCoverageOnly = Cypress._.get(
-              Cypress.env('codeCoverage'),
-              'expectBackendCoverageOnly',
-              false
-            )
-            if (expectBackendCoverageOnly) {
-              throw new Error(
-                `Expected to collect backend code coverage from ${url}`
+          .then((r) => {
+            return Cypress._.get(r, 'body.coverage', null)
+          })
+          .then((coverage) => {
+            if (!coverage) {
+              // we did not get code coverage - this is the
+              // original failed request
+              const expectBackendCoverageOnly = Cypress._.get(
+                Cypress.env('codeCoverage'),
+                'expectBackendCoverageOnly',
+                false
               )
-            } else {
-              // we did not really expect to collect the backend code coverage
-              return
+              if (expectBackendCoverageOnly) {
+                throw new Error(
+                  `Expected to collect backend code coverage from ${url}`
+                )
+              } else {
+                // we did not really expect to collect the backend code coverage
+                return
+              }
             }
-          }
-          sendCoverage(coverage, 'backend')
-        })
+            sendCoverage(coverage, `backend${suffix}`)
+          })
+      }
+
+      if (Array.isArray(captureUrls)) {
+        for (const [index, url] of captureUrls.entries()) {
+          captureCoverage(url, `_${index}`)
+        }
+      } else {
+        captureCoverage(captureUrls)
+      }
     }
   })