Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 7 deletions

diff --git a/rubocop/cop/gitlab/avoid_feature_get.rb b/rubocop/cop/gitlab/avoid_feature_get.rb
index 1bce89268d9..abde1383fca 100644
--- a/rubocop/cop/gitlab/avoid_feature_get.rb
+++ b/rubocop/cop/gitlab/avoid_feature_get.rb
@@ -3,21 +3,28 @@
 module RuboCop
   module Cop
     module Gitlab
-      # Cop that blacklists the use of `Feature.get`.
+      # Bans the use of `Feature.get`.
+      #
+      # @example
+      #
+      # # bad
+      #
+      # Feature.get(:x)
+      #
+      # # good
+      #
+      # stub_feature_flags(x: true)
+      #
       class AvoidFeatureGet < RuboCop::Cop::Cop
         MSG = 'Use `stub_feature_flags` method instead of `Feature.get`. ' \
           'See doc/development/feature_flags/index.md#feature-flags-in-tests for more information.'
 
         def_node_matcher :feature_get?, <<~PATTERN
-          (send (const nil? :Feature) :get ...)
-        PATTERN
-
-        def_node_matcher :global_feature_get?, <<~PATTERN
-          (send (const (cbase) :Feature) :get ...)
+          (send (const {nil? cbase} :Feature) :get ...)
         PATTERN
 
         def on_send(node)
-          return unless feature_get?(node) || global_feature_get?(node)
+          return unless feature_get?(node)
 
           add_offense(node, location: :selector)
         end