Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/support/matchers/graphql_matchers.rb b/spec/support/matchers/graphql_matchers.rb
index ebba5d8a73c..dbf457a9200 100644
--- a/spec/support/matchers/graphql_matchers.rb
+++ b/spec/support/matchers/graphql_matchers.rb
@@ -28,6 +28,19 @@ RSpec::Matchers.define :have_graphql_fields do |*expected|
   end
 end
 
+RSpec::Matchers.define :include_graphql_fields do |*expected|
+  expected_field_names = expected.map { |name| GraphqlHelpers.fieldnamerize(name) }
+
+  match do |kls|
+    expect(kls.fields.keys).to include(*expected_field_names)
+  end
+
+  failure_message do |kls|
+    missing = expected_field_names - kls.fields.keys
+    "is missing fields: <#{missing.inspect}>" if missing.any?
+  end
+end
+
 RSpec::Matchers.define :have_graphql_field do |field_name, args = {}|
   match do |kls|
     field = kls.fields[GraphqlHelpers.fieldnamerize(field_name)]