skip test for broken versions of express

DataDog · May 31, 2023 · 2643dd3 · 2643dd3
1 parent 0cf85b2
commit 2643dd3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/datadog-plugin-express/test/index.spec.js b/packages/datadog-plugin-express/test/index.spec.js
@@ -708,9 +708,16 @@ describe('Plugin', () => {
         it('should not lose the current path when route handler preceeded by a longer middleware resource', done => {
           const app = express()
 
-          app.use(/\/foo\/(bar|baz|bez)/, (req, res, next) => {
-            next()
-          })
+          try {
+            app.use(/\/foo\/(bar|baz|bez)/, (req, res, next) => {
+              next()
+            })
+          } catch (err) {
+            // eslint-disable-next-line no-console
+            console.log('This version of Express (>4.0 <4.6) has broken support for regex routing. Skipping this test.')
+            this.skip && this.skip() // mocha allows dynamic skipping, tap does not
+            return done()
+          }
 
           app.get('/foo/bar', (req, res) => {
             res.status(200).send('')

diff --git a/packages/datadog-plugin-router/src/index.js b/packages/datadog-plugin-router/src/index.js
@@ -156,6 +156,8 @@ function isMoreSpecificThan (routeA, routeB) {
 }
 
 function routeIsRegex (route) {
+  // console.log('ROUTE', typeof route, route)
+  // return route instanceof RegExp
   return route.startsWith('(/') && route.endsWith('/)')
 }