From 295a2afbce6b44583fe722b6c62f0fbfe959a80e Mon Sep 17 00:00:00 2001 From: lucas Date: Thu, 17 Oct 2024 16:44:29 -0300 Subject: [PATCH] fix tests / yarn fix --- packages/core/src/js/tracing/reactnavigation.ts | 7 +++---- .../core/test/utils/mockedSentryeventemitterfallback.ts | 3 ++- .../core/test/utils/sentryeventemitterfallback.test.ts | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/core/src/js/tracing/reactnavigation.ts b/packages/core/src/js/tracing/reactnavigation.ts index 2418e0052..ce2bb1032 100644 --- a/packages/core/src/js/tracing/reactnavigation.ts +++ b/packages/core/src/js/tracing/reactnavigation.ts @@ -12,8 +12,9 @@ import { import type { Client, Integration, Span } from '@sentry/types'; import { isPlainObject, logger, timestampInSeconds } from '@sentry/utils'; -import type { NewFrameEvent, SentryEventEmitter } from '../utils/sentryeventemitter'; -import { createSentryEventEmitter, NewFrameEventName } from '../utils/sentryeventemitter'; +import type { NewFrameEvent } from '../utils/sentryeventemitter'; +import type { SentryEventEmitterFallback } from '../utils/sentryeventemitterfallback'; +import { createSentryFallbackEventEmitter } from '../utils/sentryeventemitterfallback'; import { isSentrySpan } from '../utils/span'; import { RN_GLOBAL_OBJ } from '../utils/worldwide'; import { NATIVE } from '../wrapper'; @@ -30,8 +31,6 @@ import { } from './span'; import { manualInitialDisplaySpans, startTimeToInitialDisplaySpan } from './timetodisplay'; import { setSpanDurationAsMeasurementOnSpan } from './utils'; -import type { SentryEventEmitterFallback } from '../utils/sentryeventemitterfallback'; -import { createSentryFallbackEventEmitter } from '../utils/sentryeventemitterfallback'; export const INTEGRATION_NAME = 'ReactNavigation'; const NAVIGATION_HISTORY_MAX_SIZE = 200; diff --git a/packages/core/test/utils/mockedSentryeventemitterfallback.ts b/packages/core/test/utils/mockedSentryeventemitterfallback.ts index 50d5fbcc2..481b109d6 100644 --- a/packages/core/test/utils/mockedSentryeventemitterfallback.ts +++ b/packages/core/test/utils/mockedSentryeventemitterfallback.ts @@ -1,9 +1,10 @@ import { timestampInSeconds } from '@sentry/utils'; -import EventEmitter from 'events'; +import * as EventEmitter from 'events'; import type { NewFrameEvent } from '../../src/js/utils/sentryeventemitter'; import type { SentryEventEmitterFallback } from '../../src/js/utils/sentryeventemitterfallback'; import type { MockInterface } from '../testutils'; + export const NewFrameEventName = 'rn_sentry_new_frame'; export type NewFrameEventName = typeof NewFrameEventName; export interface MockedSentryEventEmitterFallback extends MockInterface { diff --git a/packages/core/test/utils/sentryeventemitterfallback.test.ts b/packages/core/test/utils/sentryeventemitterfallback.test.ts index 6f8f9ff0d..e96567ae2 100644 --- a/packages/core/test/utils/sentryeventemitterfallback.test.ts +++ b/packages/core/test/utils/sentryeventemitterfallback.test.ts @@ -1,3 +1,5 @@ +import { logger } from '@sentry/utils'; + import { NewFrameEventName } from '../../src/js/utils/sentryeventemitter'; import { createSentryFallbackEventEmitter } from '../../src/js/utils/sentryeventemitterfallback'; @@ -8,14 +10,12 @@ jest.mock('../../src/js/utils/environment', () => ({ jest.mock('../../src/js/wrapper', () => jest.requireActual('../mockWrapper')); +import { NATIVE } from '../../src/js/wrapper'; + jest.spyOn(logger, 'warn'); jest.spyOn(logger, 'log'); jest.spyOn(logger, 'error'); -import { logger } from '@sentry/utils'; - -import { NATIVE } from '../../src/js/wrapper'; - describe('SentryEventEmitterFallback', () => { let emitter: ReturnType;