Update YAML integration to use diff_match? check

Author: Kevin Paulisse

spec/octocatalog-diff/integration/yaml_diff_spec.rb

@@ -21,27 +21,23 @@
     end
 
     it 'should contain the "similar JSON" static file as a diff' do
-      arr = @result.diffs
-      answer = ['~', "File\f/tmp/static/similar-yaml.json\fparameters\fcontent"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(arr, answer)).to eq(true)
+      resource = { diff_type: '~', type: 'File', title: '/tmp/static/similar-yaml.json', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
     end
 
     it 'should contain the "similar YAML" static file as a diff' do
-      arr = @result.diffs
-      answer = ['~', "File\f/tmp/static/similar-yaml.yaml\fparameters\fcontent"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(arr, answer)).to eq(true)
+      resource = { diff_type: '~', type: 'File', title: '/tmp/static/similar-yaml.yaml', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
     end
 
     it 'should contain the "similar JSON" template file as a diff' do
-      arr = @result.diffs
-      answer = ['~', "File\f/tmp/template/similar-yaml.json\fparameters\fcontent"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(arr, answer)).to eq(true)
+      resource = { diff_type: '~', type: 'File', title: '/tmp/template/similar-yaml.json', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
     end
 
     it 'should contain the "similar YAML" template file as a diff' do
-      arr = @result.diffs
-      answer = ['~', "File\f/tmp/template/similar-yaml.yaml\fparameters\fcontent"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(arr, answer)).to eq(true)
+      resource = { diff_type: '~', type: 'File', title: '/tmp/template/similar-yaml.yaml', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
     end
   end
 
@@ -62,27 +58,23 @@
     end
 
     it 'should contain the "similar JSON" static file as a diff' do
-      arr = @result.diffs
-      answer = ['~', "File\f/tmp/static/similar-yaml.json\fparameters\fcontent"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(arr, answer)).to eq(true)
+      resource = { diff_type: '~', type: 'File', title: '/tmp/static/similar-yaml.json', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
     end
 
     it 'should not contain the "similar YAML" static file as a diff' do
-      arr = @result.diffs
-      answer = ['~', "File\f/tmp/static/similar-yaml.yaml\fparameters\fcontent"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(arr, answer)).to eq(false)
+      resource = { diff_type: '~', type: 'File', title: '/tmp/static/similar-yaml.yaml', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(false)
     end
 
     it 'should contain the "similar JSON" template file as a diff' do
-      arr = @result.diffs
-      answer = ['~', "File\f/tmp/template/similar-yaml.json\fparameters\fcontent"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(arr, answer)).to eq(true)
+      resource = { diff_type: '~', type: 'File', title: '/tmp/template/similar-yaml.json', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
     end
 
     it 'should not contain the "similar YAML" template file as a diff' do
-      arr = @result.diffs
-      answer = ['~', "File\f/tmp/template/similar-yaml.yaml\fparameters\fcontent"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(arr, answer)).to eq(false)
+      resource = { diff_type: '~', type: 'File', title: '/tmp/template/similar-yaml.yaml', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(false)
     end
   end
 end

spec/octocatalog-diff/tests/spec_helper.rb

@@ -122,6 +122,25 @@ def self.array_contains_partial_array?(subject, lookup)
       false
     end
 
+    # Determine if a OctocatalogDiff::API::V1::Diff (or an array of those) matches a lookup hash. This
+    # returns true if the object (or any object in the array) matches all keys given in the lookup hash.
+    # @param diff_in [OctocatalogDiff::API::V1::Diff or Array<OctocatalogDiff::API::V1::Diff>] diff(s) to search
+    # @param lookup [Hash] Lookup hash
+    def self.diff_match?(diff_in, lookup)
+      diffs = [diff_in].flatten
+      diffs.each do |diff|
+        flag = true
+        lookup.to_h.each do |key, val|
+          unless diff.send(key) == val
+            flag = false
+            break
+          end
+        end
+        return true if flag
+      end
+      false
+    end
+
     # Mock out a small shell script that tests for environment variable setting.
     # This takes the LAST command line argument, gets the value of that variable,
     # and prints it to STDERR.