copy-pasta the YAML integration test as JSON integration test

Kevin Paulisse · Kevin Paulisse · commit d21d2ae8774c · 2017-02-13T14:47:48.000-06:00
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/hiera.yaml b/spec/octocatalog-diff/fixtures/repos/json-diff/hiera.yaml
@@ -0,0 +1,10 @@
+---
+:backends:
+  - yaml
+:yaml:
+  :datadir: /var/lib/puppet/environments/%{::environment}/hieradata
+:hierarchy:
+  - roles/%{::role}
+  - common
+:merge_behavior: deeper
+:logger: console
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/hieradata/common.yaml b/spec/octocatalog-diff/fixtures/repos/json-diff/hieradata/common.yaml
@@ -0,0 +1,2 @@
+---
+  bar::parameter: default
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/hieradata/roles/bar.yaml b/spec/octocatalog-diff/fixtures/repos/json-diff/hieradata/roles/bar.yaml
@@ -0,0 +1,2 @@
+---
+  bar::parameter: bar
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/manifests/site.pp b/spec/octocatalog-diff/fixtures/repos/json-diff/manifests/site.pp
@@ -0,0 +1,3 @@
+node default {
+  include bar
+}
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/different-json.bar b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/different-json.bar
@@ -0,0 +1 @@
+{"value": "bar"}
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/different-json.default b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/different-json.default
@@ -0,0 +1 @@
+{"value": "default"}
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/identical-json b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/identical-json
@@ -0,0 +1 @@
+{"value": "identical"}
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/not-json.bar b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/not-json.bar
@@ -0,0 +1,3 @@
+---
+  title: "This is not JSON"
+  value: "bar"
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/not-json.default b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/not-json.default
@@ -0,0 +1,3 @@
+---
+  title: "This is not JSON"
+  value: "default"
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/similar-json.bar.json b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/similar-json.bar.json
@@ -0,0 +1,10 @@
+{
+  "structure": {
+    "value": "bar",
+    "array": [
+      "foo",
+      "bar",
+      "baz"
+    ]
+  }
+}
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/similar-json.default.json b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/files/similar-json.default.json
@@ -0,0 +1 @@
+{"structure":{"value":"bar","array":["foo","bar","baz"]}}
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/manifests/init.pp b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/manifests/init.pp
@@ -0,0 +1,65 @@
+class bar ( $parameter ) {
+  file { '/tmp/template/different-json.json':
+    content => template('bar/different-json.erb')
+  }
+
+  file { "/tmp/template/different-json-${parameter}.json":
+    content => template('bar/different-json.erb')
+  }
+
+  file { '/tmp/template/identical-json.json':
+    content => template('bar/identical-json.erb')
+  }
+
+  file { '/tmp/template/not-json.json':
+    content => '{ "title": "This is not YAML" }'
+  }
+
+  file { '/tmp/template/not-json-2.json':
+    content => template('bar/not-json.erb')
+  }
+
+  file { "/tmp/template/not-json-${parameter}.json":
+    content => template('bar/not-json.erb')
+  }
+
+  file { '/tmp/template/similar-json.yaml':
+    content => template('bar/similar-json.erb')
+  }
+
+  file { '/tmp/template/similar-json.json':
+    content => template('bar/similar-json.erb')
+  }
+
+  file { '/tmp/static/different-json.json':
+    source => "puppet:///modules/bar/different-json.${parameter}"
+  }
+
+  file { "/tmp/static/different-json-${parameter}.json":
+    source => "puppet:///modules/bar/different-json.${parameter}"
+  }
+
+  file { '/tmp/static/identical-json.json':
+    source => 'puppet:///modules/bar/identical-json',
+  }
+
+  file { '/tmp/static/not-json.json':
+    source => 'puppet:///modules/bar/not-json.default',
+  }
+
+  file { '/tmp/static/not-json-2.json':
+    source => "puppet:///modules/bar/not-json.${parameter}",
+  }
+
+  file { "/tmp/static/not-json-${parameter}.json":
+    source => "puppet:///modules/bar/not-json.${parameter}",
+  }
+
+  file { '/tmp/static/similar-json.yaml':
+    source => "puppet:///modules/bar/similar-json.${parameter}.json"
+  }
+
+  file { '/tmp/static/similar-json.json':
+    source => "puppet:///modules/bar/similar-json.${parameter}.json"
+  }
+}
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/templates/different-json.erb b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/templates/different-json.erb
@@ -0,0 +1 @@
+{ "value": "<%= @parameter %>" }
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/templates/identical-json.erb b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/templates/identical-json.erb
@@ -0,0 +1 @@
+{ "value": "nachos" }
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/templates/not-json.erb b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/templates/not-json.erb
@@ -0,0 +1,3 @@
+---
+  title: "This is not JSON"
+  value: "<%= @parameter %>"
diff --git a/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/templates/similar-json.erb b/spec/octocatalog-diff/fixtures/repos/json-diff/modules/bar/templates/similar-json.erb
@@ -0,0 +1,14 @@
+<% if @parameter == 'default' %>
+{
+  "structure": {
+    "value": "bar",
+    "array": [
+      "foo",
+      "bar",
+      "baz"
+    ]
+  }
+}
+<% else %>
+{"structure":{"value":"bar","array":["foo","bar","baz"]}}
+<% end %>
diff --git a/spec/octocatalog-diff/integration/json_diff_spec.rb b/spec/octocatalog-diff/integration/json_diff_spec.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require_relative 'integration_helper'
+require 'json'
+
+describe 'JSON file suppression for identical diffs' do
+  context 'with JSON diff suppression disabled' do
+    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: 'json-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
+    end
+
+    it 'should contain the correct number of diffs' do
+      expect(@result.diffs.size).to eq(16)
+    end
+
+    it 'should contain the "similar JSON" static file as a diff' do
+      resource = { diff_type: '~', type: 'File', title: '/tmp/static/similar-json.json', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
+    end
+
+    it 'should contain the "similar JSON" static file as a diff' do
+      resource = { diff_type: '~', type: 'File', title: '/tmp/static/similar-json.json', 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
+      resource = { diff_type: '~', type: 'File', title: '/tmp/template/similar-json.json', 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
+      resource = { diff_type: '~', type: 'File', title: '/tmp/template/similar-json.json', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
+    end
+  end
+
+  context 'with JSON diff suppression enabled' do
+    before(:all) do
+      argv = ['-n', 'rspec-node.github.net', '--to-fact-override', 'role=bar', '--filters', 'JSON']
+      hash = { hiera_config: 'hiera.yaml', spec_fact_file: 'facts.yaml', spec_repo: 'json-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
+    end
+
+    it 'should contain the correct number of diffs' do
+      expect(@result.diffs.size).to eq(14)
+    end
+
+    it 'should not contain the "similar JSON" static file as a diff' do
+      resource = { diff_type: '~', type: 'File', title: '/tmp/static/similar-json.json', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(false)
+    end
+
+    it 'should contain the "similar JSON" YAML static file as a diff' do
+      resource = { diff_type: '~', type: 'File', title: '/tmp/static/similar-json.yaml', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
+    end
+
+    it 'should not contain the "similar JSON" template file as a diff' do
+      resource = { diff_type: '~', type: 'File', title: '/tmp/template/similar-json.json', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(false)
+    end
+
+    it 'should contain the "similar JSON" YAML template file as a diff' do
+      resource = { diff_type: '~', type: 'File', title: '/tmp/template/similar-json.yaml', structure: %w(parameters content) }
+      expect(OctocatalogDiff::Spec.diff_match?(@result.diffs, resource)).to eq(true)
+    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,3 @@`
	`1`	`+---`
	`2`	`+ title: "This is not JSON"`
	`3`	`+ value: "bar"`