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
mydea 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand Up@@ -417,7 +417,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
</MemoryRouter>,
);

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

Expand DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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

mydea
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand Up@@ -417,7 +417,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
 </MemoryRouter>,
 );

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

Expand DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

mydea
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand Up@@ -417,7 +417,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
 </MemoryRouter>,
 );

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

Expand DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

mydea
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand Up@@ -417,7 +417,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
 </MemoryRouter>,
 );

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

Expand DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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

mydea
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand Up@@ -417,7 +417,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
 </MemoryRouter>,
 );

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

Expand DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

mydea
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand Up@@ -417,7 +417,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
 </MemoryRouter>,
 );

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

Expand DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

mydea
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand Up@@ -417,7 +417,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
 </MemoryRouter>,
 );

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

Expand DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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

mydea
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand Up@@ -417,7 +417,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
 </MemoryRouter>,
 );

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

Expand DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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