From 7ee69b624949a75e4710e6805a72fec8e9f31c10 Mon Sep 17 00:00:00 2001 From: Maksim Sadym Date: Fri, 3 May 2024 08:04:50 +0200 Subject: [PATCH 1/2] fix: added missing input transformations --- src/bidiMapper/modules/input/keyUtils.ts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/bidiMapper/modules/input/keyUtils.ts b/src/bidiMapper/modules/input/keyUtils.ts index 4dd68c4986..e1df227eb8 100644 --- a/src/bidiMapper/modules/input/keyUtils.ts +++ b/src/bidiMapper/modules/input/keyUtils.ts @@ -15,6 +15,10 @@ * limitations under the License. */ +/** + * Returns the normalized key value for a given key according to the table: + * https://w3c.github.io/webdriver/#dfn-normalized-key-value + */ export function getNormalizedKey(value: string): string { switch (value) { case '\uE000': @@ -162,6 +166,10 @@ export function getNormalizedKey(value: string): string { } } +/** + * Returns the key code for a given key according to the table: + * https://w3c.github.io/webdriver/#dfn-shifted-character + */ export function getKeyCode(key: string): string | undefined { switch (key) { case '`': @@ -214,6 +222,10 @@ export function getKeyCode(key: string): string | undefined { case '=': case '+': return 'Equal'; + // The spec declares the '<' to be `IntlBackslash` as well, but it is already covered + // in the `Comma` above. + case '>': + return 'IntlBackslash'; case 'a': case 'A': return 'KeyA'; @@ -316,6 +328,8 @@ export function getKeyCode(key: string): string | undefined { return 'ControlRight'; case '\uE006': return 'Enter'; + case '\uE00B': + return 'Pause'; case '\uE03D': return 'MetaLeft'; case '\uE053': @@ -377,6 +391,8 @@ export function getKeyCode(key: string): string | undefined { return 'F11'; case '\uE03C': return 'F12'; + case '\uE019': + return 'NumpadEqual'; case '\uE01A': case '\uE05C': return 'Numpad0'; @@ -426,6 +442,10 @@ export function getKeyCode(key: string): string | undefined { } } +/** + * Returns the location of the key according to the table: + * https://w3c.github.io/webdriver/#dfn-key-location + */ export function getKeyLocation(key: string): 0 | 1 | 2 | 3 { switch (key) { case '\uE007': @@ -434,6 +454,7 @@ export function getKeyLocation(key: string): 0 | 1 | 2 | 3 { case '\uE00A': case '\uE03D': return 1; + case '\uE019': case '\uE01A': case '\uE01B': case '\uE01C': From fa2b3f13994ed57a91ae605be65d38b46c601303 Mon Sep 17 00:00:00 2001 From: Browser Automation Bot Date: Fri, 3 May 2024 06:15:24 +0000 Subject: [PATCH 2/2] Update WPT expectations Signed-off-by: Browser Automation Bot --- .../tests/bidi/input/perform_actions/key_events.py.ini | 6 ------ .../tests/bidi/input/perform_actions/key_events.py.ini | 6 ------ .../tests/bidi/input/perform_actions/key_events.py.ini | 6 ------ 3 files changed, 18 deletions(-) diff --git a/wpt-metadata/chromedriver/headful/webdriver/tests/bidi/input/perform_actions/key_events.py.ini b/wpt-metadata/chromedriver/headful/webdriver/tests/bidi/input/perform_actions/key_events.py.ini index 510001b89a..cbb19de44c 100644 --- a/wpt-metadata/chromedriver/headful/webdriver/tests/bidi/input/perform_actions/key_events.py.ini +++ b/wpt-metadata/chromedriver/headful/webdriver/tests/bidi/input/perform_actions/key_events.py.ini @@ -19,9 +19,3 @@ [test_keyup_only_sends_no_events] expected: FAIL - - [test_key_special_key_sends_keydown[EQUALS-expected12\]] - expected: FAIL - - [test_key_special_key_sends_keydown[PAUSE-expected45\]] - expected: FAIL diff --git a/wpt-metadata/chromedriver/headless/webdriver/tests/bidi/input/perform_actions/key_events.py.ini b/wpt-metadata/chromedriver/headless/webdriver/tests/bidi/input/perform_actions/key_events.py.ini index 510001b89a..cbb19de44c 100644 --- a/wpt-metadata/chromedriver/headless/webdriver/tests/bidi/input/perform_actions/key_events.py.ini +++ b/wpt-metadata/chromedriver/headless/webdriver/tests/bidi/input/perform_actions/key_events.py.ini @@ -19,9 +19,3 @@ [test_keyup_only_sends_no_events] expected: FAIL - - [test_key_special_key_sends_keydown[EQUALS-expected12\]] - expected: FAIL - - [test_key_special_key_sends_keydown[PAUSE-expected45\]] - expected: FAIL diff --git a/wpt-metadata/mapper/headless/webdriver/tests/bidi/input/perform_actions/key_events.py.ini b/wpt-metadata/mapper/headless/webdriver/tests/bidi/input/perform_actions/key_events.py.ini index 510001b89a..cbb19de44c 100644 --- a/wpt-metadata/mapper/headless/webdriver/tests/bidi/input/perform_actions/key_events.py.ini +++ b/wpt-metadata/mapper/headless/webdriver/tests/bidi/input/perform_actions/key_events.py.ini @@ -19,9 +19,3 @@ [test_keyup_only_sends_no_events] expected: FAIL - - [test_key_special_key_sends_keydown[EQUALS-expected12\]] - expected: FAIL - - [test_key_special_key_sends_keydown[PAUSE-expected45\]] - expected: FAIL