Add latest changes from gitlab-org/gitlab@master

1 files changed, 43 insertions, 66 deletions

diff --git a/spec/rubocop/cop/graphql/authorize_types_spec.rb b/spec/rubocop/cop/graphql/authorize_types_spec.rb
index 5d35690c8b7..df637a26ec5 100644
--- a/spec/rubocop/cop/graphql/authorize_types_spec.rb
+++ b/spec/rubocop/cop/graphql/authorize_types_spec.rb
@@ -10,83 +10,60 @@ RSpec.describe RuboCop::Cop::Graphql::AuthorizeTypes, type: :rubocop do
 
   subject(:cop) { described_class.new }
 
-  context 'when NOT in a type folder' do
-    before do
-      allow(cop).to receive(:in_type?).and_return(false)
-    end
-
-    it 'does not add an offense even though there is no authorize call' do
-      expect_no_offenses(<<~TYPE.strip)
-        module Types
-          class AType < BaseObject
-            field :a_thing
-            field :another_thing
-          end
-        end
-      TYPE
-    end
-  end
-
-  context 'when in a type folder' do
-    before do
-      allow(cop).to receive(:in_type?).and_return(true)
-    end
-
-    it 'adds an offense when there is no authorize call' do
-      inspect_source(<<~TYPE)
-        module Types
-          class AType < BaseObject
-            field :a_thing
-            field :another_thing
-          end
+  it 'adds an offense when there is no authorize call' do
+    inspect_source(<<~TYPE)
+      module Types
+        class AType < BaseObject
+          field :a_thing
+          field :another_thing
         end
-      TYPE
+      end
+    TYPE
 
-      expect(cop.offenses.size).to eq 1
-    end
+    expect(cop.offenses.size).to eq 1
+  end
 
-    it 'does not add an offense for classes that have an authorize call' do
-      expect_no_offenses(<<~TYPE.strip)
-        module Types
-          class AType < BaseObject
-            graphql_name 'ATypeName'
+  it 'does not add an offense for classes that have an authorize call' do
+    expect_no_offenses(<<~TYPE.strip)
+      module Types
+        class AType < BaseObject
+          graphql_name 'ATypeName'
 
-            authorize :an_ability, :second_ability
+          authorize :an_ability, :second_ability
 
-            field :a_thing
-          end
+          field :a_thing
         end
-      TYPE
-    end
+      end
+    TYPE
+  end
 
-    it 'does not add an offense for classes that only have an authorize call' do
-      expect_no_offenses(<<~TYPE.strip)
-        module Types
-          class AType < SuperClassWithFields
-            authorize :an_ability
-          end
+  it 'does not add an offense for classes that only have an authorize call' do
+    expect_no_offenses(<<~TYPE.strip)
+      module Types
+        class AType < SuperClassWithFields
+          authorize :an_ability
         end
-      TYPE
-    end
+      end
+    TYPE
+  end
 
-    it 'does not add an offense for base types' do
-      expect_no_offenses(<<~TYPE)
-        module Types
-          class AType < BaseEnum
-            field :a_thing
-          end
+  it 'does not add an offense for base types' do
+    expect_no_offenses(<<~TYPE)
+      module Types
+        class AType < BaseEnum
+          field :a_thing
         end
-      TYPE
-    end
+      end
+    TYPE
+  end
 
-    it 'does not add an offense for Enums' do
-      expect_no_offenses(<<~TYPE)
-        module Types
-          class ATypeEnum < AnotherEnum
-            field :a_thing
-          end
+  it 'does not add an offense for Enums' do
+    expect_no_offenses(<<~TYPE)
+      module Types
+        class ATypeEnum < AnotherEnum
+          field :a_thing
         end
-      TYPE
-    end
+      end
+    TYPE
   end
 end