Only show aria-current attribute for current and active links

Fixes #621

Author: DavidBiddle

app/components/govuk_component/service_navigation_component/navigation_item_component.rb

@@ -76,8 +76,13 @@ def default_attributes
   end
 
   def aria_current
-    current = (current?) ? 'page' : true
+    { aria: { current: aria_current_value } }
+  end
+
+  def aria_current_value
+    return 'page' if current?
+    return true if active?
 
-    { aria: { current: } }
+    nil
   end
 end

spec/components/govuk_component/service_navigation_component_spec.rb

@@ -136,6 +136,11 @@
       specify %(the current link has aria-current='page') do
         expect(rendered_content).to have_tag('a', text: 'Item two', with: { href: '/item-two', 'aria-current' => 'page' })
       end
+
+      specify %(only current links have an aria-current attribute) do
+        expect(rendered_content).to have_tag('a', with: { 'aria-current' => 'page' }, count: 1)
+        expect(rendered_content).not_to have_tag('a', with: { 'aria-current' => true })
+      end
     end
 
     describe 'matching the current page' do
@@ -155,6 +160,11 @@
             end
           end
         end
+
+        specify %(only current links have an aria-current attribute) do
+          expect(rendered_content).to have_tag('a', with: { 'aria-current' => 'page' }, count: 1)
+          expect(rendered_content).not_to have_tag('a', with: { 'aria-current' => true })
+        end
       end
     end
 
@@ -179,6 +189,11 @@
       specify %(the active link has aria-current='true') do
         expect(rendered_content).to have_tag('a', text: 'Item two', with: { href: '/item-two', 'aria-current' => 'true' })
       end
+
+      specify %(only active links have an aria-current attribute) do
+        expect(rendered_content).to have_tag('a', with: { 'aria-current' => true }, count: 1)
+        expect(rendered_content).not_to have_tag('a', with: { 'aria-current' => 'page' })
+      end
     end
 
     context 'when active_when is set with a string' do
@@ -201,6 +216,11 @@
       specify %(the active link has aria-current='true') do
         expect(rendered_content).to have_tag('a', text: 'Admin', with: { href: '/admin', 'aria-current' => 'true' })
       end
+
+      specify %(only active links have an aria-current attribute) do
+        expect(rendered_content).to have_tag('a', with: { 'aria-current' => true }, count: 1)
+        expect(rendered_content).not_to have_tag('a', with: { 'aria-current' => 'page' })
+      end
     end
 
     context 'when active_when is set with an array' do
@@ -223,6 +243,11 @@
       specify %(the active link has aria-current='true') do
         expect(rendered_content).to have_tag('a', text: 'Sales', with: { href: '/sales', 'aria-current' => 'true' })
       end
+
+      specify %(only active links have an aria-current attribute) do
+        expect(rendered_content).to have_tag('a', with: { 'aria-current' => true }, count: 1)
+        expect(rendered_content).not_to have_tag('a', with: { 'aria-current' => 'page' })
+      end
     end
 
     context 'when active_when is set with a regular expression' do
@@ -245,6 +270,11 @@
       specify %(the active link has aria-current='true') do
         expect(rendered_content).to have_tag('a', text: 'Finance', with: { href: '/finance', 'aria-current' => 'true' })
       end
+
+      specify %(only active links have an aria-current attribute) do
+        expect(rendered_content).to have_tag('a', with: { 'aria-current' => true }, count: 1)
+        expect(rendered_content).not_to have_tag('a', with: { 'aria-current' => 'page' })
+      end
     end
   end