Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 10 insertions, 15 deletions

diff --git a/spec/graphql/gitlab_schema_spec.rb b/spec/graphql/gitlab_schema_spec.rb
index 4db12643069..cb2bb25b098 100644
--- a/spec/graphql/gitlab_schema_spec.rb
+++ b/spec/graphql/gitlab_schema_spec.rb
@@ -18,14 +18,6 @@ RSpec.describe GitlabSchema do
     expect(field_instrumenters).to include(instance_of(::Gitlab::Graphql::Authorize::Instrumentation))
   end
 
-  it 'enables using presenters' do
-    expect(field_instrumenters).to include(instance_of(::Gitlab::Graphql::Present::Instrumentation))
-  end
-
-  it 'enables using gitaly call checker' do
-    expect(field_instrumenters).to include(instance_of(::Gitlab::Graphql::CallsGitaly::Instrumentation))
-  end
-
   it 'has the base mutation' do
     expect(described_class.mutation).to eq(::Types::MutationType)
   end
@@ -47,7 +39,7 @@ RSpec.describe GitlabSchema do
   end
 
   describe '.execute' do
-    context 'for different types of users' do
+    context 'with different types of users' do
       context 'when no context' do
         it 'returns DEFAULT_MAX_COMPLEXITY' do
           expect(GraphQL::Schema)
@@ -78,13 +70,15 @@ RSpec.describe GitlabSchema do
 
       context 'when a logged in user' do
         it 'returns AUTHENTICATED_COMPLEXITY' do
-          expect(GraphQL::Schema).to receive(:execute).with('query', hash_including(max_complexity: GitlabSchema::AUTHENTICATED_COMPLEXITY))
+          expect(GraphQL::Schema).to receive(:execute)
+            .with('query', hash_including(max_complexity: GitlabSchema::AUTHENTICATED_COMPLEXITY))
 
           described_class.execute('query', context: { current_user: user })
         end
 
         it 'returns AUTHENTICATED_MAX_DEPTH' do
-          expect(GraphQL::Schema).to receive(:execute).with('query', hash_including(max_depth: GitlabSchema::AUTHENTICATED_MAX_DEPTH))
+          expect(GraphQL::Schema).to receive(:execute)
+            .with('query', hash_including(max_depth: GitlabSchema::AUTHENTICATED_MAX_DEPTH))
 
           described_class.execute('query', context: { current_user: user })
         end
@@ -94,7 +88,8 @@ RSpec.describe GitlabSchema do
         it 'returns ADMIN_COMPLEXITY' do
           user = build :user, :admin
 
-          expect(GraphQL::Schema).to receive(:execute).with('query', hash_including(max_complexity: GitlabSchema::ADMIN_COMPLEXITY))
+          expect(GraphQL::Schema).to receive(:execute)
+            .with('query', hash_including(max_complexity: GitlabSchema::ADMIN_COMPLEXITY))
 
           described_class.execute('query', context: { current_user: user })
         end
@@ -130,7 +125,7 @@ RSpec.describe GitlabSchema do
   end
 
   describe '.object_from_id' do
-    context 'for subclasses of `ApplicationRecord`' do
+    context 'with subclasses of `ApplicationRecord`' do
       let_it_be(:user) { create(:user) }
 
       it 'returns the correct record' do
@@ -162,7 +157,7 @@ RSpec.describe GitlabSchema do
       end
     end
 
-    context 'for classes that are not ActiveRecord subclasses and have implemented .lazy_find' do
+    context 'with classes that are not ActiveRecord subclasses and have implemented .lazy_find' do
       it 'returns the correct record' do
         note = create(:discussion_note_on_merge_request)
 
@@ -182,7 +177,7 @@ RSpec.describe GitlabSchema do
       end
     end
 
-    context 'for other classes' do
+    context 'with other classes' do
       # We cannot use an anonymous class here as `GlobalID` expects `.name` not
       # to return `nil`
       before do