diff options
author | Thom May <thom@may.lt> | 2016-12-07 09:44:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-07 09:44:16 +0000 |
commit | 811cbff2baaf0c5f8ad78cbaf6e62db969842827 (patch) | |
tree | 5a824fdbcc06e2cf4633c77baacce0da1e779686 /spec/integration | |
parent | fcb0ccc2480725f03c2f97c0eb5ebcf37e4b2f32 (diff) | |
parent | 6ec604f150023e93859af90dff08dba6dc624f79 (diff) | |
download | chef-811cbff2baaf0c5f8ad78cbaf6e62db969842827.tar.gz |
Merge pull request #5548 from chef/lcg/chefstyle-updates
Chefstyle updates
Diffstat (limited to 'spec/integration')
-rw-r--r-- | spec/integration/knife/chef_repo_path_spec.rb | 4 | ||||
-rw-r--r-- | spec/integration/recipes/resource_load_spec.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/integration/knife/chef_repo_path_spec.rb b/spec/integration/knife/chef_repo_path_spec.rb index 1388aa8716..e609fa60b3 100644 --- a/spec/integration/knife/chef_repo_path_spec.rb +++ b/spec/integration/knife/chef_repo_path_spec.rb @@ -843,7 +843,7 @@ EOM context "when data_bag_path and chef_repo_path are set, and nothing else" do before :each do - %w{client cookbook environment node role user}.each do |object_name| + %w{client cookbook environment node role user}.each do |object_name| Chef::Config.delete("#{object_name}_path".to_sym) end Chef::Config.data_bag_path = File.join(Chef::Config.chef_repo_path, "data_bags") @@ -903,7 +903,7 @@ EOM include_context "default config options" before :each do - %w{client cookbook environment node role user}.each do |object_name| + %w{client cookbook environment node role user}.each do |object_name| Chef::Config.delete("#{object_name}_path".to_sym) end Chef::Config.delete(:chef_repo_path) diff --git a/spec/integration/recipes/resource_load_spec.rb b/spec/integration/recipes/resource_load_spec.rb index 954fbf53a4..791b83c23a 100644 --- a/spec/integration/recipes/resource_load_spec.rb +++ b/spec/integration/recipes/resource_load_spec.rb @@ -48,7 +48,7 @@ describe "Resource.load_current_value" do x "loaded #{Namer.incrementing_value} (#{self.class.properties.sort_by { |name, p| name }. select { |name, p| p.is_set?(self) }. map { |name, p| "#{name}=#{p.get(self)}" }. - join(", ") })" + join(", ")})" end end @@ -175,7 +175,7 @@ describe "Resource.load_current_value" do y "loaded_y #{Namer.incrementing_value} (#{self.class.properties.sort_by { |name, p| name }. select { |name, p| p.is_set?(self) }. map { |name, p| "#{name}=#{p.get(self)}" }. - join(", ") })" + join(", ")})" end end @@ -193,7 +193,7 @@ describe "Resource.load_current_value" do y "loaded_y #{Namer.incrementing_value} (#{self.class.properties.sort_by { |name, p| name }. select { |name, p| p.is_set?(self) }. map { |name, p| "#{name}=#{p.get(self)}" }. - join(", ") })" + join(", ")})" end end |