Fix node integration tests

Author: timfish

dev-packages/node-integration-tests/suites/contextLines/memory-leak/test.ts

@@ -1,16 +1,18 @@
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+import { describe, afterAll, test } from 'vitest';
 
 describe('ContextLines integration in CJS', () => {
   afterAll(() => {
     cleanupChildProcesses();
   });
 
   // Regression test for: https://github.com/getsentry/sentry-javascript/issues/14892
-  test('does not leak open file handles', done => {
-    createRunner(__dirname, 'scenario.ts')
+  test('does not leak open file handles', async () => {
+   await createRunner(__dirname, 'scenario.ts')
       .expectN(10, {
         event: {},
       })
-      .start(done);
+      .start()
+      .completed();
   });
 });

dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/test.ts

@@ -1,4 +1,4 @@
-import { afterAll, test } from 'vitest';
+import { afterAll, test, describe } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
 
 afterAll(() => {

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/test.ts

@@ -1,12 +1,13 @@
 import { createRunner } from '../../../../utils/runner';
+import { describe, test, expect } from 'vitest'
 
 // Graphql Instrumentation emits some spans by default on server start
 const EXPECTED_START_SERVER_TRANSACTION = {
   transaction: 'Test Server Start',
 };
 
 describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
-  test('useOperationNameForRootSpan works with single query operation', done => {
+  test('useOperationNameForRootSpan works with single query operation', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'GET /test-graphql (query GetHello)',
       spans: expect.arrayContaining([
@@ -24,13 +25,14 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-query.js')
+    await createRunner(__dirname, 'scenario-query.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan works with single mutation operation', done => {
+  test('useOperationNameForRootSpan works with single mutation operation', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'GET /test-graphql (mutation TestMutation)',
       spans: expect.arrayContaining([
@@ -50,13 +52,14 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-mutation.js')
+    await createRunner(__dirname, 'scenario-mutation.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan ignores an invalid root span', done => {
+  test('useOperationNameForRootSpan ignores an invalid root span', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'test span name',
       spans: expect.arrayContaining([
@@ -74,13 +77,14 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-invalid-root-span.js')
+    await createRunner(__dirname, 'scenario-invalid-root-span.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan works with single query operation without name', done => {
+  test('useOperationNameForRootSpan works with single query operation without name', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'GET /test-graphql (query)',
       spans: expect.arrayContaining([
@@ -97,13 +101,14 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-no-operation-name.js')
+    await createRunner(__dirname, 'scenario-no-operation-name.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan works with multiple query operations', done => {
+  test('useOperationNameForRootSpan works with multiple query operations', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'GET /test-graphql (query GetHello, query GetWorld)',
       spans: expect.arrayContaining([
@@ -132,21 +137,23 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-multiple-operations.js')
+    await createRunner(__dirname, 'scenario-multiple-operations.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan works with more than 5 query operations', done => {
+  test('useOperationNameForRootSpan works with more than 5 query operations', async () => {
     const EXPECTED_TRANSACTION = {
       transaction:
         'GET /test-graphql (query GetHello1, query GetHello2, query GetHello3, query GetHello4, query GetHello5, +4)',
     };
 
-    createRunner(__dirname, 'scenario-multiple-operations-many.js')
+    await createRunner(__dirname, 'scenario-multiple-operations-many.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 });

dev-packages/node-integration-tests/utils/assertions.ts

@@ -8,6 +8,7 @@ import type {
   SessionAggregates,
   TransactionEvent,
 } from '@sentry/core';
+import { expect } from 'vitest';
 
 /**
  * Asserts against a Sentry Event ignoring non-deterministic properties

dev-packages/node-integration-tests/utils/index.ts

@@ -1,6 +1,7 @@
 import type * as http from 'http';
 import { parseSemver } from '@sentry/core';
 import type { EnvelopeItemType } from '@sentry/core';
+import { describe } from 'vitest';
 
 const NODE_VERSION = parseSemver(process.versions.node).major;