Add tests

2 files changed, 14 insertions, 1 deletions

diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index ef260cff182..55fa81e95ef 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -7,7 +7,7 @@ module IconsHelper
   # font-awesome-rails gem, but should we ever use a different icon pack in the
   # future we won't have to change hundreds of method calls.
   def icon(names, options = {})
-    if !options['aria-hidden'] and !options['aria-label']
+    if (options.keys & %w[aria-hidden aria-label]).empty?
       # Add `aria-hidden` if there are no aria's set
       options['aria-hidden'] = true
     end
diff --git a/spec/helpers/icons_helper_spec.rb b/spec/helpers/icons_helper_spec.rb
index c052981fe73..c3f78d3d61f 100644
--- a/spec/helpers/icons_helper_spec.rb
+++ b/spec/helpers/icons_helper_spec.rb
@@ -1,6 +1,19 @@
 require 'spec_helper'
 
 describe IconsHelper do
+  describe 'icon' do
+    it 'returns aria-hidden by default' do
+      star = icon('star')
+      expect(star['aria-hidden']).to eq 'aria-hidden'
+    end
+
+    it 'does not return aria-hidden if aria-label is set' do
+      up = icon('up', 'aria-label' => 'up')
+      expect(up['aria-hidden']).to eq nil
+      expect(up['aria-label']).to eq 'aria-label'
+    end
+  end
+
   describe 'file_type_icon_class' do
     it 'returns folder class' do
       expect(file_type_icon_class('folder', 0, 'folder_name')).to eq 'folder'