[ci skip] Merge branch 'master' into fl-update-registry-codefl-update-registry-code

* master: (68 commits)
  Render calendar feed inline when accessed from GitLab
  Make Gitaly wiki RPC's mandatory
  Remove the ci_job_request_with_tags_matcher
  Optimised paused runners to not re-query every 3s
  [Rails5] Set request.format for artifacts_controller
  [Rails5] Fix sessions_controller_spec
  Rails5 update Gemfile.rails5.lock
  [Rails5] Fix pipeline_schedules_controller_spec
  Fix milestones disappearing when changed on MR
  Harmonize theme preferences previews
  Resolve "Wiki git clone holder and dropdown is broken"
  Resolve "Update link in GitLab cluster setup form to say "see pricing""
  Resolve "Misalignment in rows on comparison page"
  Resolve "Stop horizontal scrolling when clicking on board issue"
  Enable no-multi-assignment in JS files
  Fix ci mini graph dropdown alignment and positioning
  Remove additional border from the create project page
  Fix alert colors
  Enable display static for ci job dropdowns so that they dont move when window resizes
  Remove pointer events in favor of boundary viewport
  ...

2 files changed, 18 insertions, 3 deletions

diff --git a/spec/support/helpers/graphql_helpers.rb b/spec/support/helpers/graphql_helpers.rb
index 30ff9a1196a..0930b9da368 100644
--- a/spec/support/helpers/graphql_helpers.rb
+++ b/spec/support/helpers/graphql_helpers.rb
@@ -34,14 +34,20 @@ module GraphqlHelpers
   end
 
   def graphql_query_for(name, attributes = {}, fields = nil)
+    <<~QUERY
+    {
+      #{query_graphql_field(name, attributes, fields)}
+    }
+    QUERY
+  end
+
+  def query_graphql_field(name, attributes = {}, fields = nil)
     fields ||= all_graphql_fields_for(name.classify)
     attributes = attributes_to_graphql(attributes)
     <<~QUERY
-    {
       #{name}(#{attributes}) {
         #{fields}
       }
-    }
     QUERY
   end
 
@@ -50,12 +56,15 @@ module GraphqlHelpers
     return "" unless type
 
     type.fields.map do |name, field|
+      # We can't guess arguments, so skip fields that require them
+      next if field.arguments.any?
+
       if scalar?(field)
         name
       else
         "#{name} { #{all_graphql_fields_for(field_type(field))} }"
       end
-    end.join("\n")
+    end.compact.join("\n")
   end
 
   def attributes_to_graphql(attributes)
diff --git a/spec/support/matchers/graphql_matchers.rb b/spec/support/matchers/graphql_matchers.rb
index ba7a1c8cde0..d23cbaf4beb 100644
--- a/spec/support/matchers/graphql_matchers.rb
+++ b/spec/support/matchers/graphql_matchers.rb
@@ -13,6 +13,12 @@ RSpec::Matchers.define :have_graphql_fields do |*expected|
   end
 end
 
+RSpec::Matchers.define :have_graphql_field do |field_name|
+  match do |kls|
+    expect(kls.fields.keys).to include(GraphqlHelpers.fieldnamerize(field_name))
+  end
+end
+
 RSpec::Matchers.define :have_graphql_arguments do |*expected|
   include GraphqlHelpers