summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-03-18 19:58:30 +0000
committerStan Hu <stanhu@gmail.com>2019-03-18 19:58:30 +0000
commita3b3da72775fd37f7533ddd88fe47600079b4ed9 (patch)
treed4de000c157b30bc185a763c27773d2e4f559885
parent81e63951ffc2cadefb26682b6c58ee6ee510a73c (diff)
parenta481c54ca8764b29b98edf383096e598e544a24d (diff)
downloadgitlab-ce-a3b3da72775fd37f7533ddd88fe47600079b4ed9.tar.gz
Merge branch 'bw-fix-api-routing-specs' into 'master'
Fix spec for routes to the GraphqlController See merge request gitlab-org/gitlab-ce!26231
-rw-r--r--spec/routing/api_routing_spec.rb14
1 files changed, 3 insertions, 11 deletions
diff --git a/spec/routing/api_routing_spec.rb b/spec/routing/api_routing_spec.rb
index 5fde4bd885b..3c48ead4ff2 100644
--- a/spec/routing/api_routing_spec.rb
+++ b/spec/routing/api_routing_spec.rb
@@ -7,25 +7,17 @@ describe 'api', 'routing' do
end
it 'does not route to the GraphqlController' do
- expect(get('/api/graphql')).not_to route_to('graphql#execute')
- end
-
- it 'does not expose graphiql' do
- expect(get('/-/graphql-explorer')).not_to route_to('graphiql/rails/editors#show')
+ expect(post('/api/graphql')).not_to route_to('graphql#execute')
end
end
- context 'when graphql is disabled' do
+ context 'when graphql is enabled' do
before do
stub_feature_flags(graphql: true)
end
it 'routes to the GraphqlController' do
- expect(get('/api/graphql')).not_to route_to('graphql#execute')
- end
-
- it 'exposes graphiql' do
- expect(get('/-/graphql-explorer')).not_to route_to('graphiql/rails/editors#show')
+ expect(post('/api/graphql')).to route_to('graphql#execute')
end
end
end