From cb8bd7d5946ca50a2de99645687a633a0c8105be Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 22 Jul 2021 12:10:04 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/graphql/resolvers/base_resolver_spec.rb | 38 +++++++++++----------- .../concerns/caching_array_resolver_spec.rb | 4 +-- .../resolvers/concerns/resolves_pipelines_spec.rb | 2 +- spec/graphql/resolvers/echo_resolver_spec.rb | 2 +- spec/graphql/resolvers/issues_resolver_spec.rb | 2 +- .../resolvers/namespace_projects_resolver_spec.rb | 2 +- spec/graphql/resolvers/project_resolver_spec.rb | 4 +-- .../resolvers/terraform/states_resolver_spec.rb | 3 +- .../user_discussions_count_resolver_spec.rb | 2 +- .../resolvers/user_notes_count_resolver_spec.rb | 2 +- 10 files changed, 31 insertions(+), 30 deletions(-) (limited to 'spec/graphql/resolvers') diff --git a/spec/graphql/resolvers/base_resolver_spec.rb b/spec/graphql/resolvers/base_resolver_spec.rb index 8d2ae238bfe..d77a0b6242e 100644 --- a/spec/graphql/resolvers/base_resolver_spec.rb +++ b/spec/graphql/resolvers/base_resolver_spec.rb @@ -7,8 +7,8 @@ RSpec.describe Resolvers::BaseResolver do let(:resolver) do Class.new(described_class) do - argument :test, ::GraphQL::INT_TYPE, required: false - type [::GraphQL::INT_TYPE], null: true + argument :test, ::GraphQL::Types::Int, required: false + type [::GraphQL::Types::Int], null: true def resolve(test: 100) process(object) @@ -22,7 +22,7 @@ RSpec.describe Resolvers::BaseResolver do let(:last_resolver) do Class.new(described_class) do - type [::GraphQL::INT_TYPE], null: true + type [::GraphQL::Types::Int], null: true def resolve(**args) [1, 2] @@ -36,11 +36,11 @@ RSpec.describe Resolvers::BaseResolver do context 'for a connection of scalars' do let(:resolver) do Class.new(described_class) do - type ::GraphQL::INT_TYPE.connection_type, null: true + type ::GraphQL::Types::Int.connection_type, null: true end end - it { is_expected.to eq(::GraphQL::INT_TYPE) } + it { is_expected.to eq(::GraphQL::Types::Int) } end context 'for a connection of objects' do @@ -64,21 +64,21 @@ RSpec.describe Resolvers::BaseResolver do context 'for a list type' do let(:resolver) do Class.new(described_class) do - type [::GraphQL::STRING_TYPE], null: true + type [::GraphQL::Types::String], null: true end end - it { is_expected.to eq(::GraphQL::STRING_TYPE) } + it { is_expected.to eq(::GraphQL::Types::String) } end context 'for a scalar type' do let(:resolver) do Class.new(described_class) do - type ::GraphQL::BOOLEAN_TYPE, null: true + type ::GraphQL::Types::Boolean, null: true end end - it { is_expected.to eq(::GraphQL::BOOLEAN_TYPE) } + it { is_expected.to eq(::GraphQL::Types::Boolean) } end end @@ -88,7 +88,7 @@ RSpec.describe Resolvers::BaseResolver do end it 'has the correct (singular) type' do - expect(resolver.single.type).to eq(::GraphQL::INT_TYPE) + expect(resolver.single.type).to eq(::GraphQL::Types::Int) end it 'returns the same subclass every time' do @@ -105,10 +105,10 @@ RSpec.describe Resolvers::BaseResolver do describe '.when_single' do let(:resolver) do Class.new(described_class) do - type [::GraphQL::INT_TYPE], null: true + type [::GraphQL::Types::Int], null: true when_single do - argument :foo, ::GraphQL::INT_TYPE, required: true + argument :foo, ::GraphQL::Types::Int, required: true end def resolve(foo: 1) @@ -138,14 +138,14 @@ RSpec.describe Resolvers::BaseResolver do context 'multiple when_single blocks' do let(:resolver) do Class.new(described_class) do - type [::GraphQL::INT_TYPE], null: true + type [::GraphQL::Types::Int], null: true when_single do - argument :foo, ::GraphQL::INT_TYPE, required: true + argument :foo, ::GraphQL::Types::Int, required: true end when_single do - argument :bar, ::GraphQL::INT_TYPE, required: true + argument :bar, ::GraphQL::Types::Int, required: true end def resolve(foo: 1, bar: 2) @@ -168,7 +168,7 @@ RSpec.describe Resolvers::BaseResolver do let(:subclass) do Class.new(resolver) do when_single do - argument :inc, ::GraphQL::INT_TYPE, required: true + argument :inc, ::GraphQL::Types::Int, required: true end def resolve(foo:, inc:) @@ -194,7 +194,7 @@ RSpec.describe Resolvers::BaseResolver do context 'when the resolver returns early' do let(:resolver) do Class.new(described_class) do - type [::GraphQL::STRING_TYPE], null: true + type [::GraphQL::Types::String], null: true def ready?(**args) [false, %w[early return]] @@ -237,14 +237,14 @@ RSpec.describe Resolvers::BaseResolver do context 'when field is a connection' do it 'increases complexity based on arguments' do - field = Types::BaseField.new(name: 'test', type: GraphQL::STRING_TYPE.connection_type, resolver_class: described_class, null: false, max_page_size: 1) + field = Types::BaseField.new(name: 'test', type: GraphQL::Types::String.connection_type, resolver_class: described_class, null: false, max_page_size: 1) expect(field.to_graphql.complexity.call({}, { sort: 'foo' }, 1)).to eq 3 expect(field.to_graphql.complexity.call({}, { search: 'foo' }, 1)).to eq 7 end it 'does not increase complexity when filtering by iids' do - field = Types::BaseField.new(name: 'test', type: GraphQL::STRING_TYPE.connection_type, resolver_class: described_class, null: false, max_page_size: 100) + field = Types::BaseField.new(name: 'test', type: GraphQL::Types::String.connection_type, resolver_class: described_class, null: false, max_page_size: 100) expect(field.to_graphql.complexity.call({}, { sort: 'foo' }, 1)).to eq 6 expect(field.to_graphql.complexity.call({}, { sort: 'foo', iid: 1 }, 1)).to eq 3 diff --git a/spec/graphql/resolvers/concerns/caching_array_resolver_spec.rb b/spec/graphql/resolvers/concerns/caching_array_resolver_spec.rb index 8d15d7eda1b..852aaf66201 100644 --- a/spec/graphql/resolvers/concerns/caching_array_resolver_spec.rb +++ b/spec/graphql/resolvers/concerns/caching_array_resolver_spec.rb @@ -20,7 +20,7 @@ RSpec.describe ::CachingArrayResolver do Class.new(::Resolvers::BaseResolver) do include mod type [::Types::UserType], null: true - argument :is_admin, ::GraphQL::BOOLEAN_TYPE, required: false + argument :is_admin, ::GraphQL::Types::Boolean, required: false def query_input(is_admin:) is_admin @@ -50,7 +50,7 @@ RSpec.describe ::CachingArrayResolver do Class.new(::Resolvers::BaseResolver) do include mod type [::Types::UserType], null: true - argument :username, ::GraphQL::STRING_TYPE, required: false + argument :username, ::GraphQL::Types::String, required: false def query_input(username:) username diff --git a/spec/graphql/resolvers/concerns/resolves_pipelines_spec.rb b/spec/graphql/resolvers/concerns/resolves_pipelines_spec.rb index 3dffda75e08..6f6855c8f84 100644 --- a/spec/graphql/resolvers/concerns/resolves_pipelines_spec.rb +++ b/spec/graphql/resolvers/concerns/resolves_pipelines_spec.rb @@ -50,7 +50,7 @@ RSpec.describe ResolvesPipelines do end it 'increases field complexity based on arguments' do - field = Types::BaseField.new(name: 'test', type: GraphQL::STRING_TYPE, resolver_class: resolver, null: false, max_page_size: 1) + field = Types::BaseField.new(name: 'test', type: GraphQL::Types::String, resolver_class: resolver, null: false, max_page_size: 1) expect(field.to_graphql.complexity.call({}, {}, 1)).to eq 2 expect(field.to_graphql.complexity.call({}, { sha: 'foo' }, 1)).to eq 4 diff --git a/spec/graphql/resolvers/echo_resolver_spec.rb b/spec/graphql/resolvers/echo_resolver_spec.rb index 4f48e5e0d7a..59a121ac7de 100644 --- a/spec/graphql/resolvers/echo_resolver_spec.rb +++ b/spec/graphql/resolvers/echo_resolver_spec.rb @@ -9,7 +9,7 @@ RSpec.describe Resolvers::EchoResolver do let(:text) { 'Message test' } specify do - expect(described_class).to have_non_null_graphql_type(::GraphQL::STRING_TYPE) + expect(described_class).to have_non_null_graphql_type(::GraphQL::Types::String) end describe '#resolve' do diff --git a/spec/graphql/resolvers/issues_resolver_spec.rb b/spec/graphql/resolvers/issues_resolver_spec.rb index 9b329e961cc..89e4e803fa8 100644 --- a/spec/graphql/resolvers/issues_resolver_spec.rb +++ b/spec/graphql/resolvers/issues_resolver_spec.rb @@ -407,7 +407,7 @@ RSpec.describe Resolvers::IssuesResolver do end it 'increases field complexity based on arguments' do - field = Types::BaseField.new(name: 'test', type: GraphQL::STRING_TYPE.connection_type, resolver_class: described_class, null: false, max_page_size: 100) + field = Types::BaseField.new(name: 'test', type: GraphQL::Types::String.connection_type, resolver_class: described_class, null: false, max_page_size: 100) expect(field.to_graphql.complexity.call({}, {}, 1)).to eq 4 expect(field.to_graphql.complexity.call({}, { labelName: 'foo' }, 1)).to eq 8 diff --git a/spec/graphql/resolvers/namespace_projects_resolver_spec.rb b/spec/graphql/resolvers/namespace_projects_resolver_spec.rb index 618d012bd6d..b1f50a4a4a5 100644 --- a/spec/graphql/resolvers/namespace_projects_resolver_spec.rb +++ b/spec/graphql/resolvers/namespace_projects_resolver_spec.rb @@ -145,7 +145,7 @@ RSpec.describe Resolvers::NamespaceProjectsResolver do end it 'has an high complexity regardless of arguments' do - field = Types::BaseField.new(name: 'test', type: GraphQL::STRING_TYPE.connection_type, resolver_class: described_class, null: false, max_page_size: 100) + field = Types::BaseField.new(name: 'test', type: GraphQL::Types::String.connection_type, resolver_class: described_class, null: false, max_page_size: 100) expect(field.to_graphql.complexity.call({}, {}, 1)).to eq 24 expect(field.to_graphql.complexity.call({}, { include_subgroups: true }, 1)).to eq 24 diff --git a/spec/graphql/resolvers/project_resolver_spec.rb b/spec/graphql/resolvers/project_resolver_spec.rb index 72a01b1c574..d0661c27b95 100644 --- a/spec/graphql/resolvers/project_resolver_spec.rb +++ b/spec/graphql/resolvers/project_resolver_spec.rb @@ -28,8 +28,8 @@ RSpec.describe Resolvers::ProjectResolver do end it 'does not increase complexity depending on number of load limits' do - field1 = Types::BaseField.new(name: 'test', type: GraphQL::STRING_TYPE, resolver_class: described_class, null: false, max_page_size: 100) - field2 = Types::BaseField.new(name: 'test', type: GraphQL::STRING_TYPE, resolver_class: described_class, null: false, max_page_size: 1) + field1 = Types::BaseField.new(name: 'test', type: GraphQL::Types::String, resolver_class: described_class, null: false, max_page_size: 100) + field2 = Types::BaseField.new(name: 'test', type: GraphQL::Types::String, resolver_class: described_class, null: false, max_page_size: 1) expect(field1.to_graphql.complexity.call({}, {}, 1)).to eq 2 expect(field2.to_graphql.complexity.call({}, {}, 1)).to eq 2 diff --git a/spec/graphql/resolvers/terraform/states_resolver_spec.rb b/spec/graphql/resolvers/terraform/states_resolver_spec.rb index 91d48cd782b..012c74ce398 100644 --- a/spec/graphql/resolvers/terraform/states_resolver_spec.rb +++ b/spec/graphql/resolvers/terraform/states_resolver_spec.rb @@ -43,7 +43,8 @@ RSpec.describe Resolvers::Terraform::StatesResolver.single do it do expect(subject).to be_present - expect(subject.type.to_s).to eq('String!') + expect(subject.type).to be_kind_of GraphQL::Schema::NonNull + expect(subject.type.unwrap).to eq GraphQL::Types::String expect(subject.description).to be_present end end diff --git a/spec/graphql/resolvers/user_discussions_count_resolver_spec.rb b/spec/graphql/resolvers/user_discussions_count_resolver_spec.rb index cc855bbcb53..70f06b58a65 100644 --- a/spec/graphql/resolvers/user_discussions_count_resolver_spec.rb +++ b/spec/graphql/resolvers/user_discussions_count_resolver_spec.rb @@ -16,7 +16,7 @@ RSpec.describe Resolvers::UserDiscussionsCountResolver do let_it_be(:private_discussion) { create_list(:discussion_note_on_issue, 3, noteable: private_issue, project: private_project) } specify do - expect(described_class).to have_nullable_graphql_type(GraphQL::INT_TYPE) + expect(described_class).to have_nullable_graphql_type(GraphQL::Types::Int) end context 'when counting discussions from a public issue' do diff --git a/spec/graphql/resolvers/user_notes_count_resolver_spec.rb b/spec/graphql/resolvers/user_notes_count_resolver_spec.rb index 6cf23a2f57f..bc173b2a166 100644 --- a/spec/graphql/resolvers/user_notes_count_resolver_spec.rb +++ b/spec/graphql/resolvers/user_notes_count_resolver_spec.rb @@ -11,7 +11,7 @@ RSpec.describe Resolvers::UserNotesCountResolver do let_it_be(:private_project) { create(:project, :repository, :private) } specify do - expect(described_class).to have_nullable_graphql_type(GraphQL::INT_TYPE) + expect(described_class).to have_nullable_graphql_type(GraphQL::Types::Int) end context 'when counting notes from an issue' do -- cgit v1.2.3