From 13b8de2a9250b1ceb4048c16a297747385bc98e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:17:18 +0000
Subject: [PATCH 1/2] Bump font-awesome-sass from 5.15.1 to 6.1.2

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.15.1 to 6.1.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 842e09a1..a44ebae1 100644
--- a/Gemfile
+++ b/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'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 82cfa01f..56c3690e 100644
--- a/Gemfile.lock
+++ b/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)

From 8f3eab074400fe7da4be841ae40533528a7eab29 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki <jyri-petteri.paloposki@iki.fi>
Date: Tue, 2 Aug 2022 00:28:15 +0300
Subject: [PATCH 2/2] Update icon inclusion and tests for FontAwesome 6.

---
 app/assets/stylesheets/include/icons.scss | 1 -
 test/helpers/icon_helper_test.rb          | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/include/icons.scss b/app/assets/stylesheets/include/icons.scss
index 001bc336..3141837b 100644
--- a/app/assets/stylesheets/include/icons.scss
+++ b/app/assets/stylesheets/include/icons.scss
@@ -1,2 +1 @@
-@import "font-awesome-sprockets";
 @import "font-awesome";
diff --git a/test/helpers/icon_helper_test.rb b/test/helpers/icon_helper_test.rb
index 90eaf3f4..8a40742a 100644
--- a/test/helpers/icon_helper_test.rb
+++ b/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