Use getOSPreferredModifierKey() utility to off cross-platform support

w3c · Sep 16, 2024 · 25084fd · 25084fd
1 parent efaa27c
commit 25084fd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/test/tests/toolbar_toolbar.js b/test/tests/toolbar_toolbar.js
@@ -7,6 +7,7 @@ const assertAttributeValues = require('../util/assertAttributeValues');
 const assertRovingTabindex = require('../util/assertRovingTabindex');
 const assertHasFocus = require('../util/assertHasFocus');
 const assertAttributeCanBeToggled = require('../util/assertAttributeCanBeToggled');
+const getOSPreferredModifierKey = require('../util/getOSPreferredModifierKey');
 
 const exampleFile = 'content/patterns/toolbar/examples/toolbar.html';
 
@@ -1115,7 +1116,8 @@ ariaTest(
   'toolbar-button-enter-or-space',
   async (t) => {
     let textarea = await t.context.session.findElement(By.css('textarea'));
-    await textarea.sendKeys(Key.chord(Key.META, 'a'));
+    let modifierKey = getOSPreferredModifierKey();
+    await textarea.sendKeys(Key.chord(modifierKey, 'a'));
     let originalText = await textarea.getAttribute('value');
 
     const buttons = await t.context.queryElements(
@@ -1206,7 +1208,8 @@ ariaTest(
   'toolbar-button-enter-or-space',
   async (t) => {
     let textarea = await t.context.session.findElement(By.css('textarea'));
-    await textarea.sendKeys(Key.chord(Key.META, 'a'));
+    let modifierKey = getOSPreferredModifierKey();
+    await textarea.sendKeys(Key.chord(modifierKey, 'a'));
     let originalText = await textarea.getAttribute('value');
 
     const buttons = await t.context.queryElements(

diff --git a/test/util/getOSPreferredModifierKey.js b/test/util/getOSPreferredModifierKey.js
@@ -0,0 +1,6 @@
+const { Key } = require('selenium-webdriver');
+const isMacOS = require('./isMacOS');
+
+module.exports = function getOSPreferredModifierKey() {
+  return isMacOS() ? Key.META : Key.CONTROL;
+};
diff --git a/test/util/isMacOS.js b/test/util/isMacOS.js
@@ -0,0 +1,3 @@
+module.exports = function isMacOS() {
+  return process.platform === 'darwin';
+};