chore: revert webdriverio hack for now

vitest-dev · Dec 23, 2024 · 0b5c4a9 · 0b5c4a9
1 parent 1eda66c
commit 0b5c4a9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/packages/browser/src/client/tester/context.ts b/packages/browser/src/client/tester/context.ts
@@ -4,6 +4,7 @@ import type { RunnerTask } from 'vitest'
 import type {
   BrowserPage,
   Locator,
+  Platform,
   UserEvent,
   UserEventClickOptions,
   UserEventDragAndDropOptions,
@@ -29,7 +30,7 @@ function triggerCommand<T>(command: string, ...args: any[]) {
   return rpc().triggerCommand<T>(sessionId, command, filepath(), args)
 }
 
-export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent, options?: TestingLibraryOptions): UserEvent {
+export function createUserEvent(platform: Platform, __tl_user_event_base__?: TestingLibraryUserEvent, options?: TestingLibraryOptions): UserEvent {
   if (__tl_user_event_base__) {
     return createPreviewUserEvent(__tl_user_event_base__, options ?? {})
   }
@@ -38,17 +39,11 @@ export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent
     unreleased: [] as string[],
   }
 
-  // https://playwright.dev/docs/api/class-keyboard
-  // https://webdriver.io/docs/api/browser/keys/
-  const modifier = provider === `playwright`
-    ? 'ControlOrMeta'
-    : provider === 'webdriverio'
-      ? 'Ctrl'
-      : 'Control'
+  const modifier = platform === 'darwin' ? 'Meta' : 'Control'
 
   const userEvent: UserEvent = {
     setup() {
-      return createUserEvent()
+      return createUserEvent(platform)
     },
     async cleanup() {
       return ensureAwaited(async () => {

diff --git a/packages/browser/src/node/commands/keyboard.ts b/packages/browser/src/node/commands/keyboard.ts
@@ -144,7 +144,8 @@ export async function keyboardImplementation(
 
     for (const { releasePrevious, releaseSelf, repeat, keyDef } of actions) {
       let key = keyDef.key!
-      const special = Key[key as 'Shift']
+      const code = 'location' in keyDef ? keyDef.key! : keyDef.code!
+      const special = Key[code as 'Shift']
 
       if (special) {
         key = special

diff --git a/packages/browser/src/node/plugins/pluginContext.ts b/packages/browser/src/node/plugins/pluginContext.ts
@@ -68,7 +68,7 @@ export const server = {
   config: __vitest_browser_runner__.config,
 }
 export const commands = server.commands
-export const userEvent = createUserEvent(_userEventSetup)
+export const userEvent = createUserEvent(server.platform, _userEventSetup)
 export { page, cdp }
 `
 }

diff --git a/test/browser/fixtures/user-event/keyboard.test.ts b/test/browser/fixtures/user-event/keyboard.test.ts
@@ -86,7 +86,7 @@ test('special keys', async () => {
     expect(await testKeyboard('{Shift}')).toMatchInlineSnapshot(`"Shift|ShiftLeft|1"`);
     expect(await testKeyboard('{ShiftLeft}')).toMatchInlineSnapshot(`"ERROR"`);
     expect(await testKeyboard('{ShiftRight}')).toMatchInlineSnapshot(`"ERROR"`);
-    expect(await testKeyboard('[Shift]')).toMatchInlineSnapshot(`"ERROR"`);
+    expect(await testKeyboard('[Shift]')).toMatchInlineSnapshot(`"Shift|ShiftLeft|1"`);
     expect(await testKeyboard('[ShiftLeft]')).toMatchInlineSnapshot(`"Shift|ShiftLeft|1"`);
     expect(await testKeyboard('[ShiftRight]')).toMatchInlineSnapshot(`"Shift|ShiftLeft|1"`);
   }