finalize tests and config

Lms24 · Lms24 · commit 8d436c8f7ce1 · 2024-01-31T15:39:10.000+01:00
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/event-proxy-server.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/event-proxy-server.ts
@@ -6,7 +6,7 @@ import * as os from 'os';
 import * as path from 'path';
 import * as util from 'util';
 import * as zlib from 'zlib';
-import type { Envelope, EnvelopeItem, Event } from '@sentry/types';
+import type { Envelope, EnvelopeItem, SerializedEvent } from '@sentry/types';
 import { parseEnvelope } from '@sentry/utils';
 
 const readFile = util.promisify(fs.readFile);
@@ -210,13 +210,13 @@ export function waitForEnvelopeItem(
 
 export function waitForError(
   proxyServerName: string,
-  callback: (transactionEvent: Event) => Promise<boolean> | boolean,
-): Promise<Event> {
+  callback: (transactionEvent: SerializedEvent) => Promise<boolean> | boolean,
+): Promise<SerializedEvent> {
   return new Promise((resolve, reject) => {
     waitForEnvelopeItem(proxyServerName, async envelopeItem => {
       const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
-      if (envelopeItemHeader.type === 'event' && (await callback(envelopeItemBody as Event))) {
-        resolve(envelopeItemBody as Event);
+      if (envelopeItemHeader.type === 'event' && (await callback(envelopeItemBody as SerializedEvent))) {
+        resolve(envelopeItemBody as SerializedEvent);
         return true;
       }
       return false;
@@ -226,13 +226,13 @@ export function waitForError(
 
 export function waitForTransaction(
   proxyServerName: string,
-  callback: (transactionEvent: Event) => Promise<boolean> | boolean,
-): Promise<Event> {
+  callback: (transactionEvent: SerializedEvent) => Promise<boolean> | boolean,
+): Promise<SerializedEvent> {
   return new Promise((resolve, reject) => {
     waitForEnvelopeItem(proxyServerName, async envelopeItem => {
       const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
-      if (envelopeItemHeader.type === 'transaction' && (await callback(envelopeItemBody as Event))) {
-        resolve(envelopeItemBody as Event);
+      if (envelopeItemHeader.type === 'transaction' && (await callback(envelopeItemBody as SerializedEvent))) {
+        resolve(envelopeItemBody as SerializedEvent);
         return true;
       }
       return false;
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json
@@ -22,7 +22,7 @@
     "@sentry/utils": "latest || *",
     "@sveltejs/adapter-auto": "^3.0.0",
     "@sveltejs/adapter-node": "^2.0.0",
-    "@sveltejs/kit": "^2.0.0",
+    "@sveltejs/kit": "^2.5.0",
 		"@sveltejs/vite-plugin-svelte": "^3.0.0",
     "svelte": "^4.2.8",
     "svelte-check": "^3.6.0",
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/playwright.config.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/playwright.config.ts
@@ -30,7 +30,8 @@ const config: PlaywrightTestConfig = {
     timeout: 10000,
   },
   /* Run tests in files in parallel */
-  fullyParallel: true,
+  fullyParallel: false,
+  workers: 1,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* `next dev` is incredibly buggy with the app dir */
@@ -69,7 +70,7 @@ const config: PlaywrightTestConfig = {
       command:
         testEnv === 'development'
           ? `pnpm wait-port ${eventProxyPort} && pnpm dev --port ${svelteKitPort}`
-          : `pnpm wait-port ${eventProxyPort} && pnpm preview --port ${svelteKitPort}`,
+          : `pnpm wait-port ${eventProxyPort} && PORT=${svelteKitPort} node build`,
       port: svelteKitPort,
       reuseExistingServer: false,
     },
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/src/app.html b/dev-packages/e2e-tests/test-applications/sveltekit-2/src/app.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width" />
     %sveltekit.head%
   </head>
-  <body data-sveltekit-preload-data="hover">
+  <body data-sveltekit-preload-data="off">
     <div style="display: contents">%sveltekit.body%</div>
   </body>
 </html>
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/test/errors.client.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/test/errors.client.test.ts
@@ -2,8 +2,8 @@ import { expect, test } from '@playwright/test';
 import { waitForError } from '../event-proxy-server';
 import { waitForInitialPageload } from './utils';
 
-test.describe('capturing client side errors', () => {
-  test('should capture error thrown on click', async ({ page }) => {
+test.describe('client-side errors', () => {
+  test('captures error thrown on click', async ({ page }) => {
     await page.goto('/client-error');
 
     await expect(page.getByText('Client error')).toBeVisible();
@@ -29,7 +29,7 @@ test.describe('capturing client side errors', () => {
     expect(errorEvent.tags).toMatchObject({ runtime: 'browser' });
   });
 
-  test('should capture universal load error', async ({ page }) => {
+  test('captures universal load error', async ({ page }) => {
     await waitForInitialPageload(page);
     await page.reload();
 
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/test/errors.server.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/test/errors.server.test.ts
@@ -1,8 +1,8 @@
 import { expect, test } from '@playwright/test';
 import { waitForError } from '../event-proxy-server';
 
-test.describe('capturing server side errors', () => {
-  test('should capture universal load error', async ({ page }) => {
+test.describe('server-side errors', () => {
+  test('captures universal load error', async ({ page }) => {
     const errorEventPromise = waitForError('sveltekit-2', errorEvent => {
       return errorEvent?.exception?.values?.[0]?.value === 'Universal Load Error (server)';
     });
@@ -15,15 +15,14 @@ test.describe('capturing server side errors', () => {
     expect(errorEventFrames?.[errorEventFrames?.length - 1]).toEqual(
       expect.objectContaining({
         function: 'load$1',
-        lineno: 3,
         in_app: true,
       }),
     );
 
     expect(errorEvent.tags).toMatchObject({ runtime: 'node' });
   });
 
-  test('should capture server load error', async ({ page }) => {
+  test('captures server load error', async ({ page }) => {
     const errorEventPromise = waitForError('sveltekit-2', errorEvent => {
       return errorEvent?.exception?.values?.[0]?.value === 'Server Load Error';
     });
@@ -36,15 +35,14 @@ test.describe('capturing server side errors', () => {
     expect(errorEventFrames?.[errorEventFrames?.length - 1]).toEqual(
       expect.objectContaining({
         function: 'load$1',
-        lineno: 3,
         in_app: true,
       }),
     );
 
     expect(errorEvent.tags).toMatchObject({ runtime: 'node' });
   });
 
-  test('should capture server route (GET) error', async ({ page }) => {
+  test('captures server route (GET) error', async ({ page }) => {
     const errorEventPromise = waitForError('sveltekit-2', errorEvent => {
       return errorEvent?.exception?.values?.[0]?.value === 'Server Route Error';
     });
@@ -56,9 +54,8 @@ test.describe('capturing server side errors', () => {
 
     expect(errorEventFrames?.[errorEventFrames?.length - 1]).toEqual(
       expect.objectContaining({
-        filename: 'app:///_server.ts.js',
+        filename: expect.stringContaining('app:///_server.ts'),
         function: 'GET',
-        lineno: 2,
         in_app: true,
       }),
     );
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/test/transaction.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/test/transaction.test.ts
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/test/utils.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/test/utils.ts
@@ -45,9 +45,5 @@ export async function waitForInitialPageload(
     clientPageloadTxnEventPromise,
   ]);
 
-  // let's add a buffer because it seems like the hydrated flag isn't enough :(
-  // guess: The layout finishes hydration/mounting before the components within finish
-  await page.waitForTimeout(3000);
-
   debug && console.log('hydrated');
 }

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,5 @@ export async function waitForInitialPageload(`
`45`	`45`	`clientPageloadTxnEventPromise,`
`46`	`46`	`]);`
`47`	`47`
`48`		`- // let's add a buffer because it seems like the hydrated flag isn't enough :(`
`49`		`- // guess: The layout finishes hydration/mounting before the components within finish`
`50`		`- await page.waitForTimeout(3000);`
`51`		`-`
`52`	`48`	`debug && console.log('hydrated');`
`53`	`49`	`}`