Clean up code a bit

Author: khiga8

docs/rules/accessibility/avoid-generic-link-text-counter.md

@@ -66,6 +66,11 @@ This linter will raise a flag when it is able to detect that a generic link has
 <a href="github.com/about" aria-label="Why dogs are awesome">Read more</a>
 ```
 
+```erb
+<!-- also bad. `aria-describedby` does not count towards accessible name of an element-->
+<a href="github.com/about" aria-describedby="element123">Read more</a>
+```
+
 ### **Correct** code for this rule  👍
 
 ```erb

lib/erblint-github/linters/github/accessibility/avoid_generic_link_text_counter.rb

@@ -18,6 +18,8 @@ class AvoidGenericLinkTextCounter < Linter
             "Link",
             "Here"
           ].freeze
+          ARIA_LABEL_ATTRIBUTES = %w[aria-labelledby aria-label].freeze
+
           MESSAGE = "Avoid using generic link text such as #{BANNED_GENERIC_TEXT.join(', ')} which do not make sense in isolation."
 
           def run(processed_source)
@@ -67,22 +69,21 @@ def run(processed_source)
                 send_node.child_nodes.each do |child_node|
                   banned_text = child_node.children.join if child_node.methods.include?(:type) && child_node.type == :str && banned_text?(child_node.children.join)
                   next if banned_text.blank?
-
                   next unless child_node.methods.include?(:type) && child_node.type == :hash
 
                   child_node.descendants(:pair).each do |pair_node|
                     next unless pair_node.children.first.type?(:sym)
 
-                    if pair_node.children.first.children.join == "aria"
-                      pair_node.children[1].descendants(:sym).each do |sym_node|
-                        banned_text = nil if sym_node.children.join == "label" || sym_node.children.join == "labelledby"
-                      end
-                    end
-
-                    # Skips if `link_to` has `aria-labelledby` or `aria-label` which we cannot be evaluated accurately with ERB lint alone.
+                    # Skips if `link_to` has `aria-labelledby` or `aria-label` which cannot be evaluated accurately with ERB lint alone.
                     # ERB lint removes Ruby string interpolation so the `aria-label` for "<%= link_to 'Learn more', "aria-label": "Learn #{@some_variable}" %>" will
                     # only be `Learn` which is unreliable so we can't do checks :(
-                    banned_text = nil if pair_node.children.first.children.join == "aria-labelledby" || pair_node.children.first.children.join == "aria-label"
+                    key_value = pair_node.children.first.children.join
+                    banned_text = nil if ARIA_LABEL_ATTRIBUTES.include?(key_value)
+                    next unless key_value == "aria"
+
+                    pair_node.children[1].descendants(:sym).each do |sym_node|
+                      banned_text = nil if sym_node.children.join == "label" || sym_node.children.join == "labelledby"
+                    end
                   end
                 end
                 if banned_text.present?
@@ -119,11 +120,6 @@ def valid_accessible_name?(aria_label, text)
             aria_label.downcase.include?(text.downcase)
           end
 
-          # Checks if Ruby node contains `aria-label` or `aria-labelledby`
-          def ruby_node_contains_aria_label_attributes?(pair_node)
-            pair_node.children.first.children.join == "aria-labelledby" || pair_node.children.first.children.join == "aria-label"
-          end
-
           def extract_ruby_node(source)
             BetterHtml::TestHelper::RubyNode.parse(source)
           rescue ::Parser::SyntaxError

test/linters/accessibility/avoid_generic_link_text_counter_test.rb

@@ -178,14 +178,33 @@ def test_does_not_warns_if_element_has_correct_counter_comment
 
   def test_autocorrects_when_ignores_are_not_correct
     @file = <<~ERB
-      <%# erblint:counter GitHub::Accessibility::AvoidGenericLinkTextCounter 2 %>
-      <a>Link</a>
+      <p>
+        <a href="github.com" aria-label='Click here to learn more'>Click here</a>
+        <a href="github.com" aria-label='Some totally different text'>Click here</a>
+        <a href="github.com" aria-labelledby='someElement'>Click here</a>
+      </p>
+      <p>
+        <%= link_to "learn more", billing_path, "aria-label": "something" %>
+        <%= link_to "learn more", billing_path, aria: { label: "something" } %>
+        <%= link_to "learn more", billing_path, aria: { describedby: "element123" } %>
+        <%= link_to "learn more", billing_path, "aria-describedby": "element123" %>
+      </p>
     ERB
     refute_equal @file, corrected_content
 
     expected_content = <<~ERB
-      <%# erblint:counter GitHub::Accessibility::AvoidGenericLinkTextCounter 1 %>
-      <a>Link</a>
+      <%# erblint:counter GitHub::Accessibility::AvoidGenericLinkTextCounter 3 %>
+      <p>
+        <a href="github.com" aria-label='Click here to learn more'>Click here</a>
+        <a href="github.com" aria-label='Some totally different text'>Click here</a>
+        <a href="github.com" aria-labelledby='someElement'>Click here</a>
+      </p>
+      <p>
+        <%= link_to "learn more", billing_path, "aria-label": "something" %>
+        <%= link_to "learn more", billing_path, aria: { label: "something" } %>
+        <%= link_to "learn more", billing_path, aria: { describedby: "element123" } %>
+        <%= link_to "learn more", billing_path, "aria-describedby": "element123" %>
+      </p>
     ERB
     assert_equal expected_content, corrected_content
   end