Convert more integration tests to .diff_match?

Author: Kevin Paulisse

spec/octocatalog-diff/integration/convert_file_resources_spec.rb

@@ -27,23 +27,39 @@
     end
 
     it 'should contain /tmp/foo1' do
-      answer = ['~', "File\f/tmp/foo1\fparameters\fcontent", "content of foo-old\n", "content of foo-new\n"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(@result[:diffs], answer)).to eq(true)
+      resource = {
+        diff_type: '~',
+        type: 'File',
+        title: '/tmp/foo1',
+        structure: %w(parameters content),
+        old_value: "content of foo-old\n",
+        new_value: "content of foo-new\n"
+      }
+      expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
     end
 
     it 'should contain /tmp/binary1' do
-      answer = [
-        '~',
-        "File\f/tmp/binary1\fparameters\fcontent",
-        '{md5}e0897d525d5d600a037622b62fc99a4c',
-        '{md5}97918b387001eb04ae7cb20b13e07f43'
-      ]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(@result[:diffs], answer)).to eq(true)
+      resource = {
+        diff_type: '~',
+        type: 'File',
+        title: '/tmp/binary1',
+        structure: %w(parameters content),
+        old_value: '{md5}e0897d525d5d600a037622b62fc99a4c',
+        new_value: '{md5}97918b387001eb04ae7cb20b13e07f43'
+      }
+      expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
     end
 
     it 'should contain /tmp/bar2' do
-      answer = ['~', "File\f/tmp/bar2\fparameters\fcontent", "content of bar\n", "content of new-bar\n"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(@result[:diffs], answer)).to eq(true)
+      resource = {
+        diff_type: '~',
+        type: 'File',
+        title: '/tmp/bar2',
+        structure: %w(parameters content),
+        old_value: "content of bar\n",
+        new_value: "content of new-bar\n"
+      }
+      expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
     end
   end
 
@@ -71,38 +87,63 @@
     end
 
     it 'should contain /tmp/binary1' do
-      answer = [
-        '~',
-        "File\f/tmp/binary1\fparameters\fsource",
-        'puppet:///modules/test/binary-old',
-        'puppet:///modules/test/binary-new'
-      ]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(@result[:diffs], answer)).to eq(true)
+      resource = {
+        diff_type: '~',
+        type: 'File',
+        title: '/tmp/binary1',
+        structure: %w(parameters source),
+        old_value: 'puppet:///modules/test/binary-old',
+        new_value: 'puppet:///modules/test/binary-new'
+      }
+      expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
     end
 
     it 'should contain /tmp/binary3' do
-      answer = [
-        '~',
-        "File\f/tmp/binary3\fparameters\fsource",
-        'puppet:///modules/test/binary-old',
-        'puppet:///modules/test/binary-old2'
-      ]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(@result[:diffs], answer)).to eq(true)
+      resource = {
+        diff_type: '~',
+        type: 'File',
+        title: '/tmp/binary3',
+        structure: %w(parameters source),
+        old_value: 'puppet:///modules/test/binary-old',
+        new_value: 'puppet:///modules/test/binary-old2'
+      }
+      expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
     end
 
     it 'should contain /tmp/foo1' do
-      answer = ['~', "File\f/tmp/foo1\fparameters\fsource", 'puppet:///modules/test/foo-old', 'puppet:///modules/test/foo-new']
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(@result[:diffs], answer)).to eq(true)
+      resource = {
+        diff_type: '~',
+        type: 'File',
+        title: '/tmp/foo1',
+        structure: %w(parameters source),
+        old_value: 'puppet:///modules/test/foo-old',
+        new_value: 'puppet:///modules/test/foo-new'
+      }
+      expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
     end
 
     it 'should contain /tmp/bar content' do
-      answer = ['!', "File\f/tmp/bar\fparameters\fcontent", nil, "content of bar\n"]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(@result[:diffs], answer)).to eq(true)
+      resource = {
+        diff_type: '!',
+        type: 'File',
+        title: '/tmp/bar',
+        structure: %w(parameters content),
+        old_value: nil,
+        new_value: "content of bar\n"
+      }
+      expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
     end
 
     it 'should contain /tmp/bar source' do
-      answer = ['!', "File\f/tmp/bar\fparameters\fsource", 'puppet:///modules/test/bar-old', nil]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(@result[:diffs], answer)).to eq(true)
+      resource = {
+        diff_type: '!',
+        type: 'File',
+        title: '/tmp/bar',
+        structure: %w(parameters source),
+        old_value: 'puppet:///modules/test/bar-old',
+        new_value: nil
+      }
+      expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
     end
   end
 

spec/octocatalog-diff/integration/preserve_environments_spec.rb

@@ -151,35 +151,45 @@
         end
 
         it 'should display proper diffs' do
-          diffs = @result.diffs
-
-          expect(
-            OctocatalogDiff::Spec.array_contains_partial_array?(
-              diffs,
-              ['~', "File\f/tmp/bar\fparameters\fcontent", 'one', 'two']
-            )
-          ).to eq(true)
-
-          expect(
-            OctocatalogDiff::Spec.array_contains_partial_array?(
-              diffs,
-              ['~', "File\f/tmp/bar\fparameters\fowner", 'one', 'two']
-            )
-          ).to eq(true)
-
-          expect(
-            OctocatalogDiff::Spec.array_contains_partial_array?(
-              diffs,
-              ['~', "File\f/tmp/foo\fparameters\fcontent", 'one', 'two']
-            )
-          ).to eq(true)
-
-          expect(
-            OctocatalogDiff::Spec.array_contains_partial_array?(
-              diffs,
-              ['~', "File\f/tmp/sitetest\fparameters\fcontent", 'one', 'two']
-            )
-          ).to eq(true)
+          resource = {
+            diff_type: '~',
+            type: 'File',
+            title: '/tmp/bar',
+            structure: %w(parameters content),
+            old_value: 'one',
+            new_value: 'two'
+          }
+          expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
+
+          resource = {
+            diff_type: '~',
+            type: 'File',
+            title: '/tmp/bar',
+            structure: %w(parameters owner),
+            old_value: 'one',
+            new_value: 'two'
+          }
+          expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
+
+          resource = {
+            diff_type: '~',
+            type: 'File',
+            title: '/tmp/foo',
+            structure: %w(parameters content),
+            old_value: 'one',
+            new_value: 'two'
+          }
+          expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
+
+          resource = {
+            diff_type: '~',
+            type: 'File',
+            title: '/tmp/sitetest',
+            structure: %w(parameters content),
+            old_value: 'one',
+            new_value: 'two'
+          }
+          expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
         end
 
         it 'should handle hieradata properly' do

spec/octocatalog-diff/integration/reference_validation_spec.rb

@@ -255,19 +255,8 @@ def self.catalog_contains_resource(result, type, title)
       diffs = @result.diffs
       expect(diffs).to be_a_kind_of(Array)
       expect(diffs.size).to eq(1)
-
-      answer = [
-        '-',
-        "Exec\fbefore caller",
-        {
-          'type' => 'Exec',
-          'title' => 'before caller',
-          'tags' => ['before_callers', 'class', 'default', 'exec', 'node', 'test', 'test::before_callers'],
-          'exported' => false,
-          'parameters' => { 'command' => '/bin/true' }
-        }
-      ]
-      expect(OctocatalogDiff::Spec.array_contains_partial_array?(diffs, answer)).to eq(true)
+      resource = { diff_type: '-', type: 'Exec', title: 'before caller' }
+      expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
     end
   end