From 902c2bf4797acade7cc7c8f129fb73768c2cc81b Mon Sep 17 00:00:00 2001 From: Bob Evans Date: Wed, 18 Sep 2024 15:43:21 -0400 Subject: [PATCH] test: Fixed @koa/router tests. path-to-regex differs between @koa/router and koa-router now (#2587) --- test/versioned/koa/router-common.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test/versioned/koa/router-common.js b/test/versioned/koa/router-common.js index 698531aec3..3bc0d98159 100644 --- a/test/versioned/koa/router-common.js +++ b/test/versioned/koa/router-common.js @@ -149,7 +149,7 @@ module.exports = (pkg) => { t.test('should name and produce segments for matched wildcard path', (t) => { const { agent, router, app } = t.context let path = '(.*)' - if (semver.gte(pkgVersion, '13.0.1')) { + if (pkg === 'koa-router' && semver.gte(pkgVersion, '13.0.1')) { path = '{*any}' } router.get(`/:first/${path}`, function firstMiddleware(ctx) { @@ -347,15 +347,16 @@ module.exports = (pkg) => { ctx.body = ' second' }) - const segmentTree = semver.gte(pkgVersion, '13.0.1') - ? ['Nodejs/Middleware/Koa/terminalMiddleware//:second'] - : [ - 'Nodejs/Middleware/Koa/secondMiddleware//:first', - [ - 'Nodejs/Middleware/Koa/secondMiddleware//:second', - ['Nodejs/Middleware/Koa/terminalMiddleware//:second'] + const segmentTree = + pkg === 'koa-router' && semver.gte(pkgVersion, '13.0.1') + ? ['Nodejs/Middleware/Koa/terminalMiddleware//:second'] + : [ + 'Nodejs/Middleware/Koa/secondMiddleware//:first', + [ + 'Nodejs/Middleware/Koa/secondMiddleware//:second', + ['Nodejs/Middleware/Koa/terminalMiddleware//:second'] + ] ] - ] app.use(router.routes()) agent.on('transactionFinished', (tx) => { t.assertSegments(tx.trace.root, [