kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'bw-query_graphql_field-enhancement' into 'master'

Browse source 
Allow arrays to be specified for fields in graphql_query_for

Closes #60238

See merge request gitlab-org/gitlab-ce!27142
This commit is contained in:
Dmitriy Zaporozhets 2019-04-16 08:05:17 +00:00
commit 224916f843
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/requests/api/graphql/gitlab_schema_spec.rb
View file

@ -5,7 +5,7 @@ describe 'GitlabSchema configurations' do
it 'shows an error if complexity is too high' do it 'shows an error if complexity is too high' do
project = create(:project, :repository) project = create(:project, :repository)
query = graphql_query_for('project', { 'fullPath' => project.full_path }, "id\nname\ndescription") query = graphql_query_for('project', { 'fullPath' => project.full_path }, %w(id name description))
allow(GitlabSchema).to receive(:max_query_complexity).and_return 1 allow(GitlabSchema).to receive(:max_query_complexity).and_return 1

3
spec/support/helpers/graphql_helpers.rb
View file

@ -83,7 +83,8 @@ module GraphqlHelpers
end end
def wrap_fields(fields) def wrap_fields(fields)
return unless fields.strip.present? fields = Array.wrap(fields).join("\n")
return unless fields.present?
<<~FIELDS <<~FIELDS
{ {