diff --git a/packages/browser/src/client/tester/context.ts b/packages/browser/src/client/tester/context.ts index 732666cf2..6e1a59cd6 100644 --- a/packages/browser/src/client/tester/context.ts +++ b/packages/browser/src/client/tester/context.ts @@ -19,7 +19,7 @@ import type { BrowserTraceEntryStatus } from './trace' import { vi } from 'vitest' import { __INTERNAL, stringify } from 'vitest/internal/browser' import { ensureAwaited, getBrowserState, getWorkerState } from '../utils' -import { isLocator, processTimeoutOptions, resolveUserEventPointerOptions, resolveUserEventWheelOptions, serializeElement } from './tester-utils' +import { isLocator, processTimeoutOptions, resolveUserEventWheelOptions, serializeElement } from './tester-utils' import { createBrowserTraceRangeId, recordBrowserTraceEntry } from './trace' // this file should not import anything directly, only types and utils @@ -78,9 +78,22 @@ export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent }, pointer(options) { return ensureAwaited(async () => { + const pointerOptions = await Promise.all(options.map(async (option) => { + if ('target' in option && option.target) { + const target = (await serializeElement(option.target)) + + return { + ...option, + target, + } + } + + return option + })) + await triggerCommand( '__vitest_pointer', - [await resolveUserEventPointerOptions(options)], + [pointerOptions], ) }) }, diff --git a/packages/browser/src/client/tester/tester-utils.ts b/packages/browser/src/client/tester/tester-utils.ts index a984b4568..b53794ae5 100644 --- a/packages/browser/src/client/tester/tester-utils.ts +++ b/packages/browser/src/client/tester/tester-utils.ts @@ -1,4 +1,4 @@ -import type { Locator, SelectorOptions, SerializedLocator, SerializedUserEventPointerOptions, UserEventPointerOptions, UserEventWheelDeltaOptions, UserEventWheelOptions } from 'vitest/browser' +import type { Locator, SelectorOptions, SerializedLocator, UserEventWheelDeltaOptions, UserEventWheelOptions } from 'vitest/browser' import type { BrowserRPC } from '../client' import type { BrowserTraceEntryStatus } from './trace' import { __INTERNAL } from 'vitest/internal/browser' @@ -353,18 +353,3 @@ export function resolveUserEventWheelOptions(options: UserEventWheelOptions): Us times: options.times, } } - -export async function resolveUserEventPointerOptions(options: readonly UserEventPointerOptions[]): Promise { - return await Promise.all(options.map(async (option) => { - if ('target' in option && option.target) { - const target = (await serializeElement(option.target)) - - return { - ...option, - target, - } - } - - return option - })) -}