Skip to content

Commit c9df240

Browse files
authored
test: remove withVersions global (#6249)
This makes sure the withVersions helper is imported in all test files. That helps IDEs to show the description and allows to jump to the implementation. As drive-by, remove assert.doesNotThrow() and replace those with a comment. The call itself just adds CPU cycles and a comment should be fine as such.
1 parent 48fd822 commit c9df240

File tree

145 files changed

+148
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+148
-11
lines changed

eslint.config.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,6 @@ export default [
543543
sinon: 'readonly',
544544
expect: 'readonly',
545545
proxyquire: 'readonly',
546-
withVersions: 'readonly',
547546
}
548547
},
549548
plugins: {

packages/datadog-instrumentations/test/body-parser.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const dc = require('dc-polyfill')
44
const axios = require('axios')
55
const agent = require('../../dd-trace/test/plugins/agent')
66
const { storage } = require('../../datadog-core')
7+
const { withVersions } = require('../../dd-trace/test/setup/mocha')
78

89
withVersions('body-parser', 'body-parser', version => {
910
describe('body parser instrumentation', () => {

packages/datadog-instrumentations/test/cookie-parser.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const { assert } = require('chai')
44
const dc = require('dc-polyfill')
55
const axios = require('axios')
66
const agent = require('../../dd-trace/test/plugins/agent')
7+
const { withVersions } = require('../../dd-trace/test/setup/mocha')
78

89
withVersions('cookie-parser', 'cookie-parser', version => {
910
describe('cookie parser instrumentation', () => {

packages/datadog-instrumentations/test/express-mongo-sanitize.spec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
const agent = require('../../dd-trace/test/plugins/agent')
44
const { channel } = require('dc-polyfill')
55
const axios = require('axios')
6+
const { withVersions } = require('../../dd-trace/test/setup/mocha')
7+
68
describe('express-mongo-sanitize', () => {
79
withVersions('express-mongo-sanitize', 'express-mongo-sanitize', version => {
810
describe('middleware', () => {

packages/datadog-instrumentations/test/express-session.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const { assert } = require('chai')
44
const dc = require('dc-polyfill')
55
const axios = require('axios')
66
const agent = require('../../dd-trace/test/plugins/agent')
7+
const { withVersions } = require('../../dd-trace/test/setup/mocha')
78

89
withVersions('express-session', 'express-session', version => {
910
describe('express-session instrumentation', () => {

packages/datadog-instrumentations/test/express.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const agent = require('../../dd-trace/test/plugins/agent')
44
const axios = require('axios')
55
const dc = require('dc-polyfill')
6+
const { withVersions } = require('../../dd-trace/test/setup/mocha')
67

78
withVersions('express', 'express', version => {
89
describe('express query instrumentation', () => {

packages/datadog-instrumentations/test/generic-pool.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
require('..')
44
const { storage } = require('../../datadog-core')
5+
const { withVersions } = require('../../dd-trace/test/setup/mocha')
56

67
describe('Instrumentation', () => {
78
let genericPool

packages/datadog-instrumentations/test/helpers/promise.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const { expect } = require('chai')
44
const semver = require('semver')
55
const { storage } = require('../../../datadog-core')
66
const agent = require('../../../dd-trace/test/plugins/agent')
7+
const { withVersions } = require('../../../dd-trace/test/setup/mocha')
78

89
module.exports = (name, factory, versionRange) => {
910
describe('Instrumentation', () => {

packages/datadog-instrumentations/test/knex.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
require('../src/knex')
44
const { storage } = require('../../datadog-core')
5+
const { withVersions } = require('../../dd-trace/test/setup/mocha')
56

67
describe('Instrumentation', () => {
78
let knex

packages/datadog-instrumentations/test/mongoose.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
const agent = require('../../dd-trace/test/plugins/agent')
44
const { channel } = require('../src/helpers/instrument')
5+
const { withVersions } = require('../../dd-trace/test/setup/mocha')
56
const semver = require('semver')
67

78
const startCh = channel('datadog:mongoose:model:filter:start')

0 commit comments

Comments
 (0)