chef 11.18.12 → 12.0.0.alpha.0

data/spec/unit/json_compat_spec.rb

@@ -21,90 +21,49 @@ require 'chef/json_compat'
 
 describe Chef::JSONCompat do
 
-  describe "#from_json with JSON containing an existing class" do
-    let(:json) { '{"json_class": "Chef::Role"}' }
-
+  describe "with JSON containing an existing class" do
+    let(:json){'{"json_class": "Chef::Role"}'}
     it "returns an instance of the class instead of a Hash" do
-      expect(Chef::JSONCompat.from_json(json).class).to eq Chef::Role
-    end
-  end
-
-  describe "#from_json with JSON containing comments" do
-    let(:json) { %Q{{\n/* comment */\n// comment 2\n"json_class": "Chef::Role"}} }
-
-    it "returns an instance of the class instead of a Hash" do
-      expect(Chef::JSONCompat.from_json(json).class).to eq Chef::Role
-    end
-  end
-
-  describe "#parse with JSON containing comments" do
-    let(:json) { %Q{{\n/* comment */\n// comment 2\n"json_class": "Chef::Role"}} }
-
-    it "returns a Hash" do
-      expect(Chef::JSONCompat.parse(json).class).to eq Hash
+      Chef::JSONCompat.from_json(json).class.should eq Chef::Role
     end
   end
 
   describe 'with JSON containing "Chef::Sandbox" as a json_class value' do
     require 'chef/sandbox' # Only needed for this test
-
-    let(:json) { '{"json_class": "Chef::Sandbox", "arbitrary": "data"}' }
-
+    let(:json){'{"json_class": "Chef::Sandbox", "arbitrary": "data"}'}
     it "returns a Hash, because Chef::Sandbox is a dummy class" do
-      expect(Chef::JSONCompat.from_json(json)).to eq({"json_class" => "Chef::Sandbox", "arbitrary" => "data"})
-    end
-  end
-
-  describe "when pretty printing an object that defines #to_json" do
-    class Foo
-      def to_json(*a)
-        Chef::JSONCompat.to_json({'bar' => {'baz' => 5678}}, *a)
-      end
-    end
-
-    it "should work" do
-      f = Foo.new
-      expect(Chef::JSONCompat.to_json_pretty(f)).to eql("{\n  \"bar\": {\n    \"baz\": 5678\n  }\n}\n")
-    end
-
-    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
-      let(:subject) { Foo.new }
+      Chef::JSONCompat.from_json(json).should eq({"json_class" => "Chef::Sandbox", "arbitrary" => "data"})
     end
   end
 
   describe "with a file with 300 or less nested entries" do
-    let(:json) { IO.read(File.join(CHEF_SPEC_DATA, 'big_json.json')) }
-    let(:hash) { Chef::JSONCompat.from_json(json) }
+    before(:all) do
+      @json = IO.read(File.join(CHEF_SPEC_DATA, 'big_json.json'))
+      @hash = Chef::JSONCompat.from_json(@json)
+    end
 
     describe "when a big json file is loaded" do
       it "should create a Hash from the file" do
-        expect(hash).to be_kind_of(Hash)
+        @hash.should be_kind_of(Hash)
       end
-
       it "should has 'test' as a 300th nested value" do
-        expect(hash['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']).to eq('test')
+        @hash['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key'].should == 'test'
       end
     end
   end
-
   describe "with a file with more than 300 nested entries" do
-    let(:json) { IO.read(File.join(CHEF_SPEC_DATA, 'big_json_plus_one.json')) }
-    let(:hash) { Chef::JSONCompat.from_json(json, {:max_nesting => 301}) }
+    before(:all) do
+      @json = IO.read(File.join(CHEF_SPEC_DATA, 'big_json_plus_one.json'))
+      @hash = Chef::JSONCompat.from_json(@json, {:max_nesting => 301})
+    end
 
     describe "when a big json file is loaded" do
       it "should create a Hash from the file" do
-        expect(hash).to be_kind_of(Hash)
+        @hash.should be_kind_of(Hash)
       end
-
       it "should has 'test' as a 301st nested value" do
-        expect(hash['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']).to eq('test')
+        @hash['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key'].should == 'test'
       end
     end
   end
-
-  it "should define .to_json on all classes" do
-    class SomeClass; end
-
-    expect(SomeClass.new.respond_to?(:to_json)).to eq(true)
-  end
 end

data/spec/unit/knife/client_create_spec.rb

@@ -35,15 +35,15 @@ describe Chef::Knife::ClientCreate do
     @knife.stub(:edit_data).and_return(@client)
     @knife.stub(:puts)
     Chef::ApiClient.stub(:new).and_return(@client)
-    @stdout = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    @knife.ui.stub(:stderr).and_return(@stderr)
   end
 
   describe "run" do
     it "should create a new Client" do
       Chef::ApiClient.should_receive(:new).and_return(@client)
       @knife.run
-      @stdout.string.should match /created client.+adam/i
+      @stderr.string.should match /created client.+adam/i
     end
 
     it "should set the Client name" do

data/spec/unit/knife/configure_client_spec.rb

@@ -25,8 +25,8 @@ describe Chef::Knife::ConfigureClient do
     Chef::Config[:validation_client_name] = 'chef-validator'
     Chef::Config[:validation_key] = '/etc/chef/validation.pem'
 
-    @stdout = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    @knife.ui.stub(:stderr).and_return(@stderr)
   end
 
   describe 'run' do
@@ -73,11 +73,12 @@ describe Chef::Knife::ConfigureClient do
       it 'should print information on what is being configured' do
         FileUtils.stub(:mkdir_p)
         @knife.run
-        @stdout.string.should match /creating client configuration/i
-        @stdout.string.should match /writing client\.rb/i
-        @stdout.string.should match /writing validation\.pem/i
+        @stderr.string.should match /creating client configuration/i
+        @stderr.string.should match /writing client\.rb/i
+        @stderr.string.should match /writing validation\.pem/i
       end
     end
   end
 
 end
+

data/spec/unit/knife/cookbook_delete_spec.rb

@@ -204,7 +204,7 @@ describe Chef::Knife::CookbookDelete do
     it 'should output that the cookbook was deleted' do
       @knife.stub(:delete_request)
       @knife.delete_version_without_confirmation('1.0.0')
-      @stdout.string.should match /deleted cookbook\[foobar\]\[1.0.0\]/im
+      @stderr.string.should match /deleted cookbook\[foobar\]\[1.0.0\]/im
     end
 
     describe 'with --print-after' do

data/spec/unit/knife/cookbook_download_spec.rb

@@ -21,8 +21,8 @@ require 'spec_helper'
 describe Chef::Knife::CookbookDownload do
   before(:each) do
     @knife = Chef::Knife::CookbookDownload.new
-    @stdout = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    @knife.ui.stub(:stderr).and_return(@stderr)
   end
 
   describe 'run' do
@@ -121,10 +121,10 @@ describe Chef::Knife::CookbookDownload do
             File.should_receive(:exists?).with('/var/tmp/chef/foobar-1.0.0').and_return(false)
             @knife.run
             ['attributes', 'recipes', 'templates'].each do |segment|
-              @stdout.string.should match /downloading #{segment}/im
+              @stderr.string.should match /downloading #{segment}/im
             end
-            @stdout.string.should match /downloading foobar cookbook version 1\.0\.0/im
-            @stdout.string.should match /cookbook downloaded to \/var\/tmp\/chef\/foobar-1\.0\.0/im
+            @stderr.string.should match /downloading foobar cookbook version 1\.0\.0/im
+            @stderr.string.should match /cookbook downloaded to \/var\/tmp\/chef\/foobar-1\.0\.0/im
           end
 
           describe 'with -f or --force' do

data/spec/unit/knife/cookbook_metadata_from_file_spec.rb

@@ -27,6 +27,7 @@ describe Chef::Knife::CookbookMetadataFromFile do
     @tgt = File.expand_path(File.join(CHEF_SPEC_DATA, "metadata", "quick_start", "metadata.json"))
     @knife = Chef::Knife::CookbookMetadataFromFile.new
     @knife.name_args = [ @src ]
+    @knife.stub(:to_json_pretty).and_return(true)
     @md = Chef::Cookbook::Metadata.new
     Chef::Cookbook::Metadata.stub(:new).and_return(@md)
     $stdout.stub(:write)

data/spec/unit/knife/cookbook_metadata_spec.rb

@@ -119,7 +119,7 @@ describe Chef::Knife::CookbookMetadata do
       Chef::JSONCompat.should_receive(:to_json_pretty).with(@metadata_mock).
                                                        and_return(@json_data)
       @knife.generate_metadata_from_file('foobar', "#{@cookbook_dir}/foobar/metadata.rb")
-      @stdout.string.should match /generating metadata for foobar from #{@cookbook_dir}\/foobar\/metadata\.rb/im
+      @stderr.string.should match /generating metadata for foobar from #{@cookbook_dir}\/foobar\/metadata\.rb/im
     end
 
     { Chef::Exceptions::ObsoleteDependencySyntax => 'obsolote dependency',

data/spec/unit/knife/cookbook_site_download_spec.rb

@@ -25,16 +25,15 @@ describe Chef::Knife::CookbookSiteDownload do
       @knife            = Chef::Knife::CookbookSiteDownload.new
       @knife.name_args  = ['apache2']
       @noauth_rest      = double('no auth rest')
-      @stdout           = StringIO.new
       @stderr           = StringIO.new
-      @cookbook_api_url = 'https://supermarket.getchef.com/api/v1/cookbooks'
+      @cookbook_api_url = 'http://cookbooks.opscode.com/api/v1/cookbooks'
       @version          = '1.0.2'
       @version_us       = @version.gsub '.', '_'
       @current_data     = { 'deprecated'       => false,
                             'latest_version'   => "#{@cookbook_api_url}/apache2/versions/#{@version_us}",
                             'replacement' => 'other_apache2' }
 
-      @knife.ui.stub(:stdout).and_return(@stdout)
+      @knife.ui.stub(:stderr).and_return(@stderr)
       @knife.stub(:noauth_rest).and_return(@noauth_rest)
       @noauth_rest.should_receive(:get_rest).
                    with("#{@cookbook_api_url}/apache2").
@@ -86,8 +85,8 @@ describe Chef::Knife::CookbookSiteDownload do
                       with(/.+deprecated.+replaced by other_apache2.+/i)
             FileUtils.should_receive(:cp).with(@temp_file.path, @file)
             @knife.run
-            @stdout.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-            @stdout.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
+            @stderr.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
+            @stderr.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
           end
 
         end
@@ -95,8 +94,8 @@ describe Chef::Knife::CookbookSiteDownload do
         it 'should download the latest version' do
           FileUtils.should_receive(:cp).with(@temp_file.path, @file)
           @knife.run
-          @stdout.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-          @stdout.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
+          @stderr.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
+          @stderr.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
         end
 
         context 'with -f or --file' do
@@ -108,8 +107,8 @@ describe Chef::Knife::CookbookSiteDownload do
 
           it 'should download the cookbook to the desired file' do
             @knife.run
-            @stdout.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-            @stdout.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
+            @stderr.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
+            @stderr.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
           end
         end
 
@@ -140,8 +139,8 @@ describe Chef::Knife::CookbookSiteDownload do
                        and_return(@temp_file)
           FileUtils.should_receive(:cp).with(@temp_file.path, @file)
           @knife.run
-          @stdout.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-          @stdout.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
+          @stderr.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
+          @stderr.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
         end
       end
 

data/spec/unit/knife/cookbook_site_install_spec.rb

@@ -19,177 +19,132 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 
 describe Chef::Knife::CookbookSiteInstall do
-  let(:knife) { Chef::Knife::CookbookSiteInstall.new }
-  let(:stdout) { StringIO.new }
-  let(:stderr) { StringIO.new }
-  let(:downloader) { Hash.new }
-  let(:repo) { double(:sanity_check => true, :reset_to_default_state => true,
-                      :prepare_to_import => true, :finalize_updates_to => true,
-                      :merge_updates_from => true) }
-  let(:install_path) { if Chef::Platform.windows?
-                        'C:/tmp/chef'
-                      else
-                        '/var/tmp/chef'
-                      end }
-
   before(:each) do
     require 'chef/knife/core/cookbook_scm_repo'
-
-    allow(knife.ui).to receive(:stdout).and_return(stdout)
-    knife.config = {}
-    knife.config[:cookbook_path] = [ install_path ]
-
-    allow(knife).to receive(:stderr).and_return(stderr)
-    allow(knife).to receive(:stdout).and_return(stdout)
-
-    # Assume all external commands would have succeed. :(
-    allow(File).to receive(:unlink)
-    allow(File).to receive(:rmtree)
-    allow(knife).to receive(:shell_out!).and_return(true)
-
-    # CookbookSiteDownload Stup
-    allow(knife).to receive(:download_cookbook_to).and_return(downloader)
-    allow(downloader).to receive(:version) do
-      if knife.name_args.size == 2
-        knife.name_args[1]
+    @stdout = StringIO.new
+    @knife = Chef::Knife::CookbookSiteInstall.new
+    @knife.ui.stub(:stdout).and_return(@stdout)
+    @knife.config = {}
+    if Chef::Platform.windows?
+      @install_path = 'C:/tmp/chef'
+    else
+      @install_path = '/var/tmp/chef'
+    end
+    @knife.config[:cookbook_path] = [ @install_path ]
+
+    @stdout = StringIO.new
+    @stderr = StringIO.new
+    @knife.stub(:stderr).and_return(@stdout)
+    @knife.stub(:stdout).and_return(@stdout)
+
+    #Assume all external commands would have succeed. :(
+    File.stub(:unlink)
+    File.stub(:rmtree)
+    @knife.stub(:shell_out!).and_return(true)
+
+    #CookbookSiteDownload Stup
+    @downloader = {}
+    @knife.stub(:download_cookbook_to).and_return(@downloader)
+    @downloader.stub(:version).and_return do
+      if @knife.name_args.size == 2
+        @knife.name_args[1]
       else
         "0.3.0"
       end
     end
 
-    # Stubs for CookbookSCMRepo
-    allow(Chef::Knife::CookbookSCMRepo).to receive(:new).and_return(repo)
+    #Stubs for CookbookSCMRepo
+    @repo = double(:sanity_check => true, :reset_to_default_state => true,
+                 :prepare_to_import => true, :finalize_updates_to => true,
+                 :merge_updates_from => true)
+    Chef::Knife::CookbookSCMRepo.stub(:new).and_return(@repo)
   end
 
-  describe "run" do
-    it "raises an error if a cookbook name is not provided" do
-      knife.name_args = []
-      expect(knife.ui).to receive(:error).with("Please specify a cookbook to download and install.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "raises an error if more than two arguments are given" do
-      knife.name_args = ["foo", "bar", "baz"]
-      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "raises an error if the second argument is not a version" do
-      knife.name_args = ["getting-started", "1pass"]
-      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "raises an error if the second argument is a four-digit version" do
-      knife.name_args = ["getting-started", "0.0.0.1"]
-      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "raises an error if the second argument is a one-digit version" do
-      knife.name_args = ["getting-started", "1"]
-      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "installs the specified version if second argument is a three-digit version" do
-      knife.name_args = ["getting-started", "0.1.0"]
-      knife.config[:no_deps] = true
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
-      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.1.0")
-      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
-      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.1.0")
-      knife.run
-    end
-
-    it "installs the specified version if second argument is a two-digit version" do
-      knife.name_args = ["getting-started", "0.1"]
-      knife.config[:no_deps] = true
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
-      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.1")
-      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
-      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.1")
-      knife.run
-    end
-
-    it "installs the latest version if only a cookbook name is given" do
-      knife.name_args = ["getting-started"]
-      knife.config[:no_deps] = true
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
-      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.3.0")
-      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
-      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.3.0")
-      knife.run
-    end
-
-    it "does not create/reset git branches if use_current_branch is set" do
-      knife.name_args = ["getting-started"]
-      knife.config[:use_current_branch] = true
-      knife.config[:no_deps] = true
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(repo).not_to receive(:prepare_to_import)
-      expect(repo).not_to receive(:reset_to_default_state)
-      knife.run
-    end
-
-    it "does not raise an error if cookbook_path is a string" do
-      knife.config[:cookbook_path] = install_path
-      knife.config[:no_deps] = true
-      knife.name_args = ["getting-started"]
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
-      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.3.0")
-      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
-      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.3.0")
-      expect { knife.run }.not_to raise_error
-    end
-  end # end of run
-
-  let(:metadata) { Chef::Cookbook::Metadata.new }
-  let(:rb_metadata_path) { File.join(install_path, "post-punk-kitchen", "metadata.rb") }
-  let(:json_metadata_path) { File.join(install_path, "post-punk-kitchen", "metadata.json") }
-
-  describe "preferred_metadata" do
-    before do
-      allow(Chef::Cookbook::Metadata).to receive(:new).and_return(metadata)
-      allow(File).to receive(:exist?).and_return(false)
-      knife.instance_variable_set(:@cookbook_name, "post-punk-kitchen")
-      knife.instance_variable_set(:@install_path, install_path)
-    end
 
-    it "returns a populated Metadata object if metadata.rb exists" do
-      allow(File).to receive(:exist?).with(rb_metadata_path).and_return(true)
-      expect(metadata).to receive(:from_file).with(rb_metadata_path)
-      knife.preferred_metadata
-    end
-
-    it "returns a populated Metadata object if metadata.json exists" do
-      allow(File).to receive(:exist?).with(json_metadata_path).and_return(true)
-      #expect(IO).to receive(:read).with(json_metadata_path)
-      allow(IO).to receive(:read)
-      expect(metadata).to receive(:from_json)
-      knife.preferred_metadata
-    end
-
-    it "prefers metadata.rb over metadata.json" do
-      allow(File).to receive(:exist?).with(rb_metadata_path).and_return(true)
-      allow(File).to receive(:exist?).with(json_metadata_path).and_return(true)
-      allow(IO).to receive(:read)
-      expect(metadata).to receive(:from_file).with(rb_metadata_path)
-      expect(metadata).not_to receive(:from_json)
-      knife.preferred_metadata
-    end
-
-    it "rasies an error if it finds no metadata file" do
-      expect { knife.preferred_metadata }.to raise_error { |error|
-        expect(error).to be_a(Chef::Exceptions::MetadataNotFound)
-        expect(error.cookbook_name).to eq("post-punk-kitchen")
-        expect(error.install_path).to eq(install_path)
-      }
+  describe "run" do
+    it "should return an error if a cookbook name is not provided" do
+      @knife.name_args = []
+      @knife.ui.should_receive(:error).with("Please specify a cookbook to download and install.")
+      lambda { @knife.run }.should raise_error(SystemExit)
+    end
+
+    it "should return an error if more than two arguments are given" do
+      @knife.name_args = ["foo", "bar", "baz"]
+      @knife.ui.should_receive(:error).with("Installing multiple cookbooks at once is not supported.")
+      lambda { @knife.run }.should raise_error(SystemExit)
+    end
+
+    it "should return an error if the second argument is not a version" do
+      @knife.name_args = ["getting-started", "1pass"]
+      @knife.ui.should_receive(:error).with("Installing multiple cookbooks at once is not supported.")
+      lambda { @knife.run }.should raise_error(SystemExit)
+    end
+
+    it "should return an error if the second argument is a four-digit version" do
+      @knife.name_args = ["getting-started", "0.0.0.1"]
+      @knife.ui.should_receive(:error).with("Installing multiple cookbooks at once is not supported.")
+      lambda { @knife.run }.should raise_error(SystemExit)
+    end
+
+    it "should return an error if the second argument is a one-digit version" do
+      @knife.name_args = ["getting-started", "1"]
+      @knife.ui.should_receive(:error).with("Installing multiple cookbooks at once is not supported.")
+      lambda { @knife.run }.should raise_error(SystemExit)
+    end
+
+    it "should install the specified version if second argument is a three-digit version" do
+      @knife.name_args = ["getting-started", "0.1.0"]
+      @knife.config[:no_deps] = true
+      upstream_file = File.join(@install_path, "getting-started.tar.gz")
+      @knife.should_receive(:download_cookbook_to).with(upstream_file)
+      @knife.should_receive(:extract_cookbook).with(upstream_file, "0.1.0")
+      @knife.should_receive(:clear_existing_files).with(File.join(@install_path, "getting-started"))
+      @repo.should_receive(:merge_updates_from).with("getting-started", "0.1.0")
+      @knife.run
+    end
+
+    it "should install the specified version if second argument is a two-digit version" do
+      @knife.name_args = ["getting-started", "0.1"]
+      @knife.config[:no_deps] = true
+      upstream_file = File.join(@install_path, "getting-started.tar.gz")
+      @knife.should_receive(:download_cookbook_to).with(upstream_file)
+      @knife.should_receive(:extract_cookbook).with(upstream_file, "0.1")
+      @knife.should_receive(:clear_existing_files).with(File.join(@install_path, "getting-started"))
+      @repo.should_receive(:merge_updates_from).with("getting-started", "0.1")
+      @knife.run
+    end
+
+    it "should install the latest version if only a cookbook name is given" do
+      @knife.name_args = ["getting-started"]
+      @knife.config[:no_deps] = true
+      upstream_file = File.join(@install_path, "getting-started.tar.gz")
+      @knife.should_receive(:download_cookbook_to).with(upstream_file)
+      @knife.should_receive(:extract_cookbook).with(upstream_file, "0.3.0")
+      @knife.should_receive(:clear_existing_files).with(File.join(@install_path, "getting-started"))
+      @repo.should_receive(:merge_updates_from).with("getting-started", "0.3.0")
+      @knife.run
+    end
+
+    it "should not create/reset git branches if use_current_branch is set" do
+      @knife.name_args = ["getting-started"]
+      @knife.config[:use_current_branch] = true
+      @knife.config[:no_deps] = true
+      upstream_file = File.join(@install_path, "getting-started.tar.gz")
+      @repo.should_not_receive(:prepare_to_import)
+      @repo.should_not_receive(:reset_to_default_state)
+      @knife.run
+    end
+
+    it "should not raise an error if cookbook_path is a string" do
+      @knife.config[:cookbook_path] = @install_path
+      @knife.config[:no_deps] = true
+      @knife.name_args = ["getting-started"]
+      upstream_file = File.join(@install_path, "getting-started.tar.gz")
+      @knife.should_receive(:download_cookbook_to).with(upstream_file)
+      @knife.should_receive(:extract_cookbook).with(upstream_file, "0.3.0")
+      @knife.should_receive(:clear_existing_files).with(File.join(@install_path, "getting-started"))
+      @repo.should_receive(:merge_updates_from).with("getting-started", "0.3.0")
+      lambda { @knife.run }.should_not raise_error
     end
-
   end
 end