diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-16 15:23:58 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-16 15:23:58 -0800 |
commit | d4a4f181c32310043e9279cdf11d37013e89e9ca (patch) | |
tree | e859bf99e3f2b94f164e3d965c1d99f7eb046c7c /spec | |
parent | 5959add42e911e14918c41d0212f6ba8e0425d11 (diff) | |
download | chef-d4a4f181c32310043e9279cdf11d37013e89e9ca.tar.gz |
don't warn about shadow cookbooks twice
knife cookbook upload already warns once
Diffstat (limited to 'spec')
-rw-r--r-- | spec/unit/knife/cookbook_upload_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/unit/knife/cookbook_upload_spec.rb b/spec/unit/knife/cookbook_upload_spec.rb index 277da14011..9e07497c57 100644 --- a/spec/unit/knife/cookbook_upload_spec.rb +++ b/spec/unit/knife/cookbook_upload_spec.rb @@ -32,7 +32,7 @@ describe Chef::Knife::CookbookUpload do let(:cookbook_loader) do cookbook_loader = cookbooks_by_name.dup allow(cookbook_loader).to receive(:merged_cookbooks).and_return([]) - allow(cookbook_loader).to receive(:load_cookbooks).and_return(cookbook_loader) + allow(cookbook_loader).to receive(:load_cookbooks_without_shadow_warning).and_return(cookbook_loader) cookbook_loader end @@ -145,6 +145,7 @@ E it "should not read all cookbooks" do expect(cookbook_loader).not_to receive(:load_cookbooks) + expect(cookbook_loader).not_to receive(:load_cookbooks_without_shadow_warning) knife.run end @@ -208,6 +209,7 @@ E it "should exit and not upload the cookbook" do expect(cookbook_loader).to receive(:[]).once.with("test_cookbook") expect(cookbook_loader).not_to receive(:load_cookbooks) + expect(cookbook_loader).not_to receive(:load_cookbooks_without_shadow_warning) expect(cookbook_uploader).not_to receive(:upload_cookbooks) expect { knife.run }.to raise_error(SystemExit) end |