Merge pull request #2393 from TracksApp/dependabot/bundler/font-awesome-sass-5.13.0

Bump font-awesome-sass from 4.5.0 to 5.13.0

Gemfile

@@ -47,7 +47,7 @@ gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git'
 # gem 'jbuilder', '~> 1.2'
 
 gem "bootstrap-sass", "3.4.1"
-gem "font-awesome-sass", "~> 4.5.0"
+gem "font-awesome-sass", "~> 5.13.0"
 
 group :development do
   gem "spring"

Gemfile.lock

@@ -101,8 +101,8 @@ GEM
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
     ffi (1.9.25)
-    font-awesome-sass (4.5.0)
+    font-awesome-sass (5.13.0)
-      sass (>= 3.2)
+      sassc (>= 1.11)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
@@ -307,7 +307,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner
   factory_bot_rails
-  font-awesome-sass (~> 4.5.0)
+  font-awesome-sass (~> 5.13.0)
   htmlentities
   jquery-rails (~> 4.4)
   jquery-ui-rails (~> 6.0.1)

app/helpers/icon_helper.rb

@@ -1,7 +1,7 @@
 module IconHelper
   include FontAwesome::Sass::Rails::ViewHelpers
 
-  def icon_fw(icon, text = nil, html_options = {})
+  def icon_fw(style, name, text = nil, html_options = {})
     text, html_options = nil, text if text.is_a?(Hash)
 
     if html_options.key?(:class)
@@ -10,6 +10,6 @@ module IconHelper
       html_options[:class] = "fa-fw"
     end
 
-    icon(icon, text, html_options)
+    icon(style, name, text, html_options)
   end
 end

app/views/search/_index.html.erb

@@ -4,7 +4,7 @@
     <%= text_field_tag(:search, params[:search], class: 'form-control') %>
     <div class="input-group-btn">
       <%= button_tag(type: 'submit', class: 'btn pull-right') do%>
-        <%= icon('search', class: 'hidden-xs') %>
+        <%= icon('fas', 'search', class: 'hidden-xs') %>
       <% end %>
     </div>
   </div>

app/views/shared/_navbar.html.erb

@@ -63,20 +63,20 @@
         </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-            <%= icon('cog', class: 'hidden-xs') %>
+            <%= icon('fas', 'cog', class: 'hidden-xs') %>
             <%= content_tag :span, t('layouts.navigation.options'), class: 'visible-xs-inline' %>
           </a>
           <ul class="dropdown-menu">
-            <li><%= link_to icon_fw('sign-out', t('common.logout')), logout_path %></li>
+            <li><%= link_to icon_fw('fas', 'sign-out', t('common.logout')), logout_path %></li>
             <li class="divider"></li>
             <li class="dropdown-header"><%= current_user.display_name %></li>
-            <li><%= link_to icon_fw('wrench', t('layouts.navigation.preferences')), preferences_path, accesskey: 'u', title: t('layouts.navigation.preferences_title') %></li>
+            <li><%= link_to icon_fw('fas', 'wrench', t('layouts.navigation.preferences')), preferences_path, accesskey: 'u', title: t('layouts.navigation.preferences_title') %></li>
-            <li><%= link_to icon_fw('download', t('layouts.navigation.export')), data_path, accesskey: 'e', title: t('layouts.navigation.export_title') %></li>
+            <li><%= link_to icon_fw('fas', 'download', t('layouts.navigation.export')), data_path, accesskey: 'e', title: t('layouts.navigation.export_title') %></li>
-            <li><%= link_to icon_fw('upload', t('layouts.navigation.import')), import_data_path, accesskey: 'i', title: t('layouts.navigation.import_title') %></li>
+            <li><%= link_to icon_fw('fas', 'upload', t('layouts.navigation.import')), import_data_path, accesskey: 'i', title: t('layouts.navigation.import_title') %></li>
             <% if current_user.is_admin? %>
             <li class="divider"></li>
             <li class="dropdown-header"><%= t('layouts.navigation.admin') %></li>
-            <li><%= link_to icon_fw('users', t('layouts.navigation.manage_users')), users_path, accesskey: 'a', title: t('layouts.navigation.manage_users_title') %></li>
+            <li><%= link_to icon_fw('fas', 'users', t('layouts.navigation.manage_users')), users_path, accesskey: 'a', title: t('layouts.navigation.manage_users_title') %></li>
             <% end %>
           </ul>
         </li>

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="fa fa-gear fa-fw"></i>', icon_fw('gear')
+    assert_equal '<i class="fas fa-gear fa-fw"></i>', icon_fw('fas', 'gear')
   end
 
   test 'icon_fw accepts an additional class' do
-    assert_equal '<i class="fa fa-gear fa-fw myclass"></i>', icon_fw('gear', class: 'myclass')
+    assert_equal '<i class="fas fa-gear fa-fw myclass"></i>', icon_fw('fas', 'gear', class: 'myclass')
   end
 end