[test optimization] Move plugin jest tests to integration tests (#6837)

Author: juan-fernandez

.github/workflows/test-optimization.yml

@@ -95,11 +95,32 @@ jobs:
           NODE_OPTIONS: '-r ./ci/init'
           MOCHA_VERSION: ${{ matrix.mocha-version }}
 
+  integration-jest:
+    strategy:
+      matrix:
+        version: [oldest, latest]
+        jest-version: [24.8.0, latest]
+    runs-on: ubuntu-latest
+    env:
+      DD_SERVICE: dd-trace-js-integration-tests
+      DD_CIVISIBILITY_AGENTLESS_ENABLED: 1
+      DD_API_KEY: ${{ secrets.DD_API_KEY }}
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: ./.github/actions/node
+        with:
+          version: ${{ matrix.version }}
+      - uses: ./.github/actions/install
+      - run: yarn test:integration:jest
+        env:
+          NODE_OPTIONS: '-r ./ci/init'
+          JEST_VERSION: ${{ matrix.jest-version }}
+
   integration-ci:
     strategy:
       matrix:
         version: [oldest, latest]
-        framework: [cucumber, selenium, jest]
+        framework: [cucumber, selenium]
     runs-on: ubuntu-latest
     env:
       DD_SERVICE: dd-trace-js-integration-tests
@@ -193,25 +214,3 @@ jobs:
       - uses: ./.github/actions/plugins/test
         with:
           dd_api_key: ${{ secrets.DD_API_KEY }}
-
-  # TODO: fix performance issues and test more Node versions
-  plugin-jest:
-    runs-on: ubuntu-latest
-    env:
-      PLUGINS: jest
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: ./.github/actions/testagent/start
-      - uses: ./.github/actions/node/latest
-      - uses: ./.github/actions/install
-      - run: yarn test:plugins:ci
-      - if: always()
-        uses: ./.github/actions/testagent/logs
-        with:
-          suffix: plugins-${{ github.job }}
-      - uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
-      - uses: DataDog/junit-upload-github-action@762867566348d59ac9bcf479ebb4ec040db8940a  # v2.0.0
-        if: always()
-        with:
-          api_key: ${{ secrets.DD_API_KEY }}
-          service: dd-trace-js-tests

integration-tests/ci-visibility/automatic-log-submission/config-jest.js

@@ -6,5 +6,7 @@ module.exports = {
   cache: false,
   testMatch: [
     '**/ci-visibility/automatic-log-submission/automatic-log-submission-*'
-  ]
+  ],
+  testRunner: 'jest-circus/runner',
+  testEnvironment: 'node'
 }

packages/datadog-plugin-jest/test/jest-focus.js renamed to integration-tests/ci-visibility/jest-plugin-tests/jest-focus.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { describe, it, expect } = require('../../../versions/@jest/globals').get()
+const { describe, it, expect } = require('@jest/globals')
 
 describe('jest-inject-globals', () => {
   it('will be run', () => {

packages/datadog-plugin-jest/test/jest-hook-failure.js renamed to integration-tests/ci-visibility/jest-plugin-tests/jest-hook-failure.js

@@ -4,6 +4,9 @@ const http = require('http')
 
 const tracer = require('dd-trace')
 
+const ENDPOINT_URL = process.env.DD_CIVISIBILITY_AGENTLESS_URL ||
+  `http://127.0.0.1:${process.env.DD_TRACE_AGENT_PORT}`
+
 describe('jest-test-suite', () => {
   jest.setTimeout(400)
 
@@ -40,7 +43,7 @@ describe('jest-test-suite', () => {
   })
 
   it('can do integration http', (done) => {
-    const req = http.request('http://test:123', (res) => {
+    const req = http.request(`${ENDPOINT_URL}/info`, { agent: false }, (res) => {
       expect(res.statusCode).toEqual(200)
       done()
     })

packages/datadog-plugin-jest/test/jest-inject-globals.js renamed to integration-tests/ci-visibility/jest-plugin-tests/jest-inject-globals.js

@@ -5,12 +5,15 @@ const jest = require('jest')
 const options = {
   projects: [__dirname],
   testPathIgnorePatterns: ['/node_modules/'],
+  modulePathIgnorePatterns: ['<rootDir>/\\.bun/'],
   cache: false,
   testRegex: process.env.TESTS_TO_RUN ? new RegExp(process.env.TESTS_TO_RUN) : /test\/ci-visibility-test/,
   coverage: !!process.env.ENABLE_CODE_COVERAGE,
   runInBand: true,
   shard: process.env.TEST_SHARD || undefined,
-  setupFilesAfterEnv: process.env.SETUP_FILES_AFTER_ENV ? process.env.SETUP_FILES_AFTER_ENV.split(',') : []
+  setupFilesAfterEnv: process.env.SETUP_FILES_AFTER_ENV ? process.env.SETUP_FILES_AFTER_ENV.split(',') : [],
+  testRunner: 'jest-circus/runner',
+  testEnvironment: 'node'
 }
 
 if (process.env.RUN_IN_PARALLEL) {
@@ -34,6 +37,10 @@ if (process.env.COLLECT_COVERAGE_FROM) {
   options.collectCoverageFrom = process.env.COLLECT_COVERAGE_FROM.split(',')
 }
 
+if (process.env.DO_NOT_INJECT_GLOBALS) {
+  options.injectGlobals = false
+}
+
 jest.runCLI(
   options,
   options.projects

packages/datadog-plugin-jest/test/jest-test-suite.js renamed to integration-tests/ci-visibility/jest-plugin-tests/jest-test-suite.js

@@ -1,10 +1,9 @@
 'use strict'
 
-const assert = require('node:assert')
 const sum = require('../sum')
 
 describe('ci visibility 2', () => {
   it('can report tests 2', () => {
-    assert.strictEqual(sum(1, 2), 3)
+    expect(sum(1, 2)).toEqual(3)
   })
 })

packages/datadog-plugin-jest/test/jest-test.js renamed to integration-tests/ci-visibility/jest-plugin-tests/jest-test.js

@@ -1,10 +1,9 @@
 'use strict'
 
-const assert = require('node:assert')
 const sum = require('../sum')
 
 describe('ci visibility 3', () => {
   it('can report tests 3', () => {
-    assert.strictEqual(sum(1, 2), 3)
+    expect(sum(1, 2)).toEqual(3)
   })
 })