Skip to content

Commit 0e9289e

Browse files
amortemousqueamortemousque
committed
Fix tests types
1 parent 11d79c5 commit 0e9289e

13 files changed

+66
-63
lines changed

‎packages/rum-core/src/boot/startRum.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ export function startRumEventCollection(
188188
const featureFlagContexts = startFeatureFlagContexts(lifeCycle, hooks, configuration)
189189
startSessionContext(hooks, session, recorderApi, viewHistory)
190190
startConnectivityContext(hooks)
191-
startSourceCodeContext(hooks)
192191
const globalContext = startGlobalContext(hooks, configuration, 'rum', true)
193192
const userContext = startUserContext(hooks, configuration, session, 'rum')
194193
const accountContext = startAccountContext(hooks, configuration, 'rum')
@@ -232,6 +231,9 @@ export function startRumEventCollection(
232231
viewHistory,
233232
initialViewOptions
234233
)
234+
235+
startSourceCodeContext(hooks)
236+
235237
cleanupTasks.push(stopViewCollection)
236238

237239
const { stop: stopResourceCollection } = startResourceCollection(lifeCycle, configuration, pageStateHistory)

‎packages/rum-core/src/domain/action/actionCollection.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { RawRumActionEvent, RawRumEvent } from '../../rawRumEvent.types'
66
import { RumEventType, ActionType } from '../../rawRumEvent.types'
77
import type { RawRumEventCollectedData } from '../lifeCycle'
88
import { LifeCycle, LifeCycleEventType } from '../lifeCycle'
9-
import type { DefaultTelemetryEventAttributes, Hooks } from '../hooks'
9+
import type { AssembleHookParams, DefaultTelemetryEventAttributes, Hooks } from '../hooks'
1010
import { createHooks } from '../hooks'
1111
import type { RumMutationRecord } from '../../browser/domMutationObservable'
1212
import type { ActionContexts } from './actionCollection'
@@ -174,7 +174,7 @@ describe('actionCollection', () => {
174174
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
175175
eventType,
176176
startTime: 0 as RelativeTime,
177-
})
177+
} as AssembleHookParams)
178178

179179
expect(defaultRumEventAttributes).toEqual({ type: eventType, action: { id: actionId } })
180180
})
@@ -186,7 +186,7 @@ describe('actionCollection', () => {
186186
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
187187
eventType,
188188
startTime: 0 as RelativeTime,
189-
})
189+
} as AssembleHookParams)
190190

191191
expect(defaultRumEventAttributes).toEqual(undefined)
192192
})
@@ -200,7 +200,7 @@ describe('actionCollection', () => {
200200
eventType: RumEventType.LONG_TASK,
201201
startTime: longTaskStartTime,
202202
duration: 50 as Duration,
203-
})
203+
} as AssembleHookParams)
204204

205205
const [correctedStartTime] = findActionIdSpy.calls.mostRecent().args
206206
expect(correctedStartTime).toEqual(addDuration(longTaskStartTime, LONG_TASK_START_TIME_CORRECTION))

‎packages/rum-core/src/domain/contexts/ciVisibilityContext.spec.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { HookNames, Observable } from '@datadog/browser-core'
33
import { mockCiVisibilityValues } from '../../../test'
44
import type { CookieObservable } from '../../browser/cookieObservable'
55
import { SessionType } from '../rumSessionManager'
6-
import type { Hooks } from '../hooks'
6+
import type { AssembleHookParams, Hooks } from '../hooks'
77
import { createHooks } from '../hooks'
88
import { startCiVisibilityContext } from './ciVisibilityContext'
99

@@ -29,7 +29,7 @@ describe('startCiVisibilityContext', () => {
2929
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
3030
eventType: 'view',
3131
startTime: 0 as RelativeTime,
32-
})
32+
} as AssembleHookParams)
3333

3434
expect(defaultRumEventAttributes).toEqual({
3535
type: 'view',
@@ -49,7 +49,7 @@ describe('startCiVisibilityContext', () => {
4949
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
5050
eventType: 'view',
5151
startTime: 0 as RelativeTime,
52-
})
52+
} as AssembleHookParams)
5353

5454
expect(defaultRumEventAttributes).toEqual({
5555
type: 'view',
@@ -70,7 +70,7 @@ describe('startCiVisibilityContext', () => {
7070
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
7171
eventType: 'view',
7272
startTime: 0 as RelativeTime,
73-
})
73+
} as AssembleHookParams)
7474

7575
expect(defaultRumEventAttributes).toEqual({
7676
type: 'view',
@@ -90,7 +90,7 @@ describe('startCiVisibilityContext', () => {
9090
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
9191
eventType: 'view',
9292
startTime: 0 as RelativeTime,
93-
})
93+
} as AssembleHookParams)
9494

9595
expect(defaultRumEventAttributes).toBeUndefined()
9696
})
@@ -102,7 +102,7 @@ describe('startCiVisibilityContext', () => {
102102
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
103103
eventType: 'view',
104104
startTime: 0 as RelativeTime,
105-
})
105+
} as AssembleHookParams)
106106

107107
expect(defaultRumEventAttributes).toBeUndefined()
108108
})

‎packages/rum-core/src/domain/contexts/connectivityContext.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { setNavigatorOnLine, setNavigatorConnection } from '@datadog/browser-core/test'
22
import { HookNames } from '@datadog/browser-core'
33
import type { RelativeTime } from '@datadog/browser-core'
4-
import type { Hooks } from '../hooks'
4+
import type { AssembleHookParams, Hooks } from '../hooks'
55
import { createHooks } from '../hooks'
66
import { startConnectivityContext } from './connectivityContext'
77

@@ -17,7 +17,7 @@ describe('startConnectivityContext', () => {
1717
startConnectivityContext(hooks)
1818
setNavigatorOnLine(true)
1919
setNavigatorConnection({ effectiveType: '2g' })
20-
const event = hooks.triggerHook(HookNames.Assemble, { eventType: 'view', startTime: 0 as RelativeTime })
20+
const event = hooks.triggerHook(HookNames.Assemble, { eventType: 'view', startTime: 0 as RelativeTime } as AssembleHookParams)
2121

2222
expect(event).toEqual({
2323
type: 'view',

‎packages/rum-core/src/domain/contexts/defaultContext.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { mockClock, mockEventBridge } from '@datadog/browser-core/test'
22
import { HookNames, timeStampNow } from '@datadog/browser-core'
33
import type { RelativeTime } from '@datadog/browser-core'
44
import { mockRumConfiguration } from '../../../test'
5-
import type { DefaultRumEventAttributes, DefaultTelemetryEventAttributes, Hooks } from '../hooks'
5+
import type { AssembleHookParams, DefaultRumEventAttributes, DefaultTelemetryEventAttributes, Hooks } from '../hooks'
66
import { createHooks } from '../hooks'
77
import { startDefaultContext } from './defaultContext'
88

@@ -20,7 +20,7 @@ describe('startDefaultContext', () => {
2020
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
2121
eventType: 'view',
2222
startTime: 0 as RelativeTime,
23-
})
23+
} as AssembleHookParams)
2424

2525
expect(defaultRumEventAttributes).toEqual({
2626
type: 'view',
@@ -41,14 +41,14 @@ describe('startDefaultContext', () => {
4141
const eventWithoutEventBridge = hooks.triggerHook(HookNames.Assemble, {
4242
eventType: 'view',
4343
startTime: 0 as RelativeTime,
44-
}) as DefaultRumEventAttributes
44+
} as AssembleHookParams) as DefaultRumEventAttributes
4545

4646
mockEventBridge()
4747

4848
const eventWithEventBridge = hooks.triggerHook(HookNames.Assemble, {
4949
eventType: 'view',
5050
startTime: 0 as RelativeTime,
51-
}) as DefaultRumEventAttributes
51+
} as AssembleHookParams) as DefaultRumEventAttributes
5252

5353
expect(eventWithEventBridge._dd!.browser_sdk_version).toBeDefined()
5454
expect(eventWithoutEventBridge._dd!.browser_sdk_version).toBeUndefined()
@@ -64,7 +64,7 @@ describe('startDefaultContext', () => {
6464
const event = hooks.triggerHook(HookNames.Assemble, {
6565
eventType: 'view',
6666
startTime: 0 as RelativeTime,
67-
}) as DefaultRumEventAttributes
67+
} as AssembleHookParams) as DefaultRumEventAttributes
6868

6969
expect(event._dd!.configuration!.session_sample_rate).toBe(10)
7070
expect(event._dd!.configuration!.session_replay_sample_rate).toBe(20)

‎packages/rum-core/src/domain/contexts/displayContext.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { HookNames } from '@datadog/browser-core'
22
import type { RelativeTime } from '@datadog/browser-core'
33
import { mockRumConfiguration } from '../../../test'
4-
import type { Hooks } from '../hooks'
4+
import type { AssembleHookParams, Hooks } from '../hooks'
55
import { createHooks } from '../hooks'
66
import type { DisplayContext } from './displayContext'
77
import { startDisplayContext } from './displayContext'
@@ -27,7 +27,7 @@ describe('displayContext', () => {
2727
it('should set the display context', () => {
2828
displayContext = startDisplayContext(hooks, mockRumConfiguration())
2929

30-
const event = hooks.triggerHook(HookNames.Assemble, { eventType: 'view', startTime: 0 as RelativeTime })
30+
const event = hooks.triggerHook(HookNames.Assemble, { eventType: 'view', startTime: 0 as RelativeTime } as AssembleHookParams)
3131
expect(requestAnimationFrameSpy).toHaveBeenCalledTimes(1)
3232

3333
expect(event).toEqual({

‎packages/rum-core/src/domain/contexts/featureFlagContext.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { LifeCycle, LifeCycleEventType } from '../lifeCycle'
66
import type { ViewCreatedEvent, ViewEndedEvent } from '../view/trackViews'
77
import type { RumConfiguration } from '../configuration'
88
import { RumEventType } from '../../rawRumEvent.types'
9-
import type { Hooks } from '../hooks'
9+
import type { AssembleHookParams, Hooks } from '../hooks'
1010
import { createHooks } from '../hooks'
1111
import type { FeatureFlagContexts } from './featureFlagContext'
1212
import { startFeatureFlagContexts } from './featureFlagContext'
@@ -38,11 +38,11 @@ describe('featureFlagContexts', () => {
3838
const defaultViewAttributes = hooks.triggerHook(HookNames.Assemble, {
3939
eventType: 'view',
4040
startTime: 0 as RelativeTime,
41-
})
41+
} as AssembleHookParams)
4242
const defaultErrorAttributes = hooks.triggerHook(HookNames.Assemble, {
4343
eventType: 'error',
4444
startTime: 0 as RelativeTime,
45-
})
45+
} as AssembleHookParams)
4646

4747
expect(defaultViewAttributes).toEqual({
4848
type: 'view',
@@ -70,7 +70,7 @@ describe('featureFlagContexts', () => {
7070
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
7171
eventType,
7272
startTime: 0 as RelativeTime,
73-
})
73+
} as AssembleHookParams)
7474

7575
expect(defaultRumEventAttributes).toEqual({
7676
type: eventType,
@@ -94,7 +94,7 @@ describe('featureFlagContexts', () => {
9494
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
9595
eventType: 'view',
9696
startTime: 0 as RelativeTime,
97-
})
97+
} as AssembleHookParams)
9898

9999
expect(defaultRumEventAttributes).toEqual({
100100
type: 'view',
@@ -127,11 +127,11 @@ describe('featureFlagContexts', () => {
127127
const defaultEventOneAttributes = hooks.triggerHook(HookNames.Assemble, {
128128
eventType: 'view',
129129
startTime: 5 as RelativeTime,
130-
})
130+
} as AssembleHookParams)
131131
const defaultEventTwoAttributes = hooks.triggerHook(HookNames.Assemble, {
132132
eventType: 'view',
133133
startTime: 15 as RelativeTime,
134-
})
134+
} as AssembleHookParams)
135135

136136
expect(defaultEventOneAttributes).toEqual({ type: 'view', feature_flags: { feature: 'one' } })
137137
expect(defaultEventTwoAttributes).toEqual({ type: 'view', feature_flags: { feature: 'two' } })
@@ -149,7 +149,7 @@ describe('featureFlagContexts', () => {
149149
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
150150
eventType: 'view',
151151
startTime: 0 as RelativeTime,
152-
})
152+
} as AssembleHookParams)
153153

154154
expect(defaultRumEventAttributes).toBeUndefined()
155155
})
@@ -166,7 +166,7 @@ describe('featureFlagContexts', () => {
166166
const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
167167
eventType: 'view',
168168
startTime: 0 as RelativeTime,
169-
})
169+
} as AssembleHookParams)
170170

171171
expect(defaultRumEventAttributes).toEqual({ type: 'view', feature_flags: { feature: 'bar', feature2: 'baz' } })
172172
})

‎packages/rum-core/src/domain/contexts/pageStateHistory.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { mockClock, registerCleanupTask } from '../../../../core/test'
55
import { createPerformanceEntry, mockPerformanceObserver, mockRumConfiguration } from '../../../test'
66
import { RumEventType } from '../../rawRumEvent.types'
77
import * as performanceObservable from '../../browser/performanceObservable'
8-
import type { Hooks } from '../hooks'
8+
import type { AssembleHookParams, Hooks } from '../hooks'
99
import { createHooks } from '../hooks'
1010
import type { PageStateHistory } from './pageStateHistory'
1111
import { PageState, startPageStateHistory } from './pageStateHistory'
@@ -97,7 +97,7 @@ describe('pageStateHistory', () => {
9797
eventType: 'view',
9898
startTime: clock.relative(15),
9999
duration: 20 as Duration,
100-
})
100+
} as AssembleHookParams)
101101

102102
expect(defaultRumEventAttributes).toEqual({
103103
type: 'view',
@@ -125,7 +125,7 @@ describe('pageStateHistory', () => {
125125
eventType: 'view',
126126
startTime: clock.relative(0),
127127
duration: 10 as Duration,
128-
})
128+
} as AssembleHookParams)
129129
expect(defaultRumEventAttributes).toEqual({
130130
type: 'view',
131131
_dd: { page_states: jasmine.any(Array) },
@@ -137,7 +137,7 @@ describe('pageStateHistory', () => {
137137
eventType: 'view',
138138
startTime: clock.relative(-10),
139139
duration: 0 as Duration,
140-
})
140+
} as AssembleHookParams)
141141

142142
expect(defaultRumEventAttributes).toEqual({
143143
type: 'view',
@@ -159,7 +159,7 @@ describe('pageStateHistory', () => {
159159
eventType: 'view',
160160
startTime: clock.relative(0),
161161
duration: Infinity as Duration,
162-
})
162+
} as AssembleHookParams)
163163

164164
expect(defaultRumEventAttributes).toEqual({
165165
type: 'view',
@@ -192,7 +192,7 @@ describe('pageStateHistory', () => {
192192
eventType,
193193
startTime: clock.relative(0),
194194
duration: 0 as Duration,
195-
})
195+
} as AssembleHookParams)
196196

197197
expect(defaultRumEventAttributes).toEqual({
198198
type: eventType,
@@ -207,7 +207,7 @@ describe('pageStateHistory', () => {
207207
eventType,
208208
startTime: clock.relative(0),
209209
duration: 0 as Duration,
210-
})
210+
} as any)
211211

212212
expect(defaultRumEventAttributes).toEqual({
213213
type: eventType,

0 commit comments

Comments
 (0)