Update code to remove ruby 2.4 support

Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io>
This commit is contained in:
Vasu1105 2021-08-31 15:37:54 +05:30
parent 489318042c
commit 06bb90244d
2 changed files with 2 additions and 3 deletions

View file

@ -10,7 +10,7 @@ FIXTURE_BASE=test/fixtures/config_dirs
FIXTURE_VERSIONS="1 2" FIXTURE_VERSIONS="1 2"
# The format here is "<actual_version>,<abi_version> <another_version><<another_abi_version>"" # The format here is "<actual_version>,<abi_version> <another_version><<another_abi_version>""
RUBY_VERSIONS="2.4.5,2.4.0 2.5.3,2.5.0 2.6.2,2.6.0" RUBY_VERSIONS="2.5.3,2.5.0 2.6.2,2.6.0"
# Make two fresh gems # Make two fresh gems
cd $PLUGIN_SRC_DIR cd $PLUGIN_SRC_DIR

View file

@ -962,8 +962,7 @@ Test Summary: 2 successful, 0 failures, 0 skipped\n"
describe "when specifying the execution target" do describe "when specifying the execution target" do
let(:local_plat) do let(:local_plat) do
json = run_inspec_process("detect --format json", {}).stdout json = run_inspec_process("detect --format json", {}).stdout
# .slice is available in ruby 2.5+ JSON.parse(json).slice("name", "release")
JSON.parse(json).select { |k, v| %w{name release}.include? k }
end end
let(:run_result) { run_inspec_process("exec " + File.join(profile_path, "simple-metadata") + " " + cli_args, json: true) } let(:run_result) { run_inspec_process("exec " + File.join(profile_path, "simple-metadata") + " " + cli_args, json: true) }
let(:seen_platform) { run_result; @json["platform"].select { |k, v| %w{name release target_id}.include? k } } let(:seen_platform) { run_result; @json["platform"].select { |k, v| %w{name release target_id}.include? k } }