Reduce diff with EE in spec/fixtures/api/schemas

Signed-off-by: Rémy Coutable <remy@rymai.me>

1 files changed, 19 insertions, 5 deletions

diff --git a/spec/support/api/schema_matcher.rb b/spec/support/api/schema_matcher.rb
index f7d74df0656..4cf34d43117 100644
--- a/spec/support/api/schema_matcher.rb
+++ b/spec/support/api/schema_matcher.rb
@@ -1,10 +1,16 @@
 module SchemaPath
-  def self.expand(schema, dir = '')
-    Rails.root.join(dir, 'spec', "fixtures/api/schemas/#{schema}.json").to_s
+  def self.expand(schema, dir = nil)
+    if Gitlab.ee? && dir.nil?
+      ee_path = expand(schema, 'ee')
+
+      return ee_path if File.exist?(ee_path)
+    end
+
+    Rails.root.join(dir.to_s, 'spec', "fixtures/api/schemas/#{schema}.json").to_s
   end
 end
 
-RSpec::Matchers.define :match_response_schema do |schema, dir: '', **options|
+RSpec::Matchers.define :match_response_schema do |schema, dir: nil, **options|
   match do |response|
     @errors = JSON::Validator.fully_validate(
       SchemaPath.expand(schema, dir), response.body, options)
@@ -18,8 +24,16 @@ RSpec::Matchers.define :match_response_schema do |schema, dir: '', **options|
   end
 end
 
-RSpec::Matchers.define :match_schema do |schema, dir: '', **options|
+RSpec::Matchers.define :match_schema do |schema, dir: nil, **options|
   match do |data|
-    JSON::Validator.validate!(SchemaPath.expand(schema, dir), data, options)
+    @errors = JSON::Validator.fully_validate(
+      SchemaPath.expand(schema, dir), data, options)
+
+    @errors.empty?
+  end
+
+  failure_message do |response|
+    "didn't match the schema defined by #{SchemaPath.expand(schema, dir)}" \
+    " The validation errors were:\n#{@errors.join("\n")}"
   end
 end