chef 12.0.0.alpha.0-x86-mingw32 → 12.0.0.alpha.1-x86-mingw32

data/spec/unit/deprecation_spec.rb

@@ -46,7 +46,7 @@ describe Chef::Deprecation do
   end
 
   method_snapshot_file = File.join(CHEF_SPEC_DATA, "file-providers-method-snapshot-chef-11-4.json")
-  method_snapshot = JSON.parse(File.open(method_snapshot_file).read())
+  method_snapshot = Chef::JSONCompat.parse(File.open(method_snapshot_file).read())
 
   method_snapshot.each do |class_name, old_methods|
     class_object = class_from_string(class_name)
@@ -83,4 +83,3 @@ describe Chef::Deprecation do
   end
 
 end
-

data/spec/unit/encrypted_data_bag_item_spec.rb

@@ -23,7 +23,7 @@ module Version0Encryptor
   def self.encrypt_value(plaintext_data, key)
     data = plaintext_data.to_yaml
 
-    cipher = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
+    cipher = OpenSSL::Cipher.new("aes-256-cbc")
     cipher.encrypt
     cipher.pkcs5_keyivgen(key)
     encrypted_bytes = cipher.update(data)
@@ -39,14 +39,14 @@ describe Chef::EncryptedDataBagItem::Encryptor  do
   let(:key) { "passwd" }
 
   it "encrypts to format version 1 by default" do
-    encryptor.should be_a_kind_of(Chef::EncryptedDataBagItem::Encryptor::Version1Encryptor)
+    encryptor.should be_a_instance_of(Chef::EncryptedDataBagItem::Encryptor::Version1Encryptor)
   end
 
   describe "generating a random IV" do
     it "generates a new IV for each encryption pass" do
       encryptor2 = Chef::EncryptedDataBagItem::Encryptor.new(plaintext_data, key)
 
-      # No API in ruby OpenSSL to get the iv it used for the encryption back
+      # No API in ruby OpenSSL to get the iv is used for the encryption back
       # out. Instead we test if the encrypted data is the same. If it *is* the
       # same, we assume the IV was the same each time.
       encryptor.encrypted_data.should_not eq encryptor2.encrypted_data
@@ -56,7 +56,7 @@ describe Chef::EncryptedDataBagItem::Encryptor  do
   describe "when encrypting a non-hash non-array value" do
     let(:plaintext_data) { 5 }
     it "serializes the value in a de-serializable way" do
-      Chef::JSONCompat.from_json(subject.serialized_data)["json_wrapper"].should eq 5
+      Chef::JSONCompat.from_json(encryptor.serialized_data)["json_wrapper"].should eq 5
     end
 
   end
@@ -78,10 +78,10 @@ describe Chef::EncryptedDataBagItem::Encryptor  do
     end
 
     it "creates a version 2 encryptor" do
-      encryptor.should be_a_kind_of(Chef::EncryptedDataBagItem::Encryptor::Version2Encryptor)
+      encryptor.should be_a_instance_of(Chef::EncryptedDataBagItem::Encryptor::Version2Encryptor)
     end
 
-    it "generates an hmac based on ciphertext including iv" do
+    it "generates an hmac based on ciphertext with different iv" do
       encryptor2 = Chef::EncryptedDataBagItem::Encryptor.new(plaintext_data, key)
       encryptor.hmac.should_not eq(encryptor2.hmac)
     end
@@ -92,6 +92,74 @@ describe Chef::EncryptedDataBagItem::Encryptor  do
     end
   end
 
+  describe "when using version 3 format" do
+    before do
+      Chef::Config[:data_bag_encrypt_version] = 3
+    end
+
+    context "on supported platforms", :ruby_gte_20_and_openssl_gte_101 do
+
+      it "creates a version 3 encryptor" do
+        encryptor.should be_a_instance_of(Chef::EncryptedDataBagItem::Encryptor::Version3Encryptor)
+      end
+
+      it "generates different authentication tags" do
+        encryptor3 = Chef::EncryptedDataBagItem::Encryptor.new(plaintext_data, key)
+        encryptor.for_encrypted_item # required to generate the auth_tag
+        encryptor3.for_encrypted_item
+        encryptor.auth_tag.should_not eq(encryptor3.auth_tag)
+      end
+
+      it "includes the auth_tag in the envelope" do
+        final_data = encryptor.for_encrypted_item
+        final_data["auth_tag"].should eq(Base64::encode64(encryptor.auth_tag))
+      end
+
+      it "throws an error if auth tag is read before encrypting the data" do
+        lambda { encryptor.auth_tag }.should raise_error(Chef::EncryptedDataBagItem::EncryptionFailure)
+      end
+
+    end # context on supported platforms
+
+    context "on unsupported platforms" do
+      let(:aead_algorithm) { Chef::EncryptedDataBagItem::AEAD_ALGORITHM }
+
+      it "throws an error warning about the Ruby version if it has no GCM support" do
+        # Force OpenSSL with AEAD support
+        OpenSSL::Cipher.stub(:ciphers).and_return([ aead_algorithm ])
+        # Ruby without AEAD support
+        OpenSSL::Cipher.should_receive(:method_defined?).with(:auth_data=).and_return(false)
+        lambda { encryptor }.should raise_error(Chef::EncryptedDataBagItem::EncryptedDataBagRequirementsFailure, /requires Ruby/)
+      end
+
+      it "throws an error warning about the OpenSSL version if it has no GCM support" do
+        # Force Ruby with AEAD support
+        OpenSSL::Cipher.stub(:method_defined?).with(:auth_data=).and_return(true)
+        # OpenSSL without AEAD support
+        OpenSSL::Cipher.should_receive(:ciphers).and_return([])
+        lambda { encryptor }.should raise_error(Chef::EncryptedDataBagItem::EncryptedDataBagRequirementsFailure, /requires an OpenSSL/)
+      end
+
+      context "on platforms with old Ruby", :ruby_lt_20 do
+
+        it "throws an error warning about the Ruby version" do
+          lambda { encryptor }.should raise_error(Chef::EncryptedDataBagItem::EncryptedDataBagRequirementsFailure, /requires Ruby/)
+        end
+
+      end # context on platforms with old Ruby
+
+      context "on platforms with old OpenSSL", :openssl_lt_101 do
+
+        it "throws an error warning about the OpenSSL version" do
+          lambda { encryptor }.should raise_error(Chef::EncryptedDataBagItem::EncryptedDataBagRequirementsFailure, /requires an OpenSSL/)
+        end
+
+      end # context on platforms with old OpenSSL
+
+    end # context on unsupported platforms
+
+  end # when using version 3 format
+
 end
 
 describe Chef::EncryptedDataBagItem::Decryptor do
@@ -101,17 +169,85 @@ describe Chef::EncryptedDataBagItem::Decryptor do
   let(:encryption_key) { "passwd" }
   let(:decryption_key) { encryption_key }
 
+  context "when decrypting a version 3 (JSON+aes-256-gcm+random iv+auth tag) encrypted value" do
+
+    context "on supported platforms", :ruby_gte_20_and_openssl_gte_101 do
+
+      let(:encrypted_value) do
+        Chef::EncryptedDataBagItem::Encryptor::Version3Encryptor.new(plaintext_data, encryption_key).for_encrypted_item
+      end
+
+      let(:bogus_auth_tag) { "bogus_auth_tag" }
+
+      it "decrypts the encrypted value" do
+        decryptor.decrypted_data.should eq({"json_wrapper" => plaintext_data}.to_json)
+      end
+
+      it "unwraps the encrypted data and returns it" do
+        decryptor.for_decrypted_item.should eq plaintext_data
+      end
+
+      it "rejects the data if the authentication tag is wrong" do
+        encrypted_value["auth_tag"] = bogus_auth_tag
+        lambda { decryptor.for_decrypted_item }.should raise_error(Chef::EncryptedDataBagItem::DecryptionFailure)
+      end
+
+      it "rejects the data if the authentication tag is missing" do
+        encrypted_value.delete("auth_tag")
+        lambda { decryptor.for_decrypted_item }.should raise_error(Chef::EncryptedDataBagItem::DecryptionFailure)
+      end
+
+    end # context on supported platforms
+
+    context "on unsupported platforms" do
+      let(:encrypted_value) do
+        {
+          "encrypted_data" => "",
+          "iv" => "",
+          "version" => 3,
+          "cipher" => "aes-256-cbc",
+        }
+      end
+
+      context "on platforms with old Ruby", :ruby_lt_20 do
+
+        it "throws an error warning about the Ruby version" do
+          lambda { decryptor }.should raise_error(Chef::EncryptedDataBagItem::EncryptedDataBagRequirementsFailure, /requires Ruby/)
+        end
+
+      end # context on platforms with old Ruby
+
+      context "on platforms with old OpenSSL", :openssl_lt_101 do
+
+        it "throws an error warning about the OpenSSL version" do
+          lambda { decryptor }.should raise_error(Chef::EncryptedDataBagItem::EncryptedDataBagRequirementsFailure, /requires an OpenSSL/)
+        end
+
+      end # context on unsupported platforms
+
+    end # context on platforms with old OpenSSL
+
+  end # context when decrypting a version 3
+
   context "when decrypting a version 2 (JSON+aes-256-cbc+hmac-sha256+random iv) encrypted value" do
     let(:encrypted_value) do
       Chef::EncryptedDataBagItem::Encryptor::Version2Encryptor.new(plaintext_data, encryption_key).for_encrypted_item
     end
 
     let(:bogus_hmac) do
-      digest = OpenSSL::Digest::Digest.new("sha256")
+      digest = OpenSSL::Digest.new("sha256")
       raw_hmac = OpenSSL::HMAC.digest(digest, "WRONG", encrypted_value["encrypted_data"])
       Base64.encode64(raw_hmac)
     end
 
+    it "decrypts the encrypted value" do
+      decryptor.decrypted_data.should eq({"json_wrapper" => plaintext_data}.to_json)
+    end
+
+    it "unwraps the encrypted data and returns it" do
+      decryptor.for_decrypted_item.should eq plaintext_data
+    end
+
     it "rejects the data if the hmac is wrong" do
       encrypted_value["hmac"] = bogus_hmac
       lambda { decryptor.for_decrypted_item }.should raise_error(Chef::EncryptedDataBagItem::DecryptionFailure)
@@ -131,7 +267,7 @@ describe Chef::EncryptedDataBagItem::Decryptor do
     end
 
     it "selects the correct strategy for version 1" do
-      decryptor.should be_a_kind_of Chef::EncryptedDataBagItem::Decryptor::Version1Decryptor
+      decryptor.should be_a_instance_of Chef::EncryptedDataBagItem::Decryptor::Version1Decryptor
     end
 
     it "decrypts the encrypted value" do
@@ -191,7 +327,7 @@ describe Chef::EncryptedDataBagItem::Decryptor do
     end
 
     it "selects the correct strategy for version 0" do
-      decryptor.should be_a_kind_of(Chef::EncryptedDataBagItem::Decryptor::Version0Decryptor)
+      decryptor.should be_a_instance_of(Chef::EncryptedDataBagItem::Decryptor::Version0Decryptor)
     end
 
     it "decrypts the encrypted value" do

data/spec/unit/environment_spec.rb

@@ -420,7 +420,7 @@ describe Chef::Environment do
           "description" => "desc",
           "chef_type" => "environment"
         }
-        IO.should_receive(:read).with(File.join(Chef::Config[:environment_path], 'foo.json')).and_return(JSON.dump(environment_hash))
+        IO.should_receive(:read).with(File.join(Chef::Config[:environment_path], 'foo.json')).and_return(Chef::JSONCompat.to_json(environment_hash))
         environment = Chef::Environment.load('foo')
 
         environment.should be_a_kind_of(Chef::Environment)

data/spec/unit/formatters/base_spec.rb

@@ -0,0 +1,48 @@
+#
+# Author:: Lamont Granquist (<lamont@getchef.com>)
+#
+# Copyright:: Copyright (c) 2012 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe Chef::Formatters::Base do
+  let(:out) { double("out") }
+  let(:err) { double("err") }
+  let(:formatter) { Chef::Formatters::Base.new(out, err) }
+
+  it "starts with an indentation of zero" do
+    expect(formatter.output.indent).to eql(0)
+  end
+
+  it "increments it to two correctly" do
+    formatter.indent_by(2)
+    expect(formatter.output.indent).to eql(2)
+  end
+
+  it "increments it and then decrements it corectly" do
+    formatter.indent_by(2)
+    formatter.indent_by(-2)
+    expect(formatter.output.indent).to eql(0)
+  end
+
+  it "does not allow negative indentation" do
+    formatter.indent_by(-2)
+    expect(formatter.output.indent).to eql(0)
+  end
+end
+
+

data/spec/unit/json_compat_spec.rb

@@ -21,48 +21,79 @@ require 'chef/json_compat'
 
 describe Chef::JSONCompat do
 
-  describe "with JSON containing an existing class" do
-    let(:json){'{"json_class": "Chef::Role"}'}
+  describe "#from_json 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
-      Chef::JSONCompat.from_json(json).class.should eq Chef::Role
+      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
     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
-      Chef::JSONCompat.from_json(json).should eq({"json_class" => "Chef::Sandbox", "arbitrary" => "data"})
+      expect(Chef::JSONCompat.from_json(json)).to eq({"json_class" => "Chef::Sandbox", "arbitrary" => "data"})
     end
   end
 
-  describe "with a file with 300 or less nested entries" do
-    before(:all) do
-      @json = IO.read(File.join(CHEF_SPEC_DATA, 'big_json.json'))
-      @hash = Chef::JSONCompat.from_json(@json)
+  describe "when pretty printing an object that defines #to_json" do
+    class Foo
+      def to_json(*a)
+        {'foo' => 1234}.to_json(*a)
+      end
+    end
+
+    it "should work" do
+      f = Foo.new
+      expect(Chef::JSONCompat.to_json_pretty(f)).to eql("{\n  \"foo\": 1234\n}\n")
     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) }
 
     describe "when a big json file is loaded" do
       it "should create a Hash from the file" do
-        @hash.should be_kind_of(Hash)
+        expect(hash).to be_kind_of(Hash)
       end
+
       it "should has 'test' as a 300th nested value" do
-        @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'
+        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')
       end
     end
   end
+
   describe "with a file with more than 300 nested entries" do
-    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
+    let(:json) { IO.read(File.join(CHEF_SPEC_DATA, 'big_json_plus_one.json')) }
+    let(:hash) { Chef::JSONCompat.from_json(json, {:max_nesting => 301}) }
 
     describe "when a big json file is loaded" do
       it "should create a Hash from the file" do
-        @hash.should be_kind_of(Hash)
+        expect(hash).to be_kind_of(Hash)
       end
+
       it "should has 'test' as a 301st nested value" do
-        @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'
+        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')
       end
     end
   end

data/spec/unit/knife/client_delete_spec.rb

@@ -50,7 +50,7 @@ describe Chef::Knife::ClientDelete do
       Chef::ApiClient.should_receive(:load).and_return(@client)
     end
 
-    it 'should delete non-validator client if --force is not set' do
+    it 'should delete non-validator client if --delete-validators is not set' do
       @knife.config[:delete_validators] = false
       @client.should_receive(:destroy).and_return(@client)
       @knife.should_receive(:msg)
@@ -58,7 +58,7 @@ describe Chef::Knife::ClientDelete do
       @knife.run
     end
 
-    it 'should delete non-validator client if --force is set' do
+    it 'should delete non-validator client if --delete-validators is set' do
       @knife.config[:delete_validators] = true
       @client.should_receive(:destroy).and_return(@client)
       @knife.should_receive(:msg)
@@ -66,13 +66,13 @@ describe Chef::Knife::ClientDelete do
       @knife.run
     end
 
-    it 'should not delete validator client if --force is not set' do
+    it 'should not delete validator client if --delete-validators is not set' do
       @client.validator(true)
       @knife.ui.should_receive(:fatal)
       lambda { @knife.run}.should raise_error(SystemExit)
     end
 
-    it 'should delete validator client if --force is set' do
+    it 'should delete validator client if --delete-validators is set' do
       @knife.config[:delete_validators] = true
       @client.should_receive(:destroy).and_return(@client)
       @knife.should_receive(:msg)

data/spec/unit/knife/client_show_spec.rb

@@ -27,16 +27,26 @@ describe Chef::Knife::ClientShow do
 
   describe 'run' do
     it 'should list the client' do
-      Chef::ApiClient.should_receive(:load).with('adam').and_return(@client_mock)
-      @knife.should_receive(:format_for_display).with(@client_mock)
+      expect(Chef::ApiClient).to receive(:load).with('adam').and_return(@client_mock)
+      expect(@knife).to receive(:format_for_display).with(@client_mock)
       @knife.run
     end
 
+    it 'should pretty print json' do
+      @knife.config[:format] = 'json'
+      @stdout = StringIO.new
+      allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+      fake_client_contents = {"foo"=>"bar", "baz"=>"qux"}
+      expect(Chef::ApiClient).to receive(:load).with('adam').and_return(fake_client_contents)
+      @knife.run
+      expect(@stdout.string).to eql("{\n  \"foo\": \"bar\",\n  \"baz\": \"qux\"\n}\n")
+    end
+
     it 'should print usage and exit when a client name is not provided' do
       @knife.name_args = []
-      @knife.should_receive(:show_usage)
-      @knife.ui.should_receive(:fatal)
-      lambda { @knife.run }.should raise_error(SystemExit)
+      expect(@knife).to receive(:show_usage)
+      expect(@knife.ui).to receive(:fatal)
+      expect { @knife.run }.to raise_error(SystemExit)
     end
   end
 end