chef 12.0.0.alpha.2-x86-mingw32 → 12.0.0.rc.0-x86-mingw32

data/spec/unit/knife/core/bootstrap_context_spec.rb

@@ -29,9 +29,10 @@ describe Chef::Knife::Core::BootstrapContext do
       :validation_client_name => 'chef-validator-testing'
     }
   end
-  let(:secret_file) { File.join(CHEF_SPEC_DATA, 'bootstrap', 'encrypted_data_bag_secret') }
 
-  subject(:bootstrap_context) { described_class.new(config, run_list, chef_config) }
+  let(:secret) { nil }
+
+  subject(:bootstrap_context) { described_class.new(config, run_list, chef_config, secret) }
 
   it "runs chef with the first-boot.json in the _default environment" do
     bootstrap_context.start_chef.should eq "chef-client -j /etc/chef/first-boot.json -E _default"
@@ -94,50 +95,20 @@ EXPECTED
   describe "when JSON attributes are given" do
     let(:config) { {:first_boot_attributes => {:baz => :quux}} }
     it "adds the attributes to first_boot" do
-      bootstrap_context.first_boot.to_json.should eq({:baz => :quux, :run_list => run_list}.to_json)
+      Chef::JSONCompat.to_json(bootstrap_context.first_boot).should eq(Chef::JSONCompat.to_json({:baz => :quux, :run_list => run_list}))
     end
   end
 
   describe "when JSON attributes are NOT given" do
     it "sets first_boot equal to run_list" do
-      bootstrap_context.first_boot.to_json.should eq({:run_list => run_list}.to_json)
+      Chef::JSONCompat.to_json(bootstrap_context.first_boot).should eq(Chef::JSONCompat.to_json({:run_list => run_list}))
     end
   end
 
   describe "when an encrypted_data_bag_secret is provided" do
-    context "via config[:secret]" do
-      let(:chef_config) do
-        {
-          :knife => {:secret => "supersekret" }
-        }
-      end
-      it "reads the encrypted_data_bag_secret" do
-        bootstrap_context.encrypted_data_bag_secret.should eq "supersekret"
-      end
-    end
-
-    context "via config[:secret_file]" do
-      let(:chef_config) do
-        {
-          :knife => {:secret_file => secret_file}
-        }
-      end
-      it "reads the encrypted_data_bag_secret" do
-        bootstrap_context.encrypted_data_bag_secret.should eq IO.read(secret_file)
-      end
-    end
-
-    context "via config[:secret_file] with short home path" do
-      let(:chef_config) do
-        home_path = File.expand_path("~")
-        shorted_secret_file_path = secret_file.gsub(home_path, "~")
-        {
-          :knife => {:secret_file => shorted_secret_file_path}
-        }
-      end
-      it "reads the encrypted_data_bag_secret" do
-        bootstrap_context.encrypted_data_bag_secret.should eq IO.read(secret_file)
-      end
+    let(:secret) { "supersekret" }
+    it "reads the encrypted_data_bag_secret" do
+      bootstrap_context.encrypted_data_bag_secret.should eq "supersekret"
     end
   end
 

data/spec/unit/knife/core/subcommand_loader_spec.rb

@@ -20,7 +20,7 @@ require 'spec_helper'
 
 describe Chef::Knife::SubcommandLoader do
   before do
-
+    Chef::Platform.stub(:windows?) { false }
     @home = File.join(CHEF_SPEC_DATA, 'knife-home')
     @env = {'HOME' => @home}
     @loader = Chef::Knife::SubcommandLoader.new(File.join(CHEF_SPEC_DATA, 'knife-site-subcommands'), @env)

data/spec/unit/knife/core/ui_spec.rb

@@ -403,6 +403,34 @@ EOM
         @ui.format_cookbook_list_for_display(@item).should == response
       end
     end
+
+    context "when running on Windows" do
+      before(:each) do
+        stdout = double('StringIO', :tty? => true)
+        @ui.stub(:stdout).and_return(stdout)
+        Chef::Platform.stub(:windows?) { true }
+        Chef::Config.reset
+      end
+
+      after(:each) do
+        Chef::Config.reset
+      end
+
+      it "should have color set to true if knife config has color explicitly set to true" do
+        Chef::Config[:color] = true
+        @ui.config[:color] = true
+        expect(@ui.color?).to eql(true)
+      end
+
+      it "should have color set to false if knife config has color explicitly set to false" do
+        Chef::Config[:color] = false
+        expect(@ui.color?).to eql(false)
+      end
+
+      it "should not have color set to false by default" do
+        expect(@ui.color?).to eql(false)
+      end
+    end
   end
 
   describe "confirm" do

data/spec/unit/knife/data_bag_create_spec.rb

@@ -20,97 +20,89 @@
 require 'spec_helper'
 require 'tempfile'
 
-module ChefSpecs
-  class ChefRest
-    attr_reader :args_received
-    def initialize
-      @args_received = []
-    end
-
-    def post_rest(*args)
-      @args_received << args
-    end
+describe Chef::Knife::DataBagCreate do
+  let(:knife) do
+    k = Chef::Knife::DataBagCreate.new
+    allow(k).to receive(:rest).and_return(rest)
+    allow(k.ui).to receive(:stdout).and_return(stdout)
+    k
   end
-end
 
+  let(:rest) { double("Chef::REST") }
+  let(:stdout) { StringIO.new }
 
-describe Chef::Knife::DataBagCreate do
-  before do
-    Chef::Config[:node_name]  = "webmonkey.example.com"
-    @knife = Chef::Knife::DataBagCreate.new
-    @rest = ChefSpecs::ChefRest.new
-    @knife.stub(:rest).and_return(@rest)
-    @stdout = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
-  end
+  let(:bag_name) { "sudoing_admins" }
+  let(:item_name) { "ME" }
+
+  let(:secret) { "abc123SECRET" }
 
+  let(:raw_hash)  {{ "login_name" => "alphaomega", "id" => item_name }}
 
-  it "creates a data bag when given one argument" do
-    @knife.name_args = ['sudoing_admins']
-    @rest.should_receive(:post_rest).with("data", {"name" => "sudoing_admins"})
-    @knife.ui.should_receive(:info).with("Created data_bag[sudoing_admins]")
+  let(:config) { {} }
 
-    @knife.run
+  before do
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    knife.name_args = [bag_name, item_name]
+    allow(knife).to receive(:config).and_return(config)
   end
 
   it "tries to create a data bag with an invalid name when given one argument" do
-    @knife.name_args = ['invalid&char']
-    @knife.should_receive(:exit).with(1)
-
-    @knife.run
+    knife.name_args = ['invalid&char']
+    expect(Chef::DataBag).to receive(:validate_name!).with(knife.name_args[0]).and_raise(Chef::Exceptions::InvalidDataBagName)
+    expect {knife.run}.to exit_with_code(1)
   end
 
-  it "creates a data bag item when given two arguments" do
-    @knife.name_args = ['sudoing_admins', 'ME']
-    user_supplied_hash = {"login_name" => "alphaomega", "id" => "ME"}
-    data_bag_item = Chef::DataBagItem.from_hash(user_supplied_hash)
-    data_bag_item.data_bag("sudoing_admins")
-    @knife.should_receive(:create_object).and_yield(user_supplied_hash)
-    @rest.should_receive(:post_rest).with("data", {'name' => 'sudoing_admins'}).ordered
-    @rest.should_receive(:post_rest).with("data/sudoing_admins", data_bag_item).ordered
+  context "when given one argument" do
+    before do
+      knife.name_args = [bag_name]
+    end
+
+    it "creates a data bag" do
+      expect(rest).to receive(:post_rest).with("data", {"name" => bag_name})
+      expect(knife.ui).to receive(:info).with("Created data_bag[#{bag_name}]")
 
-    @knife.run
+      knife.run
+    end
   end
 
-  describe "encrypted data bag items" do
-    before(:each) do
-      @secret = "abc123SECRET"
-      @plain_data = {"login_name" => "alphaomega", "id" => "ME"}
-      @enc_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(@plain_data,
-                                                                   @secret)
-      @knife.name_args = ['sudoing_admins', 'ME']
-      @knife.should_receive(:create_object).and_yield(@plain_data)
-      data_bag_item = Chef::DataBagItem.from_hash(@enc_data)
-      data_bag_item.data_bag("sudoing_admins")
-
-      # Random IV is used each time the data bag item is encrypted, so values
-      # will not be equal if we re-encrypt.
-      Chef::EncryptedDataBagItem.should_receive(:encrypt_data_bag_item).and_return(@enc_data)
-
-      @rest.should_receive(:post_rest).with("data", {'name' => 'sudoing_admins'}).ordered
-      @rest.should_receive(:post_rest).with("data/sudoing_admins", data_bag_item).ordered
-
-      @secret_file = Tempfile.new("encrypted_data_bag_secret_file_test")
-      @secret_file.puts(@secret)
-      @secret_file.flush
+  context "no secret is specified for encryption" do
+    let(:item) do
+      item = Chef::DataBagItem.from_hash(raw_hash)
+      item.data_bag(bag_name)
+      item
     end
 
-    after do
-      @secret_file.close
-      @secret_file.unlink
+    it "creates a data bag item" do
+      expect(knife).to receive(:create_object).and_yield(raw_hash)
+      expect(knife).to receive(:encryption_secret_provided?).and_return(false)
+      expect(rest).to receive(:post_rest).with("data", {'name' => bag_name}).ordered
+      expect(rest).to receive(:post_rest).with("data/#{bag_name}", item).ordered
+
+      knife.run
     end
+  end
+
+  context "a secret is specified for encryption" do
+    let(:encoded_data) { Chef::EncryptedDataBagItem.encrypt_data_bag_item(raw_hash, secret) }
 
-    it "creates an encrypted data bag item via --secret" do
-      @knife.stub(:config).and_return({:secret => @secret})
-      @knife.run
+    let(:item) do
+      item = Chef::DataBagItem.from_hash(encoded_data)
+      item.data_bag(bag_name)
+      item
     end
 
-    it "creates an encrypted data bag item via --secret_file" do
-      secret_file = Tempfile.new("encrypted_data_bag_secret_file_test")
-      secret_file.puts(@secret)
-      secret_file.flush
-      @knife.stub(:config).and_return({:secret_file => secret_file.path})
-      @knife.run
+    it "creates an encrypted data bag item" do
+      expect(knife).to receive(:create_object).and_yield(raw_hash)
+      expect(knife).to receive(:encryption_secret_provided?).and_return(true)
+      expect(knife).to receive(:read_secret).and_return(secret)
+      expect(Chef::EncryptedDataBagItem)
+        .to receive(:encrypt_data_bag_item)
+        .with(raw_hash, secret)
+        .and_return(encoded_data)
+      expect(rest).to receive(:post_rest).with("data", {"name" => bag_name}).ordered
+      expect(rest).to receive(:post_rest).with("data/#{bag_name}", item).ordered
+
+      knife.run
     end
   end
 

data/spec/unit/knife/data_bag_edit_spec.rb

@@ -21,73 +21,107 @@ require 'tempfile'
 
 describe Chef::Knife::DataBagEdit do
   before do
-    @plain_data = {"login_name" => "alphaomega", "id" => "item_name"}
-    @edited_data = {
-      "login_name" => "rho", "id" => "item_name",
-      "new_key" => "new_value" }
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    knife.name_args = [bag_name, item_name]
+    allow(knife).to receive(:config).and_return(config)
+  end
+
+  let(:knife) do
+    k = Chef::Knife::DataBagEdit.new
+    allow(k).to receive(:rest).and_return(rest)
+    allow(k.ui).to receive(:stdout).and_return(stdout)
+    k
+  end
+
+  let(:raw_hash) { {"login_name" => "alphaomega", "id" => "item_name"} }
+  let(:db) { Chef::DataBagItem.from_hash(raw_hash)}
+  let(:raw_edited_hash) { {"login_name" => "rho", "id" => "item_name", "new_key" => "new_value"} }
+
+  let(:rest) { double("Chef::REST") }
+  let(:stdout) { StringIO.new }
 
-    Chef::Config[:node_name]  = "webmonkey.example.com"
+  let(:bag_name) { "sudoing_admins" }
+  let(:item_name) { "ME" }
 
-    @knife = Chef::Knife::DataBagEdit.new
-    @rest = double('chef-rest-mock')
-    @knife.stub(:rest).and_return(@rest)
+  let(:secret) { "abc123SECRET" }
 
-    @stdout = StringIO.new
-    @knife.stub(:stdout).and_return(@stdout)
-    @log = Chef::Log
-    @knife.name_args = ['bag_name', 'item_name']
+  let(:config) { {} }
+
+  let(:is_encrypted?) { false }
+  let(:transmitted_hash) { raw_edited_hash }
+  let(:data_to_edit) { db }
+
+  shared_examples_for "editing a data bag" do
+    it "correctly edits then uploads the data bag" do
+      expect(Chef::DataBagItem).to receive(:load).with(bag_name, item_name).and_return(db)
+      expect(knife).to receive(:encrypted?).with(db.raw_data).and_return(is_encrypted?)
+      expect(knife).to receive(:edit_data).with(data_to_edit).and_return(raw_edited_hash)
+      expect(rest).to receive(:put_rest).with("data/#{bag_name}/#{item_name}", transmitted_hash).ordered
+
+      knife.run
+    end
   end
 
   it "requires data bag and item arguments" do
-    @knife.name_args = []
-    lambda { @knife.run }.should raise_error(SystemExit)
-    @stdout.string.should match(/^You must supply the data bag and an item to edit/)
+    knife.name_args = []
+    expect(stdout).to receive(:puts).twice.with(anything)
+    expect {knife.run}.to exit_with_code(1)
+    expect(stdout.string).to eq("")
   end
 
-  it "saves edits on a data bag item" do
-    Chef::DataBagItem.stub(:load).with('bag_name', 'item_name').and_return(@plain_data)
-    @knife.should_receive(:edit_data).with(@plain_data).and_return(@edited_data)
-    @rest.should_receive(:put_rest).with("data/bag_name/item_name", @edited_data).ordered
-    @knife.run
+  context "when no secret is provided" do
+    include_examples "editing a data bag"
   end
 
-  describe "encrypted data bag items" do
-    before(:each) do
-      @secret = "abc123SECRET"
-      @enc_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(@plain_data,
-                                                                   @secret)
-      @enc_edited_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(@edited_data,
-                                                                          @secret)
-      Chef::DataBagItem.stub(:load).with('bag_name', 'item_name').and_return(@enc_data)
-
-      # Random IV is used each time the data bag item is encrypted, so values
-      # will not be equal if we encrypt same value twice.
-      Chef::EncryptedDataBagItem.should_receive(:encrypt_data_bag_item).and_return(@enc_edited_data)
-
-      @secret_file = Tempfile.new("encrypted_data_bag_secret_file_test")
-      @secret_file.puts(@secret)
-      @secret_file.flush
+  context "when config[:print_after] is set" do
+    let(:config) { {:print_after => true} }
+    before do
+      expect(knife.ui).to receive(:output).with(raw_edited_hash)
     end
 
-    after do
-      @secret_file.close
-      @secret_file.unlink
+    include_examples "editing a data bag"
+  end
+
+  context "when a secret is provided" do
+    let!(:enc_raw_hash) { Chef::EncryptedDataBagItem.encrypt_data_bag_item(raw_hash, secret) }
+    let!(:enc_edited_hash) { Chef::EncryptedDataBagItem.encrypt_data_bag_item(raw_edited_hash, secret) }
+    let(:transmitted_hash) { enc_edited_hash }
+
+    before(:each) do
+      expect(knife).to receive(:read_secret).at_least(1).times.and_return(secret)
+      expect(Chef::EncryptedDataBagItem).to receive(:encrypt_data_bag_item).with(raw_edited_hash, secret).and_return(enc_edited_hash)
     end
 
-    it "decrypts and encrypts via --secret" do
-      @knife.stub(:config).and_return({:secret => @secret})
-      @knife.should_receive(:edit_data).with(@plain_data).and_return(@edited_data)
-      @rest.should_receive(:put_rest).with("data/bag_name/item_name", @enc_edited_data).ordered
+    context "the data bag starts encrypted" do
+      let(:is_encrypted?) { true }
+      let(:db) { Chef::DataBagItem.from_hash(enc_raw_hash) }
+      # If the data bag is encrypted, it gets passed to `edit` as a hash.  Otherwise, it gets passed as a DataBag
+      let (:data_to_edit) { raw_hash }
+
+      before(:each) do
+        expect(knife).to receive(:encryption_secret_provided_ignore_encrypt_flag?).and_return(true)
+      end
 
-      @knife.run
+      include_examples "editing a data bag"
     end
 
-    it "decrypts and encrypts via --secret_file" do
-      @knife.stub(:config).and_return({:secret_file => @secret_file.path})
-      @knife.should_receive(:edit_data).with(@plain_data).and_return(@edited_data)
-      @rest.should_receive(:put_rest).with("data/bag_name/item_name", @enc_edited_data).ordered
+    context "the data bag starts unencrypted" do
+      before(:each) do
+        expect(knife).to receive(:encryption_secret_provided_ignore_encrypt_flag?).exactly(0).times
+        expect(knife).to receive(:encryption_secret_provided?).and_return(true)
+      end
 
-      @knife.run
+      include_examples "editing a data bag"
     end
   end
+
+  it "fails to edit an encrypted data bag if the secret is missing" do
+    expect(Chef::DataBagItem).to receive(:load).with(bag_name, item_name).and_return(db)
+    expect(knife).to receive(:encrypted?).with(db.raw_data).and_return(true)
+    expect(knife).to receive(:encryption_secret_provided_ignore_encrypt_flag?).and_return(false)
+
+    expect(knife.ui).to receive(:fatal).with("You cannot edit an encrypted data bag without providing the secret.")
+    expect {knife.run}.to exit_with_code(1)
+  end
+
 end

data/spec/unit/knife/data_bag_from_file_spec.rb

@@ -26,168 +26,146 @@ Chef::Knife::DataBagFromFile.load_deps
 
 describe Chef::Knife::DataBagFromFile do
   before :each do
-    Chef::Config[:node_name]  = "webmonkey.example.com"
-    @knife = Chef::Knife::DataBagFromFile.new
-    @rest = double("Chef::REST")
-    @knife.stub(:rest).and_return(@rest)
-    @stdout = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
-    @tmp_dir = Dir.mktmpdir
-    @db_folder = File.join(@tmp_dir, 'data_bags', 'bag_name')
-    FileUtils.mkdir_p(@db_folder)
-    @db_file = Tempfile.new(["data_bag_from_file_test", ".json"], @db_folder)
-    @db_file2 = Tempfile.new(["data_bag_from_file_test2", ".json"], @db_folder)
-    @db_folder2 = File.join(@tmp_dir, 'data_bags', 'bag_name2')
-    FileUtils.mkdir_p(@db_folder2)
-    @db_file3 = Tempfile.new(["data_bag_from_file_test3", ".json"], @db_folder2)
-    @plain_data = {
-        "id" => "item_name",
-        "greeting" => "hello",
-        "nested" => { "a1" => [1, 2, 3], "a2" => { "b1" => true }}
-    }
-    @db_file.write(@plain_data.to_json)
-    @db_file.flush
-    @knife.instance_variable_set(:@name_args, ['bag_name', @db_file.path])
+    Chef::Platform.stub(:windows?) { false }
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    FileUtils.mkdir_p([db_folder, db_folder2])
+    db_file.write(Chef::JSONCompat.to_json(plain_data))
+    db_file.flush
+    allow(knife).to receive(:config).and_return(config)
+    allow(Chef::Knife::Core::ObjectLoader).to receive(:new).and_return(loader)
   end
 
   # We have to explicitly clean up Tempfile on Windows because it said so.
   after :each do
-    @db_file.close
-    @db_file2.close
-    @db_file3.close
-    FileUtils.rm_rf(@db_folder)
-    FileUtils.rm_rf(@db_folder2)
-    FileUtils.remove_entry_secure @tmp_dir
+    db_file.close
+    db_file2.close
+    db_file3.close
+    FileUtils.rm_rf(db_folder)
+    FileUtils.rm_rf(db_folder2)
+    FileUtils.remove_entry_secure tmp_dir
   end
 
+  let(:knife) do
+    k = Chef::Knife::DataBagFromFile.new
+    allow(k).to receive(:rest).and_return(rest)
+    allow(k.ui).to receive(:stdout).and_return(stdout)
+    k
+  end
+
+  let(:tmp_dir) { Dir.mktmpdir }
+  let(:db_folder) { File.join(tmp_dir, data_bags_path, bag_name) }
+  let(:db_file) { Tempfile.new(["data_bag_from_file_test", ".json"], db_folder) }
+  let(:db_file2) { Tempfile.new(["data_bag_from_file_test2", ".json"], db_folder) }
+  let(:db_folder2) { File.join(tmp_dir, data_bags_path, bag_name2) }
+  let(:db_file3) { Tempfile.new(["data_bag_from_file_test3", ".json"], db_folder2) }
+
+  def new_bag_expects(b = bag_name, d = plain_data)
+    data_bag = double
+    expect(data_bag).to receive(:data_bag).with(b)
+    expect(data_bag).to receive(:raw_data=).with(d)
+    expect(data_bag).to receive(:save)
+    expect(data_bag).to receive(:data_bag)
+    expect(data_bag).to receive(:id)
+    data_bag
+  end
+
+  let(:loader) { double("Knife::Core::ObjectLoader") }
+
+  let(:data_bags_path) { "data_bags" }
+  let(:plain_data) { {
+      "id" => "item_name",
+      "greeting" => "hello",
+      "nested" => { "a1" => [1, 2, 3], "a2" => { "b1" => true }}
+  } }
+  let(:enc_data) { Chef::EncryptedDataBagItem.encrypt_data_bag_item(plain_data, secret) }
+
+  let(:rest) { double("Chef::REST") }
+  let(:stdout) { StringIO.new }
+
+  let(:bag_name) { "sudoing_admins" }
+  let(:bag_name2) { "sudoing_admins2" }
+  let(:item_name) { "ME" }
+
+  let(:secret) { "abc123SECRET" }
+
+  let(:config) { {} }
+
   it "loads from a file and saves" do
-    @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file.path).and_return(@plain_data)
-    dbag = Chef::DataBagItem.new
-    Chef::DataBagItem.stub(:new).and_return(dbag)
-    dbag.should_receive(:save)
-    @knife.run
-
-    dbag.data_bag.should == 'bag_name'
-    dbag.raw_data.should == @plain_data
+    knife.name_args = [bag_name, db_file.path]
+    expect(loader).to receive(:load_from).with(data_bags_path, bag_name, db_file.path).and_return(plain_data)
+    expect(Chef::DataBagItem).to receive(:new).and_return(new_bag_expects)
+
+    knife.run
   end
 
-  it "loads all from a mutiple files and saves" do
-    @knife.name_args = [ 'bag_name', @db_file.path, @db_file2.path ]
-    @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file.path).and_return(@plain_data)
-    @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file2.path).and_return(@plain_data)
-    dbag = Chef::DataBagItem.new
-    Chef::DataBagItem.stub(:new).and_return(dbag)
-    dbag.should_receive(:save).twice
-    @knife.run
-
-    dbag.data_bag.should == 'bag_name'
-    dbag.raw_data.should == @plain_data
+  it "loads all from multiple files and saves" do
+    knife.name_args = [ bag_name, db_file.path, db_file2.path ]
+    expect(loader).to receive(:load_from).with(data_bags_path, bag_name, db_file.path).and_return(plain_data)
+    expect(loader).to receive(:load_from).with(data_bags_path, bag_name, db_file2.path).and_return(plain_data)
+    expect(Chef::DataBagItem).to receive(:new).twice.and_return(new_bag_expects, new_bag_expects)
+
+    knife.run
   end
 
   it "loads all from a folder and saves" do
-    @knife.name_args = [ 'bag_name', @db_folder ]
-    @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file.path).and_return(@plain_data)
-    @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file2.path).and_return(@plain_data)
-    dbag = Chef::DataBagItem.new
-    Chef::DataBagItem.stub(:new).and_return(dbag)
-    dbag.should_receive(:save).twice
-    @knife.run
+    knife.name_args = [ bag_name, db_folder ]
+    expect(loader).to receive(:load_from).with(data_bags_path, bag_name, db_file.path).and_return(plain_data)
+    expect(loader).to receive(:load_from).with(data_bags_path, bag_name, db_file2.path).and_return(plain_data)
+    expect(Chef::DataBagItem).to receive(:new).twice.and_return(new_bag_expects, new_bag_expects)
+
+    knife.run
   end
 
   describe "loading all data bags" do
 
-    before do
-      @pwd = Dir.pwd
-      Dir.chdir(@tmp_dir)
-    end
-
-    after do
-      Dir.chdir(@pwd)
-    end
-
     it "loads all data bags when -a or --all options is provided" do
-      @knife.name_args = []
-      @knife.stub(:config).and_return({:all => true})
-      @knife.loader.should_receive(:load_from).with("data_bags", "bag_name", File.basename(@db_file.path)).
-        and_return(@plain_data)
-      @knife.loader.should_receive(:load_from).with("data_bags", "bag_name", File.basename(@db_file2.path)).
-        and_return(@plain_data)
-      @knife.loader.should_receive(:load_from).with("data_bags", "bag_name2", File.basename(@db_file3.path)).
-        and_return(@plain_data)
-      dbag = Chef::DataBagItem.new
-      Chef::DataBagItem.stub(:new).and_return(dbag)
-      dbag.should_receive(:save).exactly(3).times
-      @knife.run
+      knife.name_args = []
+      config[:all] = true
+      expect(loader).to receive(:find_all_object_dirs).with("./#{data_bags_path}").and_return([bag_name, bag_name2])
+      expect(loader).to receive(:find_all_objects).with("./#{data_bags_path}/#{bag_name}").and_return([File.basename(db_file.path), File.basename(db_file2.path)])
+      expect(loader).to receive(:find_all_objects).with("./#{data_bags_path}/#{bag_name2}").and_return([File.basename(db_file3.path)])
+      expect(loader).to receive(:load_from).with(data_bags_path, bag_name, File.basename(db_file.path)).and_return(plain_data)
+      expect(loader).to receive(:load_from).with(data_bags_path, bag_name, File.basename(db_file2.path)).and_return(plain_data)
+      expect(loader).to receive(:load_from).with(data_bags_path, bag_name2, File.basename(db_file3.path)).and_return(plain_data)
+      expect(Chef::DataBagItem).to receive(:new).exactly(3).times.and_return(new_bag_expects, new_bag_expects, new_bag_expects(bag_name2))
+
+      knife.run
     end
 
     it "loads all data bags items when -a or --all options is provided" do
-      @knife.name_args = ["bag_name2"]
-      @knife.stub(:config).and_return({:all => true})
-      @knife.loader.should_receive(:load_from).with("data_bags", "bag_name2", File.basename(@db_file3.path)).
-        and_return(@plain_data)
-      dbag = Chef::DataBagItem.new
-      Chef::DataBagItem.stub(:new).and_return(dbag)
-      dbag.should_receive(:save)
-      @knife.run
-      dbag.data_bag.should == 'bag_name2'
-      dbag.raw_data.should == @plain_data
+      knife.name_args = [bag_name2]
+      config[:all] = true
+      expect(loader).to receive(:find_all_objects).with("./#{data_bags_path}/#{bag_name2}").and_return([File.basename(db_file3.path)])
+      expect(loader).to receive(:load_from).with(data_bags_path, bag_name2, File.basename(db_file3.path)).and_return(plain_data)
+      expect(Chef::DataBagItem).to receive(:new).and_return(new_bag_expects(bag_name2))
+
+      knife.run
     end
 
   end
 
   describe "encrypted data bag items" do
     before(:each) do
-      @secret = "abc123SECRET"
-      @enc_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(@plain_data,
-                                                                   @secret)
-
-      # Random IV is used each time the data bag item is encrypted, so values
-      # will not be equal if we re-encrypt.
-      Chef::EncryptedDataBagItem.should_receive(:encrypt_data_bag_item).and_return(@enc_data)
-
-      @secret_file = Tempfile.new("encrypted_data_bag_secret_file_test")
-      @secret_file.puts(@secret)
-      @secret_file.flush
-    end
-
-    after do
-      @secret_file.close
-      @secret_file.unlink
+      expect(knife).to receive(:encryption_secret_provided?).and_return(true)
+      expect(knife).to receive(:read_secret).and_return(secret)
+      expect(Chef::EncryptedDataBagItem).to receive(:encrypt_data_bag_item).with(plain_data, secret).and_return(enc_data)
     end
 
     it "encrypts values when given --secret" do
-      @knife.stub(:config).and_return({:secret => @secret})
-
-      @knife.loader.should_receive(:load_from).with("data_bags", "bag_name", @db_file.path).and_return(@plain_data)
-      dbag = Chef::DataBagItem.new
-      Chef::DataBagItem.stub(:new).and_return(dbag)
-      dbag.should_receive(:save)
-      @knife.run
-      dbag.data_bag.should == 'bag_name'
-      dbag.raw_data.should == @enc_data
-    end
-
-    it "encrypts values when given --secret_file" do
-      @knife.stub(:config).and_return({:secret_file => @secret_file.path})
+      knife.name_args = [bag_name, db_file.path]
+      expect(loader).to receive(:load_from).with(data_bags_path, bag_name, db_file.path).and_return(plain_data)
+      expect(Chef::DataBagItem).to receive(:new).and_return(new_bag_expects(bag_name, enc_data))
 
-      @knife.loader.stub(:load_from).with("data_bags", 'bag_name', @db_file.path).and_return(@plain_data)
-      dbag = Chef::DataBagItem.new
-      Chef::DataBagItem.stub(:new).and_return(dbag)
-      dbag.should_receive(:save)
-      @knife.run
-      dbag.data_bag.should == 'bag_name'
-      dbag.raw_data.should == @enc_data
+      knife.run
     end
 
   end
 
   describe "command line parsing" do
     it "prints help if given no arguments" do
-      @knife.instance_variable_set(:@name_args, [])
-      lambda { @knife.run }.should raise_error(SystemExit)
-      help_text = "knife data bag from file BAG FILE|FOLDER [FILE|FOLDER..] (options)"
-      help_text_regex = Regexp.new("^#{Regexp.escape(help_text)}")
-      @stdout.string.should match(help_text_regex)
+      knife.name_args = [bag_name]
+      expect {knife.run}.to exit_with_code(1)
+      expect(stdout.string).to start_with("knife data bag from file BAG FILE|FOLDER [FILE|FOLDER..] (options)")
     end
   end