Skip to content

test(ref): Avoid some unnecessary conditions in tests #12493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2024
Merged

test(ref): Avoid some unnecessary conditions in tests #12493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/browser/test/unit/eventbuilder.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('eventFromUnknownInput', () => {

const event = eventFromUnknownInput(defaultStackParser, deepObject);

expect(event?.extra?.__serialized__).toEqual({
expect(event.extra?.__serialized__).toEqual({
a: {
b: {
c: {
Expand Down
8 changes: 4 additions & 4 deletions packages/browser/test/unit/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,10 @@ describe('SentryBrowser initialization', () => {

const sdkData = getClient()?.getOptions()._metadata?.sdk || {};

expect(sdkData?.name).toBe('sentry.javascript.browser');
expect(sdkData?.packages?.[0]?.name).toBe('npm:@sentry/browser');
expect(sdkData?.packages?.[0]?.version).toBe(SDK_VERSION);
expect(sdkData?.version).toBe(SDK_VERSION);
expect(sdkData.name).toBe('sentry.javascript.browser');
expect(sdkData.packages?.[0]?.name).toBe('npm:@sentry/browser');
expect(sdkData.packages?.[0]?.version).toBe(SDK_VERSION);
expect(sdkData.version).toBe(SDK_VERSION);
});

it('uses SDK source from window for package name', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/browser/test/unit/profiling/integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ describe('BrowserProfilingIntegration', () => {

expect(send).toHaveBeenCalledTimes(1);

const profile = send.mock.calls?.[0]?.[0]?.[1]?.[1]?.[1];
const transaction = send.mock.calls?.[0]?.[0]?.[1]?.[0]?.[1];
const profile = send.mock.calls[0]?.[0]?.[1]?.[1]?.[1];
const transaction = send.mock.calls[0]?.[0]?.[1]?.[0]?.[1];
const profile_timestamp_ms = new Date(profile.timestamp).getTime();
const transaction_timestamp_ms = new Date(transaction.start_timestamp * 1e3).getTime();

Expand Down
20 changes: 10 additions & 10 deletions packages/browser/test/unit/tracing/browserTracingIntegration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,8 +672,8 @@ describe('browserTracingIntegration', () => {
traceId: expect.stringMatching(/[a-f0-9]{32}/),
});

expect(newIsolationScopePropCtx?.traceId).not.toEqual(oldIsolationScopePropCtx?.traceId);
expect(newCurrentScopePropCtx?.traceId).not.toEqual(oldCurrentScopePropCtx?.traceId);
expect(newIsolationScopePropCtx.traceId).not.toEqual(oldIsolationScopePropCtx.traceId);
expect(newCurrentScopePropCtx.traceId).not.toEqual(oldCurrentScopePropCtx.traceId);
});

it("saves the span's positive sampling decision and its DSC on the propagationContext when the span finishes", () => {
Expand Down Expand Up @@ -701,16 +701,16 @@ describe('browserTracingIntegration', () => {

const propCtxAfterEnd = getCurrentScope().getPropagationContext();
expect(propCtxAfterEnd).toStrictEqual({
spanId: propCtxBeforeEnd?.spanId,
traceId: propCtxBeforeEnd?.traceId,
spanId: propCtxBeforeEnd.spanId,
traceId: propCtxBeforeEnd.traceId,
sampled: true,
dsc: {
environment: 'production',
public_key: 'examplePublicKey',
sample_rate: '1',
sampled: 'true',
transaction: 'mySpan',
trace_id: propCtxBeforeEnd?.traceId,
trace_id: propCtxBeforeEnd.traceId,
},
});
});
Expand Down Expand Up @@ -740,16 +740,16 @@ describe('browserTracingIntegration', () => {

const propCtxAfterEnd = getCurrentScope().getPropagationContext();
expect(propCtxAfterEnd).toStrictEqual({
spanId: propCtxBeforeEnd?.spanId,
traceId: propCtxBeforeEnd?.traceId,
spanId: propCtxBeforeEnd.spanId,
traceId: propCtxBeforeEnd.traceId,
sampled: false,
dsc: {
environment: 'production',
public_key: 'examplePublicKey',
sample_rate: '0',
sampled: 'false',
transaction: 'mySpan',
trace_id: propCtxBeforeEnd?.traceId,
trace_id: propCtxBeforeEnd.traceId,
},
});
});
Expand Down Expand Up @@ -950,7 +950,7 @@ describe('browserTracingIntegration', () => {
client.emit('idleSpanEnableAutoFinish', idleSpan!);

const span = startInactiveSpan({ name: 'inner1' });
span?.end(); // activities = 0
span.end(); // activities = 0

// inner1 is now ended, all good
expect(spans).toHaveLength(1);
Expand Down Expand Up @@ -985,7 +985,7 @@ describe('browserTracingIntegration', () => {
client.emit('idleSpanEnableAutoFinish', idleSpan!);

const span = startInactiveSpan({ name: 'inner1' });
span?.end(); // activities = 0
span.end(); // activities = 0

// inner1 is now ended, all good
expect(spans).toHaveLength(1);
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/lib/integrations/functiontostring.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('FunctionToString', () => {
expect(foo.bar.toString()).not.toBe(originalFunction);

const fts = functionToStringIntegration();
getClient()?.addIntegration?.(fts);
getClient()?.addIntegration(fts);

expect(foo.bar.toString()).toBe(originalFunction);
});
Expand Down
24 changes: 12 additions & 12 deletions packages/core/test/lib/tracing/idleSpan.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ describe('startIdleSpan', () => {
startSpanManual({ name: 'inner1' }, span => {
const childSpan = startInactiveSpan({ name: 'inner2' });

span?.end();
span.end();
jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout + 1);

// Idle span is still recording
expect(idleSpan.isRecording()).toBe(true);

childSpan?.end();
childSpan.end();
jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout + 1);

// Now it is finished!
Expand Down Expand Up @@ -348,7 +348,7 @@ describe('startIdleSpan', () => {
const idleSpan = startIdleSpan({ name: 'idle span' });
expect(idleSpan).toBeDefined();

idleSpan?.end();
idleSpan.end();

expect(recordDroppedEventSpy).toHaveBeenCalledWith('sample_rate', 'transaction');
});
Expand Down Expand Up @@ -649,13 +649,13 @@ describe('startIdleSpan', () => {
expect(idleSpan).toBeDefined();

const span1 = startInactiveSpan({ name: 'span1', startTime: 1001 });
span1?.end(1005);
span1.end(1005);

const span2 = startInactiveSpan({ name: 'span2', startTime: 1002 });
span2?.end(1100);
span2.end(1100);

const span3 = startInactiveSpan({ name: 'span1', startTime: 1050 });
span3?.end(1060);
span3.end(1060);

expect(getActiveSpan()).toBe(idleSpan);

Expand All @@ -669,13 +669,13 @@ describe('startIdleSpan', () => {
expect(idleSpan).toBeDefined();

const span1 = startInactiveSpan({ name: 'span1', startTime: 1001 });
span1?.end(1005);
span1.end(1005);

const span2 = startInactiveSpan({ name: 'span2', startTime: 1002 });
span2?.end(1100);
span2.end(1100);

const span3 = startInactiveSpan({ name: 'span1', startTime: 1050 });
span3?.end(1060);
span3.end(1060);

expect(getActiveSpan()).toBe(idleSpan);

Expand All @@ -689,13 +689,13 @@ describe('startIdleSpan', () => {
expect(idleSpan).toBeDefined();

const span1 = startInactiveSpan({ name: 'span1', startTime: 999_999_999 });
span1?.end(1005);
span1.end(1005);

const span2 = startInactiveSpan({ name: 'span2', startTime: 1002 });
span2?.end(1100);
span2.end(1100);

const span3 = startInactiveSpan({ name: 'span1', startTime: 1050 });
span3?.end(1060);
span3.end(1060);

expect(getActiveSpan()).toBe(idleSpan);

Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/lib/tracing/trace.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ describe('startInactiveSpan', () => {
startSpan({ name: 'outer transaction' }, () => {
startSpan({ name: 'inner span' }, () => {
const innerTransaction = startInactiveSpan({ name: 'inner transaction', forceTransaction: true });
innerTransaction?.end();
innerTransaction.end();
});
});

Expand Down Expand Up @@ -1516,10 +1516,10 @@ describe('span hooks', () => {

startSpanManual({ name: 'span5' }, span => {
startInactiveSpan({ name: 'span4' });
span?.end();
span.end();
});

span?.end();
span.end();
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/mocks/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class TestClient extends BaseClient<TestClientOptions> {
};

const frames = this._options.stackParser(exception.stack || '', 1);
if (frames.length && event?.exception?.values?.[0]) {
if (frames.length && event.exception?.values?.[0]) {
event.exception.values[0] = { ...event.exception.values[0], stacktrace: { frames } };
}

Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/mocks/integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export class TestIntegration implements Integration {

public setupOnce(): void {
const eventProcessor: EventProcessor = (event: Event) => {
if (!getClient()?.getIntegrationByName?.('TestIntegration')) {
if (!getClient()?.getIntegrationByName('TestIntegration')) {
return event;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/node/test/integration/scope.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('Integration | Scope', () => {
scope2.setTag('tag3', 'val3');

Sentry.startSpan({ name: 'outer' }, span => {
expect(getCapturedScopesOnSpan(span)?.scope).toBe(enableTracing ? scope2 : undefined);
expect(getCapturedScopesOnSpan(span).scope).toBe(enableTracing ? scope2 : undefined);

spanId = span.spanContext().spanId;
traceId = span.spanContext().traceId;
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry/test/integration/scope.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe('Integration | Scope', () => {
scope2.setTag('tag3', 'val3');

startSpan({ name: 'outer' }, span => {
expect(getCapturedScopesOnSpan(span)?.scope).toBe(enableTracing ? scope2 : undefined);
expect(getCapturedScopesOnSpan(span).scope).toBe(enableTracing ? scope2 : undefined);

spanId = span.spanContext().spanId;
traceId = span.spanContext().traceId;
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry/test/trace.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ describe('trace', () => {
startSpan({ name: 'outer transaction' }, () => {
startSpan({ name: 'inner span' }, () => {
const innerTransaction = startInactiveSpan({ name: 'inner transaction', forceTransaction: true });
innerTransaction?.end();
innerTransaction.end();
});
});

Expand Down
6 changes: 3 additions & 3 deletions packages/react/test/reactrouterv3.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ describe('browserTracingReactRouterV3', () => {
client.init();
render(<Router history={history}>{routes}</Router>);

expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
expect(getCurrentScope().getScopeData().transactionName).toEqual('/');
});

it('starts a navigation transaction', () => {
Expand Down Expand Up @@ -213,13 +213,13 @@ describe('browserTracingReactRouterV3', () => {
client.init();
const { container } = render(<Router history={history}>{routes}</Router>);

expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
expect(getCurrentScope().getScopeData().transactionName).toEqual('/');

act(() => {
history.push('/users/123');
});
expect(container.innerHTML).toContain('123');

expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/users/:userid');
expect(getCurrentScope().getScopeData().transactionName).toEqual('/users/:userid');
});
});
2 changes: 1 addition & 1 deletion packages/react/test/reactrouterv4.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ describe('browserTracingReactRouterV4', () => {

client.init();

expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
expect(getCurrentScope().getScopeData().transactionName).toEqual('/');
});

it('starts a navigation transaction', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/react/test/reactrouterv5.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ describe('browserTracingReactRouterV5', () => {

client.init();

expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
expect(getCurrentScope().getScopeData().transactionName).toEqual('/');
});

it('starts a navigation transaction', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/react/test/reactrouterv6.4.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ describe('reactRouterV6BrowserTracingIntegration (v6.4)', () => {
// @ts-expect-error router is fine
render(<RouterProvider router={router} />);

expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
expect(getCurrentScope().getScopeData().transactionName).toEqual('/');
});

it('starts a navigation transaction', () => {
Expand Down Expand Up @@ -658,7 +658,7 @@ describe('reactRouterV6BrowserTracingIntegration (v6.4)', () => {
// @ts-expect-error router is fine
render(<RouterProvider router={router} />);

expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/about');
expect(getCurrentScope().getScopeData().transactionName).toEqual('/about');
});
});
});
8 changes: 4 additions & 4 deletions packages/react/test/reactrouterv6.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
</MemoryRouter>,
);

expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
expect(getCurrentScope().getScopeData().transactionName).toEqual('/');
});

it('skips pageload transaction with `instrumentPageLoad: false`', () => {
Expand Down Expand Up @@ -417,7 +417,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
</MemoryRouter>,
);

expect(getCurrentScope().getScopeData()?.transactionName).toBe('/about/:page');
expect(getCurrentScope().getScopeData().transactionName).toBe('/about/:page');
});
});

Expand Down Expand Up @@ -493,7 +493,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
</MemoryRouter>,
);

expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
expect(getCurrentScope().getScopeData().transactionName).toEqual('/');
});

it('skips pageload transaction with `instrumentPageLoad: false`', () => {
Expand Down Expand Up @@ -997,7 +997,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
</MemoryRouter>,
);

expect(getCurrentScope().getScopeData()?.transactionName).toBe('/about');
expect(getCurrentScope().getScopeData().transactionName).toBe('/about');
});
});
});
6 changes: 3 additions & 3 deletions packages/replay-internal/test/integration/session.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ describe('Integration | session', () => {
const initialSession = { ...replay.session } as Session;

expect(mockRecord).toHaveBeenCalledTimes(1);
expect(initialSession?.id).toBeDefined();
expect(initialSession.id).toBeDefined();
expect(replay.getContext()).toEqual(
expect.objectContaining({
initialUrl: 'http://localhost:3000/',
Expand Down Expand Up @@ -230,7 +230,7 @@ describe('Integration | session', () => {
it('pauses and resumes a session if user has been idle for more than SESSION_IDLE_PASUE_DURATION and comes back to click their mouse', async () => {
const initialSession = { ...replay.session } as Session;

expect(initialSession?.id).toBeDefined();
expect(initialSession.id).toBeDefined();
expect(replay.getContext()).toEqual(
expect.objectContaining({
initialUrl: 'http://localhost:3000/',
Expand Down Expand Up @@ -327,7 +327,7 @@ describe('Integration | session', () => {

const initialSession = { ...replay.session } as Session;

expect(initialSession?.id).toBeDefined();
expect(initialSession.id).toBeDefined();
expect(replay.getContext()).toMatchObject({
initialUrl: 'http://localhost:3000/',
initialTimestamp: BASE_TIMESTAMP,
Expand Down
4 changes: 2 additions & 2 deletions packages/replay-internal/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ function getMockResponse(contentLength?: string, body?: string, headers?: Record
const response = {
headers: {
has: (prop: string) => {
return !!internalHeaders[prop?.toLowerCase() ?? ''];
return !!internalHeaders[prop.toLowerCase() ?? ''];
},
get: (prop: string) => {
return internalHeaders[prop?.toLowerCase() ?? ''];
return internalHeaders[prop.toLowerCase() ?? ''];
},
},
clone: () => response,
Expand Down
Loading
Loading