Merge branch 'fix-rubocop-ee-module-injection-detection' into 'master'

Fix detecting nested EE constants in RuboCop

See merge request gitlab-org/gitlab-ce!24430

1 files changed, 7 insertions, 3 deletions

diff --git a/rubocop/cop/inject_enterprise_edition_module.rb b/rubocop/cop/inject_enterprise_edition_module.rb
index c8b8aca51ab..1d37b1bd12d 100644
--- a/rubocop/cop/inject_enterprise_edition_module.rb
+++ b/rubocop/cop/inject_enterprise_edition_module.rb
@@ -11,9 +11,13 @@ module RuboCop
 
       METHODS = Set.new(%i[include extend prepend]).freeze
 
-      def_node_matcher :ee_const?, <<~PATTERN
-        (const (const _ :EE) _)
-      PATTERN
+      def ee_const?(node)
+        line = node.location.expression.source_line
+
+        # We use `match?` here instead of RuboCop's AST matching, as this makes
+        # it far easier to handle nested constants such as `EE::Foo::Bar::Baz`.
+        line.match?(/(\s|\()(::)?EE::/)
+      end
 
       def on_send(node)
         return unless METHODS.include?(node.children[1])