Skip to content

Commit 1e65c3b

Browse files
Merge pull request #412 from puppetlabs/bug-remove_manfiest_dir
(bug) - remove obselete manfiest dir config setting & require rspec-puppet 4.x
2 parents 9e988c8 + 4e88604 commit 1e65c3b

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

lib/puppetlabs_spec_helper/module_spec_helper.rb

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ def verify_contents(subject, title, expected_lines)
6767

6868
c.environmentpath = spec_path
6969
c.module_path = module_path
70-
c.manifest_dir = File.join(fixture_path, 'manifests')
7170

7271
# https://github.com/puppetlabs/rspec-puppet#strict_variables
7372
c.strict_variables = ENV['STRICT_VARIABLES'] != 'no'

puppetlabs_spec_helper.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
3333
spec.add_runtime_dependency 'puppet-lint', '~> 4.0'
3434
spec.add_runtime_dependency 'puppet-syntax', '~> 3.0'
3535
spec.add_runtime_dependency 'rspec-github', '~> 2.0'
36-
spec.add_runtime_dependency 'rspec-puppet', '>= 2.0'
36+
spec.add_runtime_dependency 'rspec-puppet', '~> 4.0'
3737

3838
spec.requirements << 'puppet, >= 7.0.0'
3939
end

0 commit comments

Comments
 (0)