Update tests and fixtures with more complete errors and to test custom defined type

Author: Kevin Paulisse

spec/octocatalog-diff/fixtures/repos/reference-validation/modules/test/manifests/foo/bar.pp

@@ -0,0 +1,5 @@
+define test::foo::bar {
+  exec { "test::foo::bar ${name}":
+    command => '/bin/true',
+  }
+}

spec/octocatalog-diff/fixtures/repos/reference-validation/modules/test/manifests/notify_callers.pp

@@ -1,6 +1,5 @@
 class test::notify_callers {
   exec { 'notify caller':
-    command => '/bin/true',
-    notify  => Exec['notify target'],
+    notify => Test::Foo::Bar['notify target'],
   }
 }

spec/octocatalog-diff/fixtures/repos/reference-validation/modules/test/manifests/notify_targets.pp

@@ -1,5 +1,3 @@
 class test::notify_targets {
-  exec { 'notify target':
-    command => '/bin/true',
-  }
+  test::foo::bar { 'notify target': }
 }

spec/octocatalog-diff/fixtures/repos/reference-validation/modules/test/manifests/require_callers.pp

@@ -3,4 +3,17 @@
     command => '/bin/true',
     require => Exec['require target'],
   }
+
+  exec { 'require caller 2':
+    command => '/bin/true',
+    require => Exec['require caller'],
+  }
+
+  exec { ['require caller 3', 'require caller 4']:
+    command => '/bin/true',
+    require => [
+      Exec['require caller'],
+      Exec['require target'],
+    ]
+  }
 }

spec/octocatalog-diff/integration/reference_validation_spec.rb

@@ -98,6 +98,11 @@ def self.catalog_contains_resource(result, type, title)
     it 'should raise ReferenceValidationError' do
       expect(@result.exception).to be_a_kind_of(OctocatalogDiff::Catalog::ReferenceValidationError)
     end
+
+    it 'should have formatted error messages' do
+      msg = @result.exception.message
+      expect(msg).to eq('Catalog has broken reference: exec[before caller] -> before[Exec[before target]]')
+    end
   end
 
   context 'with broken notify' do
@@ -112,6 +117,11 @@ def self.catalog_contains_resource(result, type, title)
     it 'should raise ReferenceValidationError' do
       expect(@result.exception).to be_a_kind_of(OctocatalogDiff::Catalog::ReferenceValidationError)
     end
+
+    it 'should have formatted error messages' do
+      msg = @result.exception.message
+      expect(msg).to match(/exec\[notify caller\] -> notify\[Test::Foo::Bar\[notify target\]\]/)
+    end
   end
 
   context 'with broken require' do
@@ -126,6 +136,15 @@ def self.catalog_contains_resource(result, type, title)
     it 'should raise ReferenceValidationError' do
       expect(@result.exception).to be_a_kind_of(OctocatalogDiff::Catalog::ReferenceValidationError)
     end
+
+    it 'should have formatted error messages' do
+      msg = @result.exception.message
+      expect(msg).to match(/exec\[require caller\] -> require\[Exec\[require target\]\]/)
+      expect(msg).to match(/exec\[require caller 3\] -> require\[Exec\[require target\]\]/)
+      expect(msg).to match(/exec\[require caller 4\] -> require\[Exec\[require target\]\]/)
+      expect(msg).not_to match(/exec\[require caller 2\]/)
+      expect(msg).not_to match(/-> require\[Exec\[require caller\]\]/)
+    end
   end
 
   context 'with broken subscribe but subscribe not checked' do