Merge pull request #2796 from TracksApp/dependabot/bundler/font-awesome-sass-6.1.2

Bump font-awesome-sass from 5.15.1 to 6.1.2

Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.4'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 5.15.1'
+gem 'font-awesome-sass', '~> 6.1.2'
 
 gem 'uglifier', '>=1.3.0'
 

Gemfile.lock

@@ -114,8 +114,8 @@ GEM
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     ffi (1.15.5)
-    font-awesome-sass (5.15.1)
-      sassc (>= 1.11)
+    font-awesome-sass (6.1.2)
+      sassc (~> 2.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
     highline (2.0.3)
@@ -342,7 +342,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner
   factory_bot_rails
-  font-awesome-sass (~> 5.15.1)
+  font-awesome-sass (~> 6.1.2)
   htmlentities
   i18n-tasks (~> 1.0.11)
   jquery-rails (~> 4.4)

app/assets/stylesheets/include/icons.scss

@@ -1,2 +1 @@
-@import "font-awesome-sprockets";
 @import "font-awesome";

test/helpers/icon_helper_test.rb

@@ -4,10 +4,10 @@ class IconHelperTest < ActionView::TestCase
   include IconHelper
 
   test 'icon_fw generates fixed-width class' do
-    assert_equal '<i class="fas fa-gear fa-fw"></i>', icon_fw('fas', 'gear')
+    assert_equal '<i class="fas fa-gear fa-fw" aria-hidden="true"></i>', icon_fw('fas', 'gear')
   end
 
   test 'icon_fw accepts an additional class' do
-    assert_equal '<i class="fas fa-gear fa-fw myclass"></i>', icon_fw('fas', 'gear', class: 'myclass')
+    assert_equal '<i class="fas fa-gear fa-fw myclass" aria-hidden="true"></i>', icon_fw('fas', 'gear', class: 'myclass')
   end
 end