From 1d9b5b40b3c621af7328b3915dcea189cf1bb475 Mon Sep 17 00:00:00 2001 From: david22swan Date: Thu, 24 Oct 2024 10:53:28 +0100 Subject: [PATCH] (CAT-2121) Update tests to account for validate changes --- spec/acceptance/report_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/acceptance/report_spec.rb b/spec/acceptance/report_spec.rb index ec1a865b9..3fb1c0592 100644 --- a/spec/acceptance/report_spec.rb +++ b/spec/acceptance/report_spec.rb @@ -9,7 +9,7 @@ before(:all) do File.open(init_pp, 'w') do |f| f.puts <<~EOS - class report {} + class report EOS end end @@ -25,8 +25,8 @@ class report {} describe file('report.txt') do it { is_expected.to exist } - # pdk (WARNING): puppet-lint: class not documented (manifests/init.pp:1:1) - its(:content) { is_expected.to match(/\(warning\):.*class not documented.*\(#{Regexp.escape(init_pp)}.*\)/i) } + # pdk (ERROR): puppet-syntax: Could not parse for environment production: Syntax error at end of input (manifests/init.pp) + its(:content) { is_expected.to match(/\(ERROR\):.*Could not parse for environment production.*\(#{Regexp.escape(init_pp)}.*\)/i) } end end @@ -35,7 +35,7 @@ class report {} its(:exit_status) { is_expected.to eq(0) } its(:stderr) { is_expected.to match(/Checking Puppet manifest syntax/i) } its(:stderr) { is_expected.to match(/Checking Puppet manifest style/i) } - its(:stdout) { is_expected.to match(/\(warning\):.*class not documented.*\(#{Regexp.escape(init_pp)}.*\)/i) } + its(:stdout) { is_expected.to match(//\(ERROR\):.*Could not parse for environment production.*\(#{Regexp.escape(init_pp)}.*\)/i) } describe file('stdout') do it { is_expected.not_to exist } @@ -52,7 +52,7 @@ class report {} its(:stderr) do # Due to spinners writing at arbitrary cursor locations, we can't depend on the text # being at a the beginning of a line. - is_expected.to match(/\(warning\):.*class not documented.*\(#{Regexp.escape(init_pp)}.*\)/i) + is_expected.to match(//\(ERROR\):.*Could not parse for environment production.*\(#{Regexp.escape(init_pp)}.*\)/i) end describe file('stderr') do @@ -66,7 +66,7 @@ class report {} its(:exit_status) { is_expected.to eq(0) } its(:stderr) { is_expected.to match(/using ruby \d+\.\d+\.\d+/i) } its(:stderr) { is_expected.to match(/using puppet \d+\.\d+\.\d+/i) } - its(:stdout) { is_expected.to match(/\(warning\):.*class not documented.*\(#{Regexp.escape(init_pp)}.*\)/i) } + its(:stdout) { is_expected.to match(//\(ERROR\):.*Could not parse for environment production.*\(#{Regexp.escape(init_pp)}.*\)/i) } end end end