Skip to content

Commit cd6eba5

Browse files
committed
New Puppet version somewhat changed error message, so update tests
1 parent 8f78fe8 commit cd6eba5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

spec/octocatalog-diff/integration/reference_validation_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def self.catalog_contains_resource(result, type, title)
129129
if OctocatalogDiff::Spec.is_puppet5?
130130
it 'should pass through the error messages from Puppet' do
131131
msg = @result.exception.message
132-
expect(msg).to match(/Error: Could not find resource 'Exec\[subscribe target\]' in parameter 'subscribe' at/)
132+
expect(msg).to match(/Error: Could not find resource 'Exec\[subscribe target\]' in parameter 'subscribe'/)
133133
end
134134
else
135135
# Multiple line numbers given because Puppet 4.x and 3.8 correspond to first and last line of resource, respectively.
@@ -162,7 +162,7 @@ def self.catalog_contains_resource(result, type, title)
162162
if OctocatalogDiff::Spec.is_puppet5?
163163
it 'should pass through the error messages from Puppet' do
164164
msg = @result.exception.message
165-
expect(msg).to match(/Error: Could not find resource 'Exec\[before target\]' in parameter 'before' at/)
165+
expect(msg).to match(/Error: Could not find resource 'Exec\[before target\]' in parameter 'before'/)
166166
end
167167
else
168168
# rubocop:disable Metrics/LineLength
@@ -190,7 +190,7 @@ def self.catalog_contains_resource(result, type, title)
190190
if OctocatalogDiff::Spec.is_puppet5?
191191
it 'should pass through the error messages from Puppet' do
192192
msg = @result.exception.message
193-
expect(msg).to match(/Error: Could not find resource 'Test::Foo::Bar\[notify target\]' in parameter 'notify' at/)
193+
expect(msg).to match(/Error: Could not find resource 'Test::Foo::Bar\[notify target\]' in parameter 'notify'/)
194194
end
195195
else
196196
# rubocop:disable Metrics/LineLength
@@ -218,7 +218,7 @@ def self.catalog_contains_resource(result, type, title)
218218
if OctocatalogDiff::Spec.is_puppet5?
219219
it 'should pass through the error messages from Puppet' do
220220
msg = @result.exception.message
221-
expect(msg).to match(/Error: Could not find resource 'Exec\[require target\]' in parameter 'require' at/)
221+
expect(msg).to match(/Error: Could not find resource 'Exec\[require target\]' in parameter 'require'/)
222222
end
223223
else
224224
# rubocop:disable Metrics/LineLength
@@ -246,7 +246,7 @@ def self.catalog_contains_resource(result, type, title)
246246

247247
it 'should pass through the error messages from Puppet' do
248248
msg = @result.exception.message
249-
expect(msg).to match(/Error: Could not find resource 'Exec\[subscribe target\]' in parameter 'subscribe' at/)
249+
expect(msg).to match(/Error: Could not find resource 'Exec\[subscribe target\]' in parameter 'subscribe'/)
250250
end
251251
else
252252
it 'should succeed' do

0 commit comments

Comments
 (0)