From bd1b73e9f26a64c212079b7dacb39fbaf8d39887 Mon Sep 17 00:00:00 2001
From: Jane Sandberg <js7389@princeton.edu>
Date: Thu, 6 Mar 2025 13:48:24 -0800
Subject: [PATCH] [#3518] Remove incomplete implementation of menu aria role
 from Blacklight::System::DropdownComponent

Closes #3518
---
 .../system/dropdown_component.html.erb        |  2 +-
 .../blacklight/system/dropdown_component.rb   |  2 +-
 .../system/dropdown_component_spec.rb         | 26 +++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 spec/components/blacklight/system/dropdown_component_spec.rb

diff --git a/app/components/blacklight/system/dropdown_component.html.erb b/app/components/blacklight/system/dropdown_component.html.erb
index c73720514f..9865b92d1c 100644
--- a/app/components/blacklight/system/dropdown_component.html.erb
+++ b/app/components/blacklight/system/dropdown_component.html.erb
@@ -1,7 +1,7 @@
 <%= content_tag :div, id: @id, class: @classes.join(' ') do %>
   <%= button %>
 
-  <div class="dropdown-menu" role="menu">
+  <div class="dropdown-menu">
     <% options.each do |option| %>
       <%= option %>
     <% end %>
diff --git a/app/components/blacklight/system/dropdown_component.rb b/app/components/blacklight/system/dropdown_component.rb
index 90a61549cc..955a60e833 100644
--- a/app/components/blacklight/system/dropdown_component.rb
+++ b/app/components/blacklight/system/dropdown_component.rb
@@ -6,7 +6,7 @@ class DropdownComponent < Blacklight::Component
       renders_one :button, DropdownButtonComponent
 
       renders_many :options, (lambda do |text:, url:, selected: false|
-        link_to(text, url, class: "dropdown-item #{'active' if selected}", role: 'menuitem', aria: { current: ('page' if selected) })
+        link_to(text, url, class: "dropdown-item #{'active' if selected}", aria: { current: ('page' if selected) })
       end)
 
       # rubocop:disable Metrics/ParameterLists
diff --git a/spec/components/blacklight/system/dropdown_component_spec.rb b/spec/components/blacklight/system/dropdown_component_spec.rb
new file mode 100644
index 0000000000..1e8186cc89
--- /dev/null
+++ b/spec/components/blacklight/system/dropdown_component_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::System::DropdownComponent, type: :component do
+  it 'includes a link for each choice' do
+    search_state = double(Blacklight::SearchState)
+    allow(search_state).to receive(:params_for_search).and_return('http://example.com')
+    rendered = render_inline(described_class.new(
+                               param: :per_page,
+                               choices: [
+                                 ['10 per page', 10],
+                                 ['20 per page', 20]
+                               ],
+                               search_state: search_state,
+                               selected: 20,
+                               interpolation: :count
+                             ))
+
+    expect(rendered.css('a').length).to eq 2
+    expect(rendered.css('a')[0].text).to eq '10 per page'
+    expect(rendered.css('a')[0].attributes).not_to have_key 'aria-current'
+    expect(rendered.css('a')[1].text).to eq '20 per page'
+    expect(rendered.css('a')[1].attributes).to have_key 'aria-current'
+  end
+end