Skip to content

Commit 07a7527

Browse files
committed
test(sveltekit): Use the conventions constants in the tunnel tests
1 parent 0f8a577 commit 07a7527

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

‎dev-packages/e2e-tests/test-applications/sveltekit-3-cloudflare-workers/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
},
2121
"devDependencies": {
2222
"@playwright/test": "~1.63.0",
23+
"@sentry/conventions": "0.27.0",
2324
"@sentry-internal/test-utils": "link:../../../test-utils",
2425
"@sveltejs/adapter-cloudflare": "^8.0.0",
2526
"@sveltejs/kit": "^3.0.0",

‎dev-packages/e2e-tests/test-applications/sveltekit-3-cloudflare-workers/tests/tunnel.test.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { URL_PATH } from '@sentry/conventions/attributes';
2+
import { HTTP_SERVER } from '@sentry/conventions/op';
13
import { expect, test } from '@playwright/test';
24
import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
35

@@ -12,7 +14,7 @@ test('serves the managed tunnel from the Worker under the base path', async ({ p
1214
);
1315
const tunnelServerSpanPromise = waitForStreamedSpan(
1416
'sveltekit-3-cloudflare-workers',
15-
span => getSpanOp(span) === 'http.server' && TUNNEL_PATH.test(String(span.attributes['url.path']?.value ?? '')),
17+
span => getSpanOp(span) === HTTP_SERVER && TUNNEL_PATH.test(String(span.attributes[URL_PATH]?.value ?? '')),
1618
);
1719
const tunnelResponsePromise = page.waitForResponse(
1820
response => response.request().method() === 'POST' && TUNNEL_PATH.test(new URL(response.url()).pathname),
@@ -30,8 +32,8 @@ test('serves the managed tunnel from the Worker under the base path', async ({ p
3032
const anchorSpanPromise = waitForStreamedSpan(
3133
'sveltekit-3-cloudflare-workers',
3234
span =>
33-
getSpanOp(span) === 'http.server' &&
34-
String(span.attributes['url.path']?.value ?? '').startsWith('/app/server-load-error'),
35+
getSpanOp(span) === HTTP_SERVER &&
36+
String(span.attributes[URL_PATH]?.value ?? '').startsWith('/app/server-load-error'),
3537
);
3638
await page.request.get('/app/server-load-error');
3739

‎dev-packages/e2e-tests/test-applications/sveltekit-3/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"@playwright/test": "~1.63.0",
24+
"@sentry/conventions": "0.27.0",
2425
"@sentry-internal/test-utils": "link:../../../test-utils",
2526
"@sveltejs/adapter-node": "^6.0.0",
2627
"@sveltejs/kit": "^3.0.0",

‎dev-packages/e2e-tests/test-applications/sveltekit-3/tests/tunnel.test.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { URL_PATH } from '@sentry/conventions/attributes';
2+
import { HTTP_SERVER } from '@sentry/conventions/op';
13
import { expect, test } from '@playwright/test';
24
import { getSpanOp, waitForError, waitForStreamedSpan } from '@sentry-internal/test-utils';
35

@@ -12,7 +14,7 @@ test('sends client events through the managed tunnel under the base path', async
1214
);
1315
const tunnelServerSpanPromise = waitForStreamedSpan(
1416
'sveltekit-3',
15-
span => getSpanOp(span) === 'http.server' && TUNNEL_PATH.test(String(span.attributes['url.path']?.value ?? '')),
17+
span => getSpanOp(span) === HTTP_SERVER && TUNNEL_PATH.test(String(span.attributes[URL_PATH]?.value ?? '')),
1618
);
1719

1820
// The pageload envelope is the first tunnel request, and it's only sent once the app hydrated.
@@ -32,8 +34,7 @@ test('sends client events through the managed tunnel under the base path', async
3234
// would arrive first.
3335
const anchorSpanPromise = waitForStreamedSpan(
3436
'sveltekit-3',
35-
span =>
36-
getSpanOp(span) === 'http.server' && String(span.attributes['url.path']?.value ?? '').startsWith('/app/users'),
37+
span => getSpanOp(span) === HTTP_SERVER && String(span.attributes[URL_PATH]?.value ?? '').startsWith('/app/users'),
3738
);
3839
await page.request.get('/app/users/123');
3940

0 commit comments

Comments
 (0)