From 530b8c3ff952f6117dfceb76598004388cfd14d4 Mon Sep 17 00:00:00 2001 From: jordanbreen28 Date: Mon, 9 Oct 2023 12:33:13 +0100 Subject: [PATCH 1/2] (bug) - Remove reference to obselete manifest_dir This commit removes references to the obselete manifest_dir puppet configuration setting which was removed in puppet 4.x and above. This started to happen as the latest release of rspec-puppet removed this setting. --- lib/puppetlabs_spec_helper/module_spec_helper.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/puppetlabs_spec_helper/module_spec_helper.rb b/lib/puppetlabs_spec_helper/module_spec_helper.rb index b86e64e9..e691d50f 100644 --- a/lib/puppetlabs_spec_helper/module_spec_helper.rb +++ b/lib/puppetlabs_spec_helper/module_spec_helper.rb @@ -67,7 +67,6 @@ def verify_contents(subject, title, expected_lines) c.environmentpath = spec_path c.module_path = module_path - c.manifest_dir = File.join(fixture_path, 'manifests') # https://github.com/puppetlabs/rspec-puppet#strict_variables c.strict_variables = ENV['STRICT_VARIABLES'] != 'no' From 4e886048c62a27c11e1d1830382434d67bb9e201 Mon Sep 17 00:00:00 2001 From: jordanbreen28 Date: Mon, 9 Oct 2023 12:37:05 +0100 Subject: [PATCH 2/2] (maint) - Add stricter rspec dependency --- puppetlabs_spec_helper.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppetlabs_spec_helper.gemspec b/puppetlabs_spec_helper.gemspec index 6fc8bc76..16085998 100644 --- a/puppetlabs_spec_helper.gemspec +++ b/puppetlabs_spec_helper.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'puppet-lint', '~> 4.0' spec.add_runtime_dependency 'puppet-syntax', '~> 3.0' spec.add_runtime_dependency 'rspec-github', '~> 2.0' - spec.add_runtime_dependency 'rspec-puppet', '>= 2.0' + spec.add_runtime_dependency 'rspec-puppet', '~> 4.0' spec.requirements << 'puppet, >= 7.0.0' end