From 8e9cc4fc617910daaed46817dc655540b41d7323 Mon Sep 17 00:00:00 2001 From: david22swan Date: Thu, 21 Nov 2024 14:34:14 +0000 Subject: [PATCH] (CAT-2148) Update package testing to account for test machine changes --- package-testing/spec/package/add_gem_to_module_spec.rb | 2 +- package-testing/spec/package/airgapped_usage_spec.rb | 2 +- package-testing/spec/package/unprivileged_user_spec.rb | 2 +- package-testing/spec/package/validate_a_new_module_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-testing/spec/package/add_gem_to_module_spec.rb b/package-testing/spec/package/add_gem_to_module_spec.rb index 23f6da7de..e3ae58e75 100644 --- a/package-testing/spec/package/add_gem_to_module_spec.rb +++ b/package-testing/spec/package/add_gem_to_module_spec.rb @@ -3,7 +3,7 @@ describe 'C100545 - Generate a module, add a gem to it, and validate it' do module_name = 'c100545_module' - describe command("pdk new module #{module_name} --skip-interview") do + describe command("pdk new module #{module_name} --skip-interview --skip-interview --template-url=https://github.com/puppetlabs/pdk-templates --template-ref=main") do its(:exit_status) { is_expected.to eq(0) } end diff --git a/package-testing/spec/package/airgapped_usage_spec.rb b/package-testing/spec/package/airgapped_usage_spec.rb index 5f181b202..013b90aa9 100644 --- a/package-testing/spec/package/airgapped_usage_spec.rb +++ b/package-testing/spec/package/airgapped_usage_spec.rb @@ -22,7 +22,7 @@ it { is_expected.to be_file } its(:content_as_json) do - is_expected.to include('template-url' => a_string_matching(/\Apdk-default#[\w.-]+\Z/)) + is_expected.to include('template-url' => a_string_matching(/pdk-templates#main/)) end end end diff --git a/package-testing/spec/package/unprivileged_user_spec.rb b/package-testing/spec/package/unprivileged_user_spec.rb index d036d2ef4..c1fc6079a 100644 --- a/package-testing/spec/package/unprivileged_user_spec.rb +++ b/package-testing/spec/package/unprivileged_user_spec.rb @@ -28,7 +28,7 @@ its(:stdout) { is_expected.to contain('testuser') } end - describe command("pdk new module #{module_name} --skip-interview") do + describe command("pdk new module #{module_name} --skip-interview --template-url=https://github.com/puppetlabs/pdk-templates --template-ref=main") do its(:exit_status) { is_expected.to eq(0) } end diff --git a/package-testing/spec/package/validate_a_new_module_spec.rb b/package-testing/spec/package/validate_a_new_module_spec.rb index 6d05f4238..49391c60d 100644 --- a/package-testing/spec/package/validate_a_new_module_spec.rb +++ b/package-testing/spec/package/validate_a_new_module_spec.rb @@ -12,7 +12,7 @@ it { is_expected.to be_file } its(:content_as_json) do - is_expected.to include('template-url' => a_string_matching(/\Apdk-default#[\w.-]+\Z/)) + is_expected.to include('template-url' => a_string_matching(/pdk-templates#main/)) end end end