summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spec/unit/knife/cookbook_upload_spec.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/unit/knife/cookbook_upload_spec.rb b/spec/unit/knife/cookbook_upload_spec.rb
index 4659e60371..614cb2122b 100644
--- a/spec/unit/knife/cookbook_upload_spec.rb
+++ b/spec/unit/knife/cookbook_upload_spec.rb
@@ -42,7 +42,8 @@ describe Chef::Knife::CookbookUpload do
describe 'run' do
before(:each) do
- @knife.stub!(:upload).and_return(true)
+ @cookbook_uploader = stub(:upload_cookbooks => nil)
+ Chef::CookbookUploader.stub(:new => @cookbook_uploader)
Chef::CookbookVersion.stub(:list_all_versions).and_return({})
end
@@ -164,7 +165,8 @@ describe Chef::Knife::CookbookUpload do
describe 'when a frozen cookbook exists on the server' do
it 'should fail to replace it' do
- @knife.stub!(:upload).and_raise(Chef::Exceptions::CookbookFrozen)
+ @cookbook_uploader.should_receive(:upload_cookbooks).
+ and_raise(Net::HTTPServerException.new('message', stub(:code => "409")))
@knife.ui.should_receive(:error).with(/Failed to upload 1 cookbook/)
lambda { @knife.run }.should raise_error(SystemExit)
end
@@ -180,4 +182,4 @@ describe Chef::Knife::CookbookUpload do
end
end
end # run
-end # Chef::Knife::CookbookUpload
+end