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 <adam@leff.co>
This commit is contained in:
Adam Leff 2017-03-27 17:17:07 -04:00 committed by Dominik Richter
parent e1c664272e
commit 96d18435a4
2 changed files with 4 additions and 4 deletions

View file

@ -157,7 +157,7 @@ module Inspec
end end
profile_vendor.vendor! 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 rescue StandardError => e
pretty_handle_exception(e) pretty_handle_exception(e)
end end

View file

@ -9,7 +9,7 @@ describe 'example inheritance profile' do
it 'can vendor profile dependencies' do it 'can vendor profile dependencies' do
out = inspec('vendor ' + inheritance_path + ' --overwrite') 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.stderr.must_equal ''
out.exit_status.must_equal 0 out.exit_status.must_equal 0
@ -29,7 +29,7 @@ describe 'example inheritance profile' do
# vendor all dependencies # vendor all dependencies
out = inspec('vendor --overwrite', "cd #{inheritance_path} &&") 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.stderr.must_equal ''
out.exit_status.must_equal 0 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 it 'can vendor profile dependencies from the profile path' do
out = inspec('vendor --overwrite', "cd #{inheritance_path} &&") 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.stderr.must_equal ''
out.exit_status.must_equal 0 out.exit_status.must_equal 0