Add latest changes from gitlab-org/gitlab@master

1 files changed, 75 insertions, 0 deletions

diff --git a/spec/rubocop/cop/graphql/descriptions_spec.rb b/spec/rubocop/cop/graphql/descriptions_spec.rb
index 8826e700fdf..5e3f9539ff4 100644
--- a/spec/rubocop/cop/graphql/descriptions_spec.rb
+++ b/spec/rubocop/cop/graphql/descriptions_spec.rb
@@ -60,6 +60,33 @@ RSpec.describe RuboCop::Cop::Graphql::Descriptions do
       TYPE
     end
 
+    it 'adds an offense when description contains the demonstrative "this"' do
+      expect_offense(<<~TYPE)
+        module Types
+          class FakeType < BaseObject
+            field :a_thing,
+            ^^^^^^^^^^^^^^^ #{described_class::MSG_CONTAINS_THIS}
+              GraphQL::Types::String,
+              null: false,
+              description: 'Description of this thing.'
+          end
+        end
+      TYPE
+    end
+
+    it 'does not add an offense when a word contains the substring "this"' do
+      expect_no_offenses(<<~TYPE)
+        module Types
+          class FakeType < BaseObject
+            field :a_thing,
+              GraphQL::Types::String,
+              null: false,
+              description: 'Description of thistle.'
+          end
+        end
+      TYPE
+    end
+
     it 'does not add an offense when description is correct' do
       expect_no_offenses(<<~TYPE.strip)
         module Types
@@ -140,6 +167,33 @@ RSpec.describe RuboCop::Cop::Graphql::Descriptions do
       TYPE
     end
 
+    it 'adds an offense when description contains the demonstrative "this"' do
+      expect_offense(<<~TYPE)
+        module Types
+          class FakeType < BaseObject
+            argument :a_thing,
+            ^^^^^^^^^^^^^^^^^^ #{described_class::MSG_CONTAINS_THIS}
+              GraphQL::Types::String,
+              null: false,
+              description: 'Description of this thing.'
+          end
+        end
+      TYPE
+    end
+
+    it 'does not add an offense when a word contains the substring "this"' do
+      expect_no_offenses(<<~TYPE)
+        module Types
+          class FakeType < BaseObject
+            argument :a_thing,
+              GraphQL::Types::String,
+              null: false,
+              description: 'Description of thistle.'
+          end
+        end
+      TYPE
+    end
+
     it 'does not add an offense when description is correct' do
       expect_no_offenses(<<~TYPE.strip)
         module Types
@@ -199,6 +253,27 @@ RSpec.describe RuboCop::Cop::Graphql::Descriptions do
       TYPE
     end
 
+    it 'adds an offense when description contains the demonstrative "this"' do
+      expect_offense(<<~TYPE.strip)
+        module Types
+          class FakeEnum < BaseEnum
+            value 'FOO', value: 'foo', description: 'Description of this issue.'
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{described_class::MSG_CONTAINS_THIS}
+          end
+        end
+      TYPE
+    end
+
+    it 'does not add an offense when a word contains the substring "this"' do
+      expect_no_offenses(<<~TYPE.strip)
+        module Types
+          class FakeEnum < BaseEnum
+            value 'FOO', value: 'foo', description: 'Description of thistle.'
+          end
+        end
+      TYPE
+    end
+
     it 'does not add an offense when description is correct (defined using `description:`)' do
       expect_no_offenses(<<~TYPE.strip)
         module Types