Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix octicons_gem including aria-hidden when aria-label is present #295

Merged
merged 2 commits into from
Feb 25, 2019
Merged

Fix octicons_gem including aria-hidden when aria-label is present #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e4eac2
Add test for string keys and ensure aria-hidden is not there
muan Feb 22, 2019
49f1512
Check if string keys is present
muan Feb 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/octicons_gem/lib/octicons/octicon.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion lib/octicons_gem/test/octicon_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down