From 525f71f414dc91ea22c215a06201f905f3d4cb26 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 5 Feb 2025 15:58:21 +0100 Subject: [PATCH 1/5] test(sveltekit): Unflake SvelteKit fetch proxy E2E test --- .../sveltekit-2.5.0-twp/tests/sdk.test.ts | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts index c1131913d057..9506a3fde095 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts @@ -1,16 +1,17 @@ import { expect, test } from '@playwright/test'; test.describe('SDK-internal behavior', () => { - test('Injects fetch proxy script for SvelteKit<2.16.0', async ({ page }) => { - await page.goto('/'); + // TODO remove before merging + for (let i = 0; i < 100; i++) { + test(`Injects fetch proxy script for SvelteKit<2.16.0 ${i}`, async ({ page }) => { + await page.goto('/'); - const sentryCarrier = await page.evaluate('typeof window.__SENTRY__'); - const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); + // @ts-expect-error this is defined + await page.waitForFunction(() => typeof window.__SENTRY__ === 'object'); + const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); - // sanity check - expect(sentryCarrier).toBe('object'); - - // fetch proxy script ran - expect(proxyHandle).toBe('function'); - }); + // fetch proxy script ran + expect(proxyHandle).toBe('function'); + }); + } }); From 86af2530c7157ab6625e8939cd9bedf28a6e1ec8 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 5 Feb 2025 16:01:47 +0100 Subject: [PATCH 2/5] add second test to be sure --- .../sveltekit-2/tests/sdk.test.ts | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts index f35a81e91238..6844584b5064 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts @@ -2,15 +2,17 @@ import { expect, test } from '@playwright/test'; import { waitForInitialPageload } from './utils'; test.describe('SDK-internal behavior', () => { - test("Doesn't inject fetch proxy script for SvelteKit>=2.16.0", async ({ page }) => { - await waitForInitialPageload(page, { route: '/' }); - const sentryCarrier = await page.evaluate('typeof window.__SENTRY__'); - const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); + for (let i = 0; i < 100; i++) { + test("Doesn't inject fetch proxy script for SvelteKit>=2.16.0", async ({ page }) => { + await waitForInitialPageload(page, { route: '/' }); - // sanity check - expect(sentryCarrier).toBe('object'); + // @ts-expect-error this is defined + await page.waitForFunction(() => typeof window.__SENTRY__ === 'object'); - // fetch proxy script didn't run - expect(proxyHandle).toBe('undefined'); - }); + const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); + + // fetch proxy script didn't run + expect(proxyHandle).toBe('undefined'); + }); + } }); From 1af169b9a1d82cbc18cf96c6e4af27e5e010b7c6 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 5 Feb 2025 16:10:50 +0100 Subject: [PATCH 3/5] start ci From 7f8c8249584ed78902ebe15dceb4b3c1a47964c2 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 5 Feb 2025 16:28:43 +0100 Subject: [PATCH 4/5] . --- .../e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts index 6844584b5064..49679b8063f3 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts @@ -3,7 +3,7 @@ import { waitForInitialPageload } from './utils'; test.describe('SDK-internal behavior', () => { for (let i = 0; i < 100; i++) { - test("Doesn't inject fetch proxy script for SvelteKit>=2.16.0", async ({ page }) => { + test(`Doesn't inject fetch proxy script for SvelteKit>=2.16.0 ${i}`, async ({ page }) => { await waitForInitialPageload(page, { route: '/' }); // @ts-expect-error this is defined From c50a57b6a811b2c35d914637b8c69a2c16826b28 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 5 Feb 2025 16:42:09 +0100 Subject: [PATCH 5/5] revert for loop --- .../sveltekit-2.5.0-twp/tests/sdk.test.ts | 19 ++++++++----------- .../sveltekit-2/tests/sdk.test.ts | 18 ++++++++---------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts index 9506a3fde095..435b9fe48cb8 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts @@ -1,17 +1,14 @@ import { expect, test } from '@playwright/test'; test.describe('SDK-internal behavior', () => { - // TODO remove before merging - for (let i = 0; i < 100; i++) { - test(`Injects fetch proxy script for SvelteKit<2.16.0 ${i}`, async ({ page }) => { - await page.goto('/'); + test('Injects fetch proxy script for SvelteKit<2.16.0', async ({ page }) => { + await page.goto('/'); - // @ts-expect-error this is defined - await page.waitForFunction(() => typeof window.__SENTRY__ === 'object'); - const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); + // @ts-expect-error this is defined + await page.waitForFunction(() => typeof window.__SENTRY__ === 'object'); + const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); - // fetch proxy script ran - expect(proxyHandle).toBe('function'); - }); - } + // fetch proxy script ran + expect(proxyHandle).toBe('function'); + }); }); diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts index 49679b8063f3..8633439eb503 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts @@ -2,17 +2,15 @@ import { expect, test } from '@playwright/test'; import { waitForInitialPageload } from './utils'; test.describe('SDK-internal behavior', () => { - for (let i = 0; i < 100; i++) { - test(`Doesn't inject fetch proxy script for SvelteKit>=2.16.0 ${i}`, async ({ page }) => { - await waitForInitialPageload(page, { route: '/' }); + test("Doesn't inject fetch proxy script for SvelteKit>=2.16.0", async ({ page }) => { + await waitForInitialPageload(page, { route: '/' }); - // @ts-expect-error this is defined - await page.waitForFunction(() => typeof window.__SENTRY__ === 'object'); + // @ts-expect-error this is defined + await page.waitForFunction(() => typeof window.__SENTRY__ === 'object'); - const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); + const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); - // fetch proxy script didn't run - expect(proxyHandle).toBe('undefined'); - }); - } + // fetch proxy script didn't run + expect(proxyHandle).toBe('undefined'); + }); });