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] 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