Skip to content
Snippets Groups Projects
Commit 60ff96da authored by Brett Walker's avatar Brett Walker
Browse files

Update to graphql 1.12.23

to fix failure in destroy_tags_spec
parent 818d6433
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !27536. Comments created here will be created in the context of that merge request.
...@@ -98,7 +98,7 @@ gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' ...@@ -98,7 +98,7 @@ gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
# GraphQL API # GraphQL API
# gem 'graphql', '~> 1.11.8' # gem 'graphql', '~> 1.11.8'
gem 'graphql', '~> 1.12.21' gem 'graphql', '~> 1.12.23'
gem 'graphiql-rails', '~> 1.8' gem 'graphiql-rails', '~> 1.8'
gem 'apollo_upload_server', '~> 2.1.0' gem 'apollo_upload_server', '~> 2.1.0'
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
......
...@@ -570,7 +570,7 @@ GEM ...@@ -570,7 +570,7 @@ GEM
faraday (>= 1.0) faraday (>= 1.0)
faraday_middleware faraday_middleware
graphql-client graphql-client
graphql (1.12.21) graphql (1.12.23)
graphql-client (0.16.0) graphql-client (0.16.0)
activesupport (>= 3.0) activesupport (>= 3.0)
graphql (~> 1.8) graphql (~> 1.8)
...@@ -1502,7 +1502,7 @@ DEPENDENCIES ...@@ -1502,7 +1502,7 @@ DEPENDENCIES
grape_logging (~> 1.7) grape_logging (~> 1.7)
graphiql-rails (~> 1.8) graphiql-rails (~> 1.8)
graphlient (~> 0.4.0) graphlient (~> 0.4.0)
graphql (~> 1.12.21) graphql (~> 1.12.23)
graphql-docs (~> 1.6.0) graphql-docs (~> 1.6.0)
grpc (~> 1.42.0) grpc (~> 1.42.0)
gssapi gssapi
......
...@@ -5,7 +5,6 @@ module FindClosest ...@@ -5,7 +5,6 @@ module FindClosest
def closest_parent(types, parent) def closest_parent(types, parent)
while parent while parent
binding.pry
if parent.respond_to?(:object) && types.any? {|type| parent.object.instance_of? type} if parent.respond_to?(:object) && types.any? {|type| parent.object.instance_of? type}
return parent.object.object return parent.object.object
else else
......
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
end end
it 'returns the complexity, depth, duration, etc' do it 'returns the complexity, depth, duration, etc' do
expect(Gitlab::GraphqlLogger).to receive(:info).and_return(true)
result = GraphQL::Analysis::AST.analyze_query(query, [described_class], multiplex_analyzers: []) result = GraphQL::Analysis::AST.analyze_query(query, [described_class], multiplex_analyzers: [])
expect(result.first[:duration_s]).to eq monotonic_time_duration expect(result.first[:duration_s]).to eq monotonic_time_duration
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
it 'returns too many tags error' do it 'returns too many tags error' do
expect { subject }.not_to change { ::Packages::Event.count } expect { subject }.not_to change { ::Packages::Event.count }
explanation = graphql_errors.dig(0, 'extensions', 'problems', 0, 'explanation') explanation = graphql_errors.dig(0, 'message')
expect(explanation).to eq(Mutations::ContainerRepositories::DestroyTags::TOO_MANY_TAGS_ERROR_MESSAGE) expect(explanation).to eq(Mutations::ContainerRepositories::DestroyTags::TOO_MANY_TAGS_ERROR_MESSAGE)
end end
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment