Finish integration test and corresponding feature

Author: Kevin Paulisse

spec/octocatalog-diff/fixtures/repos/yaml-diff/hiera.yaml

@@ -4,7 +4,7 @@
 :yaml:
   :datadir: /var/lib/puppet/environments/%{::environment}/hieradata
 :hierarchy:
-  - roles/%{::reference_validation_role}
+  - roles/%{::role}
   - common
 :merge_behavior: deeper
 :logger: console

spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/similar-yaml.default

@@ -0,0 +1,7 @@
+---
+  structure:
+    value: bar
+    array:
+      - foo
+      - bar
+      - baz

spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/different-yaml.erb

@@ -0,0 +1,2 @@
+---
+  value: <%= @parameter %>

spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/identical-yaml.erb

@@ -0,0 +1,2 @@
+---
+  value: nachos

spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/not-yaml.erb

@@ -0,0 +1 @@
+{ "title": "This is not YAML", "value": "<%= @parameter %>" }

spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/similar-yaml.erb

@@ -0,0 +1,16 @@
+---
+<% if @parameter == 'default' %>
+  structure:
+    value: bar
+    array:
+      - foo
+      - bar
+      - baz
+<% else %>
+structure:
+  value: bar
+  array:
+  - foo
+  - bar
+  - baz
+<% end %>

spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/unparseable-yaml-2.erb

@@ -0,0 +1,3 @@
+--- !ruby/object:This::Does::Not::Exist
+  name: foo
+  value: baz

spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/unparseable-yaml.erb

@@ -0,0 +1,3 @@
+--- !ruby/object:This::Does::Not::Exist
+  name: foo
+  value: <%= @parameter %>

spec/octocatalog-diff/integration/yaml_diff_spec.rb

@@ -4,30 +4,85 @@
 require 'json'
 
 describe 'YAML file suppression for identical diffs' do
-  let(:argv) { ['-n', 'rspec-node.github.net', '--to-fact-override', 'role=bar'] }
-  let(:hash) do
-    {
-      hiera_config: 'hiera.yaml',
-      spec_fact_file: 'facts.yaml',
-      spec_repo: 'yaml-diff'
-    }
-  end
-
   context 'with YAML diff suppression disabled' do
-    let(:result) { OctocatalogDiff::Integration.integration(hash.merge(argv: argv)) }
+    before(:all) do
+      argv = ['-n', 'rspec-node.github.net', '--to-fact-override', 'role=bar']
+      hash = { hiera_config: 'hiera.yaml', spec_fact_file: 'facts.yaml', spec_repo: 'yaml-diff' }
+      @result = OctocatalogDiff::Integration.integration(hash.merge(argv: argv))
+    end
 
     it 'should compile without error' do
-      expect(result.exitcode).to eq(2), OctocatalogDiff::Integration.format_exception(result)
-      expect(result.exception).to be_nil
+      expect(@result.exitcode).to eq(2), OctocatalogDiff::Integration.format_exception(@result)
+      expect(@result.exception).to be_nil
+    end
+
+    it 'should contain the correct number of diffs' do
+      expect(@result.diffs.size).to eq(22)
+    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)
+    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)
+    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)
+    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)
     end
   end
 
   context 'with YAML diff suppression enabled' do
-    let(:result) { OctocatalogDiff::Integration.integration(hash.merge(argv: argv + ['--ignore-yaml-whitespace'])) }
+    before(:all) do
+      argv = ['-n', 'rspec-node.github.net', '--to-fact-override', 'role=bar', '--ignore-equivalent-yaml-files']
+      hash = { hiera_config: 'hiera.yaml', spec_fact_file: 'facts.yaml', spec_repo: 'yaml-diff' }
+      @result = OctocatalogDiff::Integration.integration(hash.merge(argv: argv))
+    end
 
     it 'should compile without error' do
-      expect(result.exitcode).to eq(2), OctocatalogDiff::Integration.format_exception(result)
-      expect(result.exception).to be_nil
+      expect(@result.exitcode).to eq(2), OctocatalogDiff::Integration.format_exception(@result)
+      expect(@result.exception).to be_nil
+    end
+
+    it 'should contain the correct number of diffs' do
+      expect(@result.diffs.size).to eq(20)
+    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)
+    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)
+    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)
+    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)
     end
   end
 end