From f3e0dcffa6614b21f288a2476df96299a9ffbd06 Mon Sep 17 00:00:00 2001
From: Andrew Kirwin <github@andrewkirwin.co.uk>
Date: Thu, 12 Dec 2024 23:05:32 +0000
Subject: [PATCH] fix tests

---
 addon/components/dropdown/index.gjs                           | 3 +++
 addon/components/dropdown/trigger.gjs                         | 4 ++--
 addon/components/select-box/index.gjs                         | 1 +
 tests/integration/components/dropdown/trigger/render-test.gjs | 2 +-
 .../integration/components/select-box/trigger/render-test.gjs | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addon/components/dropdown/index.gjs b/addon/components/dropdown/index.gjs
index ef749c509..fc59ac16c 100644
--- a/addon/components/dropdown/index.gjs
+++ b/addon/components/dropdown/index.gjs
@@ -248,6 +248,9 @@ export default class Dropdown extends Component {
         Trigger=(component
           DropdownTrigger
           aria-expanded=this.isOpen
+          aria-haspopup="true"
+          role="button"
+          tabindex="0"
           onMouseDown=this.handleMouseDownTrigger
           onKeyDown=this.handleKeyDownTrigger
           onInsert=this.handleInsertTrigger
diff --git a/addon/components/dropdown/trigger.gjs b/addon/components/dropdown/trigger.gjs
index 1c3007d9a..cf27f21d4 100644
--- a/addon/components/dropdown/trigger.gjs
+++ b/addon/components/dropdown/trigger.gjs
@@ -15,14 +15,14 @@ export default class DropdownTrigger extends Component {
     {{! template-lint-disable no-positive-tabindex require-aria-activedescendant-tabindex no-pointer-down-event-binding }}
     <div
       class={{concat "dropdown__trigger" (if @class (concat " " @class))}}
-      aria-haspopup="true"
+      aria-haspopup="{{@aria-haspopup}}"
       aria-activedescendant="{{@aria-activedescendant}}"
       aria-busy="{{@aria-busy}}"
       aria-controls="{{@aria-controls}}"
       aria-disabled="{{@aria-disabled}}"
       aria-expanded="{{@aria-expanded}}"
       role="{{@role}}"
-      tabindex={{if @tabindex @tabindex "0"}}
+      tabindex="{{@tabindex}}"
       {{on "mousedown" @onMouseDown}}
       {{on "keydown" @onKeyDown}}
       {{lifecycle onInsert=this.handleInsert onDestroy=@onDestroy}}
diff --git a/addon/components/select-box/index.gjs b/addon/components/select-box/index.gjs
index 7f31ff20b..afe82492d 100644
--- a/addon/components/select-box/index.gjs
+++ b/addon/components/select-box/index.gjs
@@ -648,6 +648,7 @@ export default class SelectBox extends Component {
           aria-disabled=this.isDisabled
           aria-activedescendant=this.triggerActiveDescendant
           aria-controls=this.optionsElement.id
+          aria-haspopup=null
           tabindex=this.triggerTabIndex
           onInsertClosure=this.handleInsertTrigger
           onDestroy=this.handleDestroyTrigger
diff --git a/tests/integration/components/dropdown/trigger/render-test.gjs b/tests/integration/components/dropdown/trigger/render-test.gjs
index 443f0acaa..2466b66ed 100644
--- a/tests/integration/components/dropdown/trigger/render-test.gjs
+++ b/tests/integration/components/dropdown/trigger/render-test.gjs
@@ -39,7 +39,7 @@ module('dropdown/trigger', function (hooks) {
       </Dropdown>
     </template>);
 
-    assert.dom('.dropdown__trigger').doesNotHaveAttribute('role');
+    assert.dom('.dropdown__trigger').hasAttribute('role', 'button');
   });
 
   test('role (closure component)', async function (assert) {
diff --git a/tests/integration/components/select-box/trigger/render-test.gjs b/tests/integration/components/select-box/trigger/render-test.gjs
index 17dcbcaa3..4a3a378ee 100644
--- a/tests/integration/components/select-box/trigger/render-test.gjs
+++ b/tests/integration/components/select-box/trigger/render-test.gjs
@@ -29,8 +29,8 @@ module('select-box/trigger', function (hooks) {
       .hasClass('foo', 'splattributes')
       .hasAttribute('tabindex', '0', 'focusable for safari fix')
       .hasAttribute('role', 'combobox', 'combined button and listbox')
-      .hasAttribute('aria-haspopup', 'true', 'pops up')
       .hasAttribute('aria-expanded', 'false', 'closed initially')
+      .doesNotHaveAttribute('aria-haspopup', 'implied by spec')
       .doesNotHaveAttribute('aria-controls', 'no listbox')
       .doesNotHaveAttribute('aria-busy', 'not searching')
       .doesNotHaveAttribute('aria-disabled', 'is enabled')