Merge branch 'bw-graphql-minor-fix' into 'master'

Minor change to fix errors in upcoming graphql gem upgrade

See merge request gitlab-org/gitlab!83560

app/graphql/types/repository/blob_type.rb

@@ -101,10 +101,6 @@ module Types
             description: 'Web path to blob on an environment.',
             calls_gitaly: true
 
-      field :code_owners, [Types::UserType], null: true,
-            description: 'List of code owners for the blob.',
-            calls_gitaly: true
-
       field :file_type, GraphQL::Types::String, null: true,
             description: 'Expected format of the blob based on the extension.'
 

ee/app/graphql/ee/types/mutation_type.rb

@@ -37,7 +37,6 @@ module EE
         mount_mutation ::Mutations::Vulnerabilities::RevertToDetected
         mount_mutation ::Mutations::Vulnerabilities::CreateExternalIssueLink
         mount_mutation ::Mutations::Vulnerabilities::DestroyExternalIssueLink
-        mount_mutation ::Mutations::Boards::Update
         mount_mutation ::Mutations::Boards::UpdateEpicUserPreferences
         mount_mutation ::Mutations::Boards::EpicBoards::Create
         mount_mutation ::Mutations::Boards::EpicBoards::Destroy

ee/spec/graphql/ee/types/repository/blob_type_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Types::Repository::BlobType do
+  specify { expect(described_class.graphql_name).to eq('RepositoryBlob') }
+  specify { expect(described_class).to have_graphql_field(:code_owners, calls_gitaly?: true) }
+end

ee/spec/graphql/types/global_id_type_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Types::GlobalIDType do
   context 'where we declare an argument as GlobalIDType[a] where a is prepended in EE' do
     def query(doc, vars)
-      GraphQL::Query.new(GitlabSchema.graphql_definition, document: doc, context: {}, variables: vars)
+      GraphQL::Query.new(GitlabSchema, document: doc, context: {}, variables: vars)
     end
 
     def run_query(gql_query, vars)

ee/spec/graphql/types/security/training_type_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe GitlabSchema.types['ProjectSecurityTraining'] do
 
   describe '#is_primary' do
     let(:training) { create(:security_training, :primary) }
-    let(:query) { double('query', schema: GitlabSchema, with_error_handling: true) }
+    let(:query) { GraphQL::Query.new(GitlabSchema) }
     let(:query_context) { GraphQL::Query::Context.new(query: query, values: {}, object: nil) }
     let(:type_instance) { described_class.authorized_new(training, query_context) }
 

lib/gitlab/graphql/project/dast_profile_connection_extension.rb

@@ -2,7 +2,7 @@
 module Gitlab
   module Graphql
     module Project
-      class DastProfileConnectionExtension < GraphQL::Schema::Field::ConnectionExtension
+      class DastProfileConnectionExtension < GraphQL::Schema::FieldExtension
         def after_resolve(value:, object:, context:, **rest)
           preload_authorizations(context[:project_dast_profiles])
           context[:project_dast_profiles] = nil

spec/graphql/types/range_input_type_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe ::Types::RangeInputType do
 
   it 'follows expected subtyping relationships for instances' do
     context = GraphQL::Query::Context.new(
-      query: double('query', schema: nil),
+      query: GraphQL::Query.new(GitlabSchema),
       values: {},
       object: nil
     )

spec/graphql/types/repository/blob_type_spec.rb

@@ -34,7 +34,6 @@ RSpec.describe Types::Repository::BlobType do
       :environment_external_url_for_route_map,
       :code_navigation_path,
       :project_blob_path_root,
-      :code_owners,
       :simple_viewer,
       :rich_viewer,
       :plain_data,
@@ -47,6 +46,6 @@ RSpec.describe Types::Repository::BlobType do
       :ide_fork_and_edit_path,
       :fork_and_view_path,
       :language
-    )
+    ).at_least
   end
 end