Add some static files so compare file text will be exercised too

Author: Kevin Paulisse

spec/octocatalog-diff/fixtures/repos/preserve-environments/environments/one/modules/bar/files/bar-static.txt

@@ -0,0 +1 @@
+Bar one

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

@@ -5,4 +5,8 @@
     owner   => 'one',
     content => $::environment,
   }
+
+  file { '/tmp/bar-static.txt':
+    source => 'puppet:///modules/bar/bar-static.txt',
+  }
 }

spec/octocatalog-diff/fixtures/repos/preserve-environments/environments/two/modules/bar/files/bar-static.txt

@@ -0,0 +1 @@
+Bar two

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

@@ -5,4 +5,8 @@
     owner   => 'two',
     content => $::environment,
   }
+
+  file { '/tmp/bar-static.txt':
+    source => 'puppet:///modules/bar/bar-static.txt',
+  }
 }

spec/octocatalog-diff/fixtures/repos/preserve-environments/modules/foo/files/foo-static.txt

@@ -0,0 +1 @@
+Hello there!

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

@@ -3,4 +3,8 @@
     owner   => 'foo',
     content => $::environment,
   }
+
+  file { '/tmp/foo-static.txt':
+    source => 'puppet:///modules/foo/foo-static.txt',
+  }
 }

spec/octocatalog-diff/fixtures/repos/preserve-environments/site/sitetest/files/sitetest-static.txt

@@ -0,0 +1 @@
+Site test

spec/octocatalog-diff/fixtures/repos/preserve-environments/site/sitetest/manifests/init.pp

@@ -3,4 +3,8 @@
     owner   => 'sitetest',
     content => $::environment,
   }
+
+  file { '/tmp/sitetest-static.txt':
+    source => 'puppet:///site/sitetest/sitetest-static.txt',
+  }
 }

spec/octocatalog-diff/integration/preserve_environments_spec.rb

@@ -52,7 +52,7 @@
       end
 
       it 'should log warning about --environment being useless in this context' do
-        expect(@result.logs).to match(/WARN -- : --environment is ignored unless --preserve-environment is used/)
+        expect(@result.logs).to match(/WARN -- : --environment is ignored unless --preserve-environments is used/)
       end
     end
 
@@ -77,7 +77,7 @@
       end
 
       it 'should log warning about --create-symlinks being useless in this context' do
-        expect(@result.logs).to match(/WARN -- : --create-symlinks is ignored unless --preserve-environment is used/)
+        expect(@result.logs).to match(/WARN -- : --create-symlinks is ignored unless --preserve-environments is used/)
       end
     end
   end
@@ -294,7 +294,7 @@
         it 'should error on missing site directory' do
           expect(@result.exitcode).to eq(-1), OctocatalogDiff::Integration.format_exception(@result)
           expect(@result.exception).to be_a_kind_of(OctocatalogDiff::CatalogDiff::Cli::Catalogs::CatalogError)
-          expect(@result.exception.message).to match(%r{Could not find class (::)?sitetest.+ at .+/environments/two/})
+          expect(@result.exception.message).to match(/Could not find class (::)?sitetest.+ at/)
         end
       end
     end