Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 49d88db

Browse files
juan-fernandezrochdev
authored andcommitted
[test optimization] Fix happy-dom testing issues with latest jest release (#6566)
1 parent 3b2614a commit 49d88db

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

integration-tests/jest/jest.spec.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ const {
6262
} = require('../../packages/dd-trace/src/plugins/util/test')
6363
const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/env')
6464
const { ERROR_MESSAGE } = require('../../packages/dd-trace/src/constants')
65+
const { NODE_MAJOR } = require('../../version')
6566

6667
const testFile = 'ci-visibility/run-jest.js'
6768
const expectedStdout = 'Test Suites: 2 passed'
@@ -2286,8 +2287,9 @@ describe('jest CommonJS', () => {
22862287
}).catch(done)
22872288
})
22882289
})
2289-
2290-
it('works with happy-dom', async () => {
2290+
// happy-dom>=19 can only be used with CJS from node 20 and above
2291+
const happyDomTest = NODE_MAJOR < 20 ? it.skip : it
2292+
happyDomTest('works with happy-dom', async () => {
22912293
// Tests from ci-visibility/test/ci-visibility-test-2.js will be considered new
22922294
receiver.setKnownTests({
22932295
jest: {

packages/datadog-plugin-jest/test/circus.spec.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ function loadAgent (moduleName, version, isAgentlessTest, isEvpProxyTest) {
4848
if (!isEvpProxyTest) {
4949
agent.setAvailableEndpoints([])
5050
}
51-
const isHappyDom = moduleName === '@happy-dom/jest-environment'
5251
return agent.load(
5352
['jest', 'http'],
5453
{ service: 'test' },
@@ -58,19 +57,15 @@ function loadAgent (moduleName, version, isAgentlessTest, isEvpProxyTest) {
5857
global.__libraryVersion__ = version
5958

6059
return {
61-
jestExecutable: isHappyDom
62-
? require('../../../versions/jest').get()
63-
: require(`../../../versions/jest@${version}`).get(),
60+
jestExecutable: require(`../../../versions/jest@${version}`).get(),
6461
jestCommonOptions: {
6562
projects: [__dirname],
6663
testPathIgnorePatterns: ['/node_modules/'],
6764
coverageReporters: ['none'],
6865
reporters: [],
6966
silent: true,
70-
testEnvironment: isHappyDom ? '@happy-dom/jest-environment' : path.join(__dirname, 'env.js'),
71-
testRunner: isHappyDom
72-
? require('../../../versions/jest-circus').getPath('jest-circus/runner')
73-
: require(`../../../versions/jest-circus@${version}`).getPath('jest-circus/runner'),
67+
testEnvironment: path.join(__dirname, 'env.js'),
68+
testRunner: require(`../../../versions/jest-circus@${version}`).getPath('jest-circus/runner'),
7469
cache: false,
7570
maxWorkers: '50%'
7671
}
@@ -85,7 +80,7 @@ describe('Plugin', function () {
8580
this.timeout(testTimeout)
8681
this.retries(2)
8782

88-
const versions = ['jest-environment-node', 'jest-environment-jsdom', '@happy-dom/jest-environment']
83+
const versions = ['jest-environment-node', 'jest-environment-jsdom']
8984

9085
withVersions('jest', versions, (version, moduleName) => {
9186
afterEach(() => {

0 commit comments

Comments
 (0)