Commit 2eb42bde authored by Stan Hu's avatar Stan Hu

Update Gemfile.lock and drop comments

Now that we've updated graphiql-rails, we no longer need to include the
comments about the CSP workaround.

Fix the GraphQL explorer tests that broke as a result of the update.
parent dd23e854
......@@ -98,9 +98,6 @@ gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
# GraphQL API
gem 'graphql', '~> 1.11.10'
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.8'
gem 'apollo_upload_server', '~> 2.1.0'
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
......
......@@ -561,7 +561,7 @@ GEM
grape_logging (1.8.3)
grape
rack
graphiql-rails (1.4.10)
graphiql-rails (1.8.0)
railties
sprockets-rails
graphlient (0.4.0)
......@@ -1498,7 +1498,7 @@ DEPENDENCIES
grape-entity (~> 0.10.0)
grape-path-helpers (~> 1.7.0)
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphiql-rails (~> 1.8)
graphlient (~> 0.4.0)
graphql (~> 1.11.10)
graphql-docs (~> 1.6.0)
......
......@@ -9,7 +9,7 @@ RSpec.describe 'GraphiQL' do
end
it 'has the correct graphQLEndpoint' do
expect(page.body).to include('var graphQLEndpoint = "/api/graphql";')
expect(page.body).to include('<div id="graphiql-container" data-graphql-endpoint-path="/api/graphql"')
end
end
......@@ -26,7 +26,7 @@ RSpec.describe 'GraphiQL' do
end
it 'has the correct graphQLEndpoint' do
expect(page.body).to include('var graphQLEndpoint = "/gitlab/root/api/graphql";')
expect(page.body).to include('<div id="graphiql-container" data-graphql-endpoint-path="/gitlab/root/api/graphql"')
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment