Merge pull request #295 from primer/aria

Fix octicons_gem including aria-hidden when aria-label is present
primer · Feb 25, 2019 · 3e15d9b · 3e15d9b
2 parents 7e0ac2b + 49f1512
commit 3e15d9b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/octicons_gem/lib/octicons/octicon.rb b/lib/octicons_gem/lib/octicons/octicon.rb
@@ -43,8 +43,8 @@ def html_attributes
     def a11y
       accessible = {}
 
-      if @options[:'aria-label'].nil?
-        accessible[:'aria-hidden'] = "true"
+      if @options[:"aria-label"].nil? && @options["aria-label"].nil?
+        accessible[:"aria-hidden"] = "true"
       else
         accessible[:role] = "img"
       end

diff --git a/lib/octicons_gem/test/octicon_test.rb b/lib/octicons_gem/test/octicon_test.rb
@@ -92,10 +92,18 @@
   end
 
   describe "a11y" do
-    it "includes attributes" do
+    it "includes attributes for symbol keys" do
       icon = octicon("x", "aria-label": "Close")
       assert_includes icon.to_svg, "role=\"img\""
       assert_includes icon.to_svg, "aria-label=\"Close\""
+      refute_includes icon.to_svg, "aria-hidden"
+    end
+
+    it "includes attributes for string keys" do
+      icon = octicon("x", "aria-label" => "Close")
+      assert_includes icon.to_svg, "role=\"img\""
+      assert_includes icon.to_svg, "aria-label=\"Close\""
+      refute_includes icon.to_svg, "aria-hidden"
     end
 
     it "has aria-hidden when no label is passed in" do