Skip to content

Commit

Permalink
Merge pull request #412 from puppetlabs/bug-remove_manfiest_dir
Browse files Browse the repository at this point in the history
(bug) - remove obselete manfiest dir config setting & require rspec-puppet 4.x
  • Loading branch information
gavindidrichsen committed Oct 9, 2023
2 parents 9e988c8 + 4e88604 commit 1e65c3b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion lib/puppetlabs_spec_helper/module_spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion puppetlabs_spec_helper.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 1e65c3b

Please sign in to comment.