Skip to content

Commit

Permalink
Merge pull request #1292 from puppetlabs/CAT-1601
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanbreen28 authored Nov 22, 2023
2 parents 012c324 + b925020 commit 4ae0d2c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package-testing/spec/package/airgapped_usage_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
end

context 'when validating the module' do
context 'with puppet 7.x' do
puppet_version = '7.x'
context 'with puppet 8.x' do
puppet_version = '8.x'
let(:ruby_version) { ruby_for_puppet(puppet_version) }

describe command("pdk validate --puppet-version=#{puppet_version}") do
Expand Down
1 change: 1 addition & 0 deletions package-testing/spec/package/support/spec_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def ruby_for_puppet(pupver)
when /^5\./ then '2.4.*'
when /^6\./ then '2.5.*'
when /^7\./ then '2.7.*'
when /^8\./ then '3.2.*'
end

return unless ruby_pattern
Expand Down
4 changes: 2 additions & 2 deletions package-testing/spec/package/validate_a_new_module_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
end

context 'when validating the module' do
context 'with puppet 7.x' do
puppet_version = '7.x'
context 'with puppet 8.x' do
puppet_version = '8.x'
let(:ruby_version) { ruby_for_puppet(puppet_version) }

describe command("pdk validate --puppet-version=#{puppet_version}") do
Expand Down

0 comments on commit 4ae0d2c

Please sign in to comment.