From 96d18435a4a7e923ef75f9e963871419704b25f9 Mon Sep 17 00:00:00 2001 From: Adam Leff Date: Mon, 27 Mar 2017 17:17:07 -0400 Subject: [PATCH] Update CLI output, adjust tests The CLI output for the vendoring of profiles has been updated slightly to be more clear, and the functional tests have been modified to match as well. Signed-off-by: Adam Leff --- lib/inspec/base_cli.rb | 2 +- test/functional/inspec_vendor_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/inspec/base_cli.rb b/lib/inspec/base_cli.rb index 6f5f3c085..f4589d2ad 100644 --- a/lib/inspec/base_cli.rb +++ b/lib/inspec/base_cli.rb @@ -157,7 +157,7 @@ module Inspec end profile_vendor.vendor! - puts "Profile dependencies successfully vendored to #{profile_vendor.cache_path}" + puts "Dependencies for profile #{profile_path} successfully vendored to #{profile_vendor.cache_path}" rescue StandardError => e pretty_handle_exception(e) end diff --git a/test/functional/inspec_vendor_test.rb b/test/functional/inspec_vendor_test.rb index 12c8dbc2f..a330bfb38 100644 --- a/test/functional/inspec_vendor_test.rb +++ b/test/functional/inspec_vendor_test.rb @@ -9,7 +9,7 @@ describe 'example inheritance profile' do it 'can vendor profile dependencies' do out = inspec('vendor ' + inheritance_path + ' --overwrite') - out.stdout.force_encoding(Encoding::UTF_8).must_include "Vendor dependencies of #{inheritance_path} into #{inheritance_path}/vendor" + out.stdout.force_encoding(Encoding::UTF_8).must_include "Dependencies for profile #{inheritance_path} successfully vendored to #{inheritance_path}/vendor" out.stderr.must_equal '' out.exit_status.must_equal 0 @@ -29,7 +29,7 @@ describe 'example inheritance profile' do # vendor all dependencies out = inspec('vendor --overwrite', "cd #{inheritance_path} &&") - out.stdout.force_encoding(Encoding::UTF_8).must_include "Vendor dependencies of #{inheritance_path} into #{inheritance_path}/vendor" + out.stdout.force_encoding(Encoding::UTF_8).must_include "Dependencies for profile #{inheritance_path} successfully vendored to #{inheritance_path}/vendor" out.stderr.must_equal '' out.exit_status.must_equal 0 @@ -110,7 +110,7 @@ describe 'example inheritance profile' do it 'can vendor profile dependencies from the profile path' do out = inspec('vendor --overwrite', "cd #{inheritance_path} &&") - out.stdout.force_encoding(Encoding::UTF_8).must_include "Vendor dependencies of #{inheritance_path} into #{inheritance_path}/vendor" + out.stdout.force_encoding(Encoding::UTF_8).must_include "Dependencies for profile #{inheritance_path} successfully vendored to #{inheritance_path}/vendor" out.stderr.must_equal '' out.exit_status.must_equal 0