Stub integration test and fixture for YAML comparison code

Kevin Paulisse · Kevin Paulisse · commit 651cb88f5ff5 · 2017-01-04T16:26:58.000-06:00
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/hiera.yaml b/spec/octocatalog-diff/fixtures/repos/yaml-diff/hiera.yaml
@@ -0,0 +1,10 @@
+---
+:backends:
+  - yaml
+:yaml:
+  :datadir: /var/lib/puppet/environments/%{::environment}/hieradata
+:hierarchy:
+  - roles/%{::reference_validation_role}
+  - common
+:merge_behavior: deeper
+:logger: console
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/hieradata/common.yaml b/spec/octocatalog-diff/fixtures/repos/yaml-diff/hieradata/common.yaml
@@ -0,0 +1,2 @@
+---
+  bar::parameter: default
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/hieradata/roles/bar.yaml b/spec/octocatalog-diff/fixtures/repos/yaml-diff/hieradata/roles/bar.yaml
@@ -0,0 +1,2 @@
+---
+  bar::parameter: bar
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/manifests/site.pp b/spec/octocatalog-diff/fixtures/repos/yaml-diff/manifests/site.pp
@@ -0,0 +1,3 @@
+node default {
+  include bar
+}
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/different-yaml.bar b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/different-yaml.bar
@@ -0,0 +1,2 @@
+---
+  value: bar
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/different-yaml.default b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/different-yaml.default
@@ -0,0 +1,2 @@
+---
+  value: default
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/identical-yaml b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/identical-yaml
@@ -0,0 +1,2 @@
+---
+  value: identical
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/not-yaml.bar b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/not-yaml.bar
@@ -0,0 +1 @@
+{ "title": "This is not YAML", "value": "bar" }
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/not-yaml.default b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/not-yaml.default
@@ -0,0 +1 @@
+{ "title": "This is not YAML", "value": "default" }
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/similar-yaml.bar b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/similar-yaml.bar
@@ -0,0 +1,7 @@
+---
+structure:
+  value: bar
+  array:
+  - foo
+  - bar
+  - baz
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/similar-yaml.default b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/similar-yaml.default
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/unparseable-yaml.bar b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/unparseable-yaml.bar
@@ -0,0 +1,3 @@
+--- !ruby/object:This::Does::Not::Exist
+  name: foo
+  value: bar
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/unparseable-yaml.default b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/files/unparseable-yaml.default
@@ -0,0 +1,3 @@
+--- !ruby/object:This::Does::Not::Exist
+  name: foo
+  value: default
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/manifests/init.pp b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/manifests/init.pp
@@ -0,0 +1,89 @@
+class bar ( $parameter ) {
+  file { '/tmp/template/different-yaml.yaml':
+    content => template('bar/different-yaml.erb')
+  }
+
+  file { "/tmp/template/different-yaml-${parameter}.yaml":
+    content => template('bar/different-yaml.erb')
+  }
+
+  file { '/tmp/template/identical-yaml.yaml':
+    content => template('bar/identical-yaml.erb')
+  }
+
+  file { '/tmp/template/not-yaml.yaml':
+    content => '{ "title": "This is not YAML" }'
+  }
+
+  file { '/tmp/template/not-yaml-2.yaml':
+    content => template('bar/not-yaml.erb')
+  }
+
+  file { "/tmp/template/not-yaml-${parameter}.yaml":
+    content => template('bar/not-yaml.erb')
+  }
+
+  file { '/tmp/template/similar-yaml.yaml':
+    content => template('bar/similar-yaml.erb')
+  }
+
+  file { '/tmp/template/similar-yaml.json':
+    content => template('bar/similar-yaml.erb')
+  }
+
+  file { '/tmp/template/unparseable-yaml.yaml':
+    content => template('bar/unparseable-yaml.erb'),
+  }
+
+  file { '/tmp/template/unparseable-yaml-2.yaml':
+    content => template('bar/unparseable-yaml-2.erb'),
+  }
+
+  file { "/tmp/template/unparseable-yaml-${parameter}.yaml":
+    content => template('bar/unparseable-yaml-2.erb'),
+  }
+
+  file { '/tmp/static/different-yaml.yaml':
+    source => "puppet:///modules/bar/different-yaml.${parameter}"
+  }
+
+  file { "/tmp/static/different-yaml-${parameter}.yaml":
+    source => "puppet:///modules/bar/different-yaml.${parameter}"
+  }
+
+  file { '/tmp/static/identical-yaml.yaml':
+    source => 'puppet:///modules/bar/identical-yaml',
+  }
+
+  file { '/tmp/static/not-yaml.yaml':
+    source => 'puppet:///modules/bar/not-yaml.default',
+  }
+
+  file { '/tmp/static/not-yaml-2.yaml':
+    source => "puppet:///modules/bar/not-yaml.${parameter}",
+  }
+
+  file { "/tmp/static/not-yaml-${parameter}.yaml":
+    source => "puppet:///modules/bar/not-yaml.${parameter}",
+  }
+
+  file { '/tmp/static/similar-yaml.yaml':
+    source => "puppet:///modules/bar/similar-yaml.${parameter}"
+  }
+
+  file { '/tmp/static/similar-yaml.json':
+    source => "puppet:///modules/bar/similar-yaml.${parameter}"
+  }
+
+  file { '/tmp/static/unparseable-yaml.yaml':
+    source => 'puppet:///modules/bar/unparseable-yaml.default',
+  }
+
+  file { '/tmp/static/unparseable-yaml-2.yaml':
+    source => "puppet:///modules/bar/unparseable-yaml.${parameter}",
+  }
+
+  file { "/tmp/static/unparseable-yaml-${parameter}.yaml":
+    source => "puppet:///modules/bar/unparseable-yaml.${parameter}",
+  }
+}
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/different-yaml.erb b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/different-yaml.erb
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/identical-yaml.erb b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/identical-yaml.erb
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/not-yaml.erb b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/not-yaml.erb
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/similar-yaml.erb b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/similar-yaml.erb
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/unparseable-yaml-2.erb b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/unparseable-yaml-2.erb
diff --git a/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/unparseable-yaml.erb b/spec/octocatalog-diff/fixtures/repos/yaml-diff/modules/bar/templates/unparseable-yaml.erb
diff --git a/spec/octocatalog-diff/integration/yaml_diff_spec.rb b/spec/octocatalog-diff/integration/yaml_diff_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'integration_helper'
+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)) }
+
+    it 'should compile without error' do
+      expect(result.exitcode).to eq(2), OctocatalogDiff::Integration.format_exception(result)
+      expect(result.exception).to be_nil
+    end
+  end
+
+  context 'with YAML diff suppression enabled' do
+    let(:result) { OctocatalogDiff::Integration.integration(hash.merge(argv: argv + ['--ignore-yaml-whitespace'])) }
+
+    it 'should compile without error' do
+      expect(result.exitcode).to eq(2), OctocatalogDiff::Integration.format_exception(result)
+      expect(result.exception).to be_nil
+    end
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+node default {`
	`2`	`+ include bar`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{ "title": "This is not YAML", "value": "bar" }`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +---
 +structure:
 +  value: bar
 +  array:
 +  - foo
 +  - bar
 +  - baz