Skip tests in combobox that cannot be replicated on macOS, reset disc…

…losure to previous code
w3c · Nov 22, 2024 · 0a84f39 · 0a84f39
1 parent ef0f7ba
commit 0a84f39
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/test/tests/combobox_grid-combo.js b/test/tests/combobox_grid-combo.js
@@ -4,7 +4,7 @@ const assertAriaLabelledby = require('../util/assertAriaLabelledby');
 const assertAttributeValues = require('../util/assertAttributeValues');
 const assertAttributeDNE = require('../util/assertAttributeDNE');
 const assertAriaRoles = require('../util/assertAriaRoles');
-
+const isMacOS = require('../util/isMacOS');
 const exampleFile = 'content/patterns/combobox/examples/grid-combo.html';
 
 const ex = {
@@ -874,6 +874,13 @@ ariaTest(
     const combobox = t.context.session.findElement(By.css(ex.comboboxSelector));
     await combobox.sendKeys('a', Key.ARROW_DOWN);
 
+    // "ARROW_HOME" is not valid on macos, equivalent is an FN + ARROW_LEFT key chord
+    // Selenium WebDriver does not support FN keys, so this test is not valid on macos
+    if (isMacOS()) {
+      t.pass('Skipping test on macOS - HOME key not supported');
+      return;
+    }
+
     // Send key "ARROW_HOME"
     await combobox.sendKeys(Key.HOME);
 
@@ -899,6 +906,13 @@ ariaTest(
     const combobox = t.context.session.findElement(By.css(ex.comboboxSelector));
     await combobox.sendKeys('a', Key.ARROW_DOWN);
 
+    // "ARROW_END" is not valid on macos, equivalent is an FN + ARROW_RIGHT key chord
+    // Selenium WebDriver does not support FN keys, so this test is not valid on macos
+    if (isMacOS()) {
+      t.pass('Skipping test on macOS - END key not supported');
+      return;
+    }
+
     // Send key "END_ARROW"
     await combobox.sendKeys(Key.END);
 

diff --git a/test/tests/disclosure_navigation_hybrid.js b/test/tests/disclosure_navigation_hybrid.js
@@ -82,18 +82,6 @@ ariaTest(
 
       if (links.length > 0) {
         await buttons[b].click();
-        // Add explicit wait for menu visibility
-        await t.context.session.wait(
-          async () => await menus[b].isDisplayed(),
-          1000,
-          'Menu should be displayed'
-        );
-        // Ensure link is interactive
-        await t.context.session.wait(
-          async () => await links[0].isEnabled(),
-          1000,
-          'Link should be enabled'
-        );
         await links[0].click();
 
         t.is(