From 4a389587c29bea9213fb3450438bfc72a1c14ea0 Mon Sep 17 00:00:00 2001 From: Kate Higa Date: Wed, 29 Jun 2022 22:52:17 -0700 Subject: [PATCH 1/2] Make linter not count punctuation against match --- .../avoid_generic_link_text_counter.rb | 2 +- .../avoid_generic_link_text_counter_test.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/erblint-github/linters/github/accessibility/avoid_generic_link_text_counter.rb b/lib/erblint-github/linters/github/accessibility/avoid_generic_link_text_counter.rb index ad97d0c..c566277 100644 --- a/lib/erblint-github/linters/github/accessibility/avoid_generic_link_text_counter.rb +++ b/lib/erblint-github/linters/github/accessibility/avoid_generic_link_text_counter.rb @@ -113,7 +113,7 @@ def autocorrect(processed_source, offense) private def banned_text?(text) - BANNED_GENERIC_TEXT.map(&:downcase).include?(text.downcase) + BANNED_GENERIC_TEXT.map(&:downcase).include?(text.downcase.gsub(/\W+/, ' ').strip) end def valid_accessible_name?(aria_label, text) diff --git a/test/linters/accessibility/avoid_generic_link_text_counter_test.rb b/test/linters/accessibility/avoid_generic_link_text_counter_test.rb index 966de85..7b5fca0 100644 --- a/test/linters/accessibility/avoid_generic_link_text_counter_test.rb +++ b/test/linters/accessibility/avoid_generic_link_text_counter_test.rb @@ -42,6 +42,19 @@ def test_warns_when_link_text_is_link refute_empty @linter.offenses end + def test_warns_when_link_text_is_banned_text_with_punctuation_and_space + @file = <<~ERB + Learn more! + read more. + click here. + ERB + @linter.run(processed_source) + + refute_empty @linter.offenses + # 3 offenses, 1 related to matching counter comment not present despite violations + assert_equal 4, @linter.offenses.count + end + def test_does_not_warn_when_banned_text_is_part_of_more_text @file = "Learn more about GitHub Stars" @linter.run(processed_source) From b0cadce96e726f627cca0203bf0317555e968baf Mon Sep 17 00:00:00 2001 From: Kate Higa Date: Thu, 30 Jun 2022 09:36:19 -0700 Subject: [PATCH 2/2] Run rubocop --- .../github/accessibility/avoid_generic_link_text_counter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/erblint-github/linters/github/accessibility/avoid_generic_link_text_counter.rb b/lib/erblint-github/linters/github/accessibility/avoid_generic_link_text_counter.rb index c566277..e353967 100644 --- a/lib/erblint-github/linters/github/accessibility/avoid_generic_link_text_counter.rb +++ b/lib/erblint-github/linters/github/accessibility/avoid_generic_link_text_counter.rb @@ -113,7 +113,7 @@ def autocorrect(processed_source, offense) private def banned_text?(text) - BANNED_GENERIC_TEXT.map(&:downcase).include?(text.downcase.gsub(/\W+/, ' ').strip) + BANNED_GENERIC_TEXT.map(&:downcase).include?(text.downcase.gsub(/\W+/, " ").strip) end def valid_accessible_name?(aria_label, text)