Add test for hiera config in the environment

Author: Kevin Paulisse

spec/octocatalog-diff/fixtures/repos/preserve-environments/environments/one/hiera.yaml

@@ -0,0 +1,9 @@
+---
+:backends:
+  - yaml
+:yaml:
+  :datadir: /var/lib/puppet/environments/%{::environment}/hieradata
+:hierarchy:
+  - common
+:merge_behavior: deeper
+:logger: console

spec/octocatalog-diff/fixtures/repos/preserve-environments/environments/one/hieradata/common.yaml

@@ -0,0 +1,2 @@
+---
+  bar::param: 'Value from one/hieradata/common.yaml'

spec/octocatalog-diff/fixtures/repos/preserve-environments/environments/one/modules/bar/manifests/init.pp

@@ -1,4 +1,6 @@
-class bar {
+class bar (
+  $param = '',
+) {
   include sitetest
 
   file { '/tmp/bar':
@@ -9,4 +11,8 @@
   file { '/tmp/bar-static.txt':
     source => 'puppet:///modules/bar/bar-static.txt',
   }
+
+  file { '/tmp/bar-param.txt':
+    content => "one ${param}",
+  }
 }

spec/octocatalog-diff/fixtures/repos/preserve-environments/environments/two/hiera.yaml

@@ -0,0 +1,9 @@
+---
+:backends:
+  - yaml
+:yaml:
+  :datadir: /var/lib/puppet/environments/%{::environment}/hieradata
+:hierarchy:
+  - common
+:merge_behavior: deeper
+:logger: console

spec/octocatalog-diff/fixtures/repos/preserve-environments/environments/two/hieradata/common.yaml

@@ -0,0 +1,2 @@
+---
+  bar::param: 'Value from two/hieradata/common.yaml'

spec/octocatalog-diff/fixtures/repos/preserve-environments/environments/two/modules/bar/manifests/init.pp

@@ -1,4 +1,6 @@
-class bar {
+class bar (
+  $param = '',
+) {
   include sitetest
 
   file { '/tmp/bar':
@@ -9,4 +11,8 @@
   file { '/tmp/bar-static.txt':
     source => 'puppet:///modules/bar/bar-static.txt',
   }
+
+  file { '/tmp/bar-param.txt':
+    content => "two ${param}",
+  }
 }

spec/octocatalog-diff/integration/preserve_environments_spec.rb

@@ -137,14 +137,17 @@
               '--preserve-environments',
               '--from-environment', 'one',
               '--to-environment', 'two',
-              '--create-symlinks', 'modules,site'
+              '--create-symlinks', 'modules,site',
+              '--hiera-config', 'hiera.yaml',
+              '--hiera-path-strip', '/var/lib/puppet'
             ]
           )
         end
 
         it 'should exit without error' do
           expect(@result.exitcode).to eq(2), OctocatalogDiff::Integration.format_exception(@result)
           expect(@result.exception).to be_nil, OctocatalogDiff::Integration.format_exception(@result)
+          expect(@result.diffs.any?).to eq(true), OctocatalogDiff::Integration.format_exception(@result)
         end
 
         it 'should display proper diffs' do
@@ -178,6 +181,13 @@
             )
           ).to eq(true)
         end
+
+        it 'should handle hieradata properly' do
+          h = @result.diffs.select { |x| x[1] == "File\f/tmp/bar-param.txt\fparameters\fcontent" }
+          expect(h.size).to eq(1), h.inspect
+          expect(h.first[2]).to eq('one Value from one/hieradata/common.yaml')
+          expect(h.first[3]).to eq('two Value from two/hieradata/common.yaml')
+        end
       end
 
       context 'to modules' do