Skip to content

Commit 1a7dc4f

Browse files
committed
fix tests
1 parent 64e51b4 commit 1a7dc4f

4 files changed

Lines changed: 17 additions & 6 deletions

File tree

‎dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheComponents.spec.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ test('Prerendered shell does not stitch the pageload onto a stale trace', async
7171
});
7272

7373
const pageloadSpanPromise = waitForStreamedSpan('nextjs-16-streaming-cacheComponents', span => {
74-
return span.name === '/pageload-tracing' && getSpanOp(span) === 'pageload' && span.is_segment;
74+
return span.name === 'Pageload' && getSpanOp(span) === 'pageload' && span.is_segment;
7575
});
7676

7777
await page.goto('/pageload-tracing');
@@ -80,6 +80,10 @@ test('Prerendered shell does not stitch the pageload onto a stale trace', async
8080

8181
const [serverSpan, pageloadSpan] = await Promise.all([serverSpanPromise, pageloadSpanPromise]);
8282

83+
expect(pageloadSpan.attributes).toMatchObject({
84+
['sentry.segment.name.source']: 'url',
85+
['url.pathname']: '/pageload-tracing',
86+
});
8387
// Under Cache Components the can be prerendered and rendered in a context detached from the
8488
// runtime server request, so a `sentry-trace` meta tag would carry a stale/unrelated trace. The
8589
// SDK therefore does not enable the trace meta tags, and the browser pageload starts a fresh trace

‎dev-packages/e2e-tests/test-applications/nextjs-16-streaming/tests/pageload-tracing.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ test('Server and client pageload spans should share the same trace', async ({ pa
77
});
88

99
const pageloadSpanPromise = waitForStreamedSpan('nextjs-16-streaming', span => {
10-
return span.name === '/pageload-tracing' && getSpanOp(span) === 'pageload' && span.is_segment;
10+
return span.name === 'Pageload' && getSpanOp(span) === 'pageload' && span.is_segment;
1111
});
1212

1313
await page.goto(`/pageload-tracing`);
@@ -16,4 +16,8 @@ test('Server and client pageload spans should share the same trace', async ({ pa
1616

1717
expect(pageloadSpan.trace_id).toBeTruthy();
1818
expect(serverSpan.trace_id).toBe(pageloadSpan.trace_id);
19+
expect(pageloadSpan.attributes).toMatchObject({
20+
['sentry.segment.name.source']: 'url',
21+
['url.pathname']: '/pageload-tracing',
22+
});
1923
});

‎dev-packages/e2e-tests/test-applications/nextjs-16-streaming/tests/parameterized-routes.test.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,19 @@ test('should create a static streamed span when the `app` directory is used and
1919
page,
2020
}) => {
2121
const spanPromise = waitForStreamedSpan('nextjs-16-streaming', span => {
22-
return span.name === '/parameterized/static' && getSpanOp(span) === 'pageload' && span.is_segment;
22+
return span.name === 'Pageload' && getSpanOp(span) === 'pageload' && span.is_segment;
2323
});
2424

2525
await page.goto(`/parameterized/static`);
2626

2727
const span = await spanPromise;
2828

29-
expect(span.name).toBe('/parameterized/static');
29+
expect(span.name).toBe('Pageload');
3030
expect(span.trace_id).toMatch(/[a-f0-9]{32}/);
31-
expect(span.attributes['sentry.source']?.value).toBe('url');
31+
expect(span.attributes).toMatchObject({
32+
['sentry.segment.name.source']: 'url',
33+
['url.pathname']: '/parameterized/static',
34+
});
3235
});
3336

3437
test('should create a partially parameterized streamed span when the `app` directory is used', async ({ page }) => {

‎packages/solidstart/test/client/solidrouter.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe('solidRouterBrowserTracingIntegration', () => {
7171

7272
expect(spanStartMock).toHaveBeenCalledWith(
7373
expect.objectContaining({
74-
name: '/',
74+
name: 'Pageload',
7575
attributes: expect.objectContaining({
7676
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
7777
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',

0 commit comments

Comments
 (0)