summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Waldt <waldt@b1-systems.de>2017-10-06 07:36:40 +0200
committerEike Waldt <waldt@b1-systems.de>2017-10-06 07:36:40 +0200
commitae3432cdf33dc89003962892afa342b25f2167ad (patch)
tree01c3c56b8a3b9d2a61b51ab3a29b33e6265022a0
parent2b4e979e73649d0306b43345616a675cdeb7e735 (diff)
parent842193821084a5487d033f637aec7ff4d8720687 (diff)
downloadchef-ae3432cdf33dc89003962892afa342b25f2167ad.tar.gz
Merge branch 'master' of https://github.com/chef/chef
-rw-r--r--spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb2
-rw-r--r--spec/unit/knife/data_bag_create_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb b/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb
index c90532c078..fea7a2d54d 100644
--- a/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb
+++ b/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb
@@ -55,7 +55,7 @@ describe Chef::ChefFS::DataHandler::DataBagItemDataHandler do
end
context "using a reserved word for the data bag name" do
- %w(node role environment client).each do |reserved_word|
+ %w{node role environment client}.each do |reserved_word|
let(:entry) { TestDataBagItem.new(reserved_word, "bag") }
let(:object) do
{ "raw_data" => { "id" => "bag" } }
diff --git a/spec/unit/knife/data_bag_create_spec.rb b/spec/unit/knife/data_bag_create_spec.rb
index b295f0d715..1f99fe74fe 100644
--- a/spec/unit/knife/data_bag_create_spec.rb
+++ b/spec/unit/knife/data_bag_create_spec.rb
@@ -73,7 +73,7 @@ describe Chef::Knife::DataBagCreate do
end
it "won't create a data bag with a reserved name for search" do
- ['node', 'role', 'client', 'environment'].each do |name|
+ %w{node role client environment}.each do |name|
knife.name_args = [name]
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)