chef 14.14.29 → 14.15.6

data/spec/integration/recipes/accumulator_spec.rb

@@ -115,11 +115,11 @@ describe "Accumulators" do
     it "should complete with success" do
       file "config/client.rb", <<-EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
       EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       result.error!
       # runs only a single template resource (in the outer run context, as a delayed resource)
       expect(result.stdout.scan(/template\S+ action create/).size).to eql(1)
@@ -217,11 +217,11 @@ describe "Accumulators" do
     it "should complete with success" do
       file "config/client.rb", <<-EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
       EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       result.error!
       # runs only a single template resource (in the outer run context, as a delayed resource)
       expect(result.stdout.scan(/template\S+ action create/).size).to eql(1)

data/spec/integration/recipes/lwrp_inline_resources_spec.rb

@@ -53,7 +53,7 @@ describe "LWRPs with inline resources" do
       action :fiddle do
         file PATH do
           content new_resource.content
-          action [:create, :delete]
+          action %i{create delete}
         end
       end
     end
@@ -147,12 +147,12 @@ describe "LWRPs with inline resources" do
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
-      actual = result.stdout.lines.map { |l| l.chomp }.join("\n")
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      actual = result.stdout.lines.map(&:chomp).join("\n")
       expected = <<EOM
   * x_my_machine[me] action create
     * x_do_nothing[a] action create (up to date)
@@ -163,7 +163,7 @@ EOM
     * x_do_nothing[b] action create (up to date)
      (up to date)
 EOM
-      expected = expected.lines.map { |l| l.chomp }.join("\n")
+      expected = expected.lines.map(&:chomp).join("\n")
       expect(actual).to include(expected)
       result.error!
     end

data/spec/integration/recipes/lwrp_spec.rb

@@ -24,15 +24,15 @@ describe "LWRPs" do
 
         file "resources/foo.rb", <<~EOM
           default_action :create
-EOM
+        EOM
         file "providers/foo.rb", <<~EOM
           action :create do
           end
-EOM
+        EOM
 
         file "recipes/default.rb", <<~EOM
           l_w_r_p_foo "me"
-EOM
+        EOM
 
       end # directory 'cookbooks/x'
     end
@@ -40,11 +40,11 @@ EOM
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'l-w-r-p::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'l-w-r-p::default'", cwd: chef_dir)
       expect(result.stdout).to match(/\* l_w_r_p_foo\[me\] action create \(up to date\)/)
       expect(result.stdout).not_to match(/WARN: You are overriding l_w_r_p_foo/)
       result.error!

data/spec/integration/recipes/notifies_spec.rb

@@ -28,11 +28,11 @@ describe "notifications" do
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # our delayed notification should run at the end of the parent run_context after the baz resource
       expect(result.stdout).to match(/\* apt_update\[\] action nothing \(skipped due to action :nothing\)\s+\* log\[foo\] action write\s+\* log\[bar\] action write\s+\* apt_update\[\] action nothing \(skipped due to action :nothing\)/)
       result.error!
@@ -53,7 +53,7 @@ EOM
               notifies :write, 'log[foo]', :delayed
             end
           end
-EOM
+        EOM
 
         file "recipes/default.rb", <<~EOM
           log "foo" do
@@ -61,7 +61,7 @@ EOM
           end
           notifying_test "whatever"
           log "baz"
-EOM
+        EOM
 
       end
     end
@@ -69,11 +69,11 @@ EOM
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # our delayed notification should run at the end of the parent run_context after the baz resource
       expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[baz\] action write\s+\* log\[foo\] action write/)
       result.error!
@@ -94,7 +94,7 @@ EOM
               notifies :write, 'log[foo]', :delayed
             end
           end
-EOM
+        EOM
 
         file "recipes/default.rb", <<~EOM
           log "foo" do
@@ -104,7 +104,7 @@ EOM
           log "baz" do
             notifies :write, 'log[foo]', :delayed
           end
-EOM
+        EOM
 
       end
     end
@@ -112,11 +112,11 @@ EOM
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # our delayed notification should run at the end of the parent run_context after the baz resource
       expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[baz\] action write\s+\* log\[foo\] action write/)
       # and only run once
@@ -139,7 +139,7 @@ EOM
               notifies :write, 'log[foo]', :delayed
             end
           end
-EOM
+        EOM
 
         file "recipes/default.rb", <<~EOM
           log "foo" do
@@ -151,7 +151,7 @@ EOM
           end
           notifying_test "whatever"
           log "baz"
-EOM
+        EOM
 
       end
     end
@@ -159,11 +159,11 @@ EOM
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # the delayed notification from the sub-resource is de-duplicated by the notification already in the parent run_context
       expect(result.stdout).to match(/\* log\[quux\] action write\s+\* notifying_test\[whatever\] action run\s+\* log\[bar\] action write\s+\* log\[baz\] action write\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
       # and only run once
@@ -185,7 +185,7 @@ EOM
           log "baz" do
             notifies :write, 'log[foo]', :delayed
           end
-EOM
+        EOM
 
       end
     end
@@ -193,11 +193,11 @@ EOM
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # the delayed notification from the sub-resource is de-duplicated by the notification already in the parent run_context
       expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[baz\] action write\s+\* log\[foo\] action write/)
       # and only run once
@@ -220,7 +220,7 @@ EOM
               notifies :write, 'log[foo]', :immediately
             end
           end
-EOM
+        EOM
 
         file "recipes/default.rb", <<~EOM
           log "foo" do
@@ -228,7 +228,7 @@ EOM
           end
           notifying_test "whatever"
           log "baz"
-EOM
+        EOM
 
       end
     end
@@ -236,11 +236,11 @@ EOM
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
       result.error!
     end
@@ -260,7 +260,7 @@ EOM
               notifies :write, resources(log: "foo"), :immediately
             end
           end
-EOM
+        EOM
 
         file "recipes/default.rb", <<~EOM
           log "foo" do
@@ -268,7 +268,7 @@ EOM
           end
           notifying_test "whatever"
           log "baz"
-EOM
+        EOM
 
       end
     end
@@ -276,11 +276,11 @@ EOM
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
       result.error!
     end
@@ -300,12 +300,12 @@ EOM
               notifies :write, "log[foo]"
             end
           end
-EOM
+        EOM
 
         file "recipes/default.rb", <<~EOM
           notifying_test "whatever"
           log "baz"
-EOM
+        EOM
 
       end
     end
@@ -313,11 +313,11 @@ EOM
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       expect(result.stdout).to match(/Chef::Exceptions::ResourceNotFound/)
       expect(result.exitstatus).not_to eql(0)
     end
@@ -337,7 +337,7 @@ EOM
               level :info
             end
           end
-EOM
+        EOM
 
         file "recipes/default.rb", <<~EOM
           log "bar" do
@@ -345,7 +345,7 @@ EOM
           end
 
           cloning_test "whatever"
-EOM
+        EOM
 
       end
     end
@@ -353,11 +353,11 @@ EOM
     it "should complete with success" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       expect(result.stdout).not_to match(/CHEF-3694/)
       result.error!
     end
@@ -381,11 +381,11 @@ EOM
     it "notifying the resource should work" do
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
-EOM
+      EOM
 
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       expect(result.stdout).to match /\* log\[a, b\] action write/
       result.error!
     end

data/spec/integration/recipes/notifying_block_spec.rb

@@ -45,7 +45,7 @@ describe "notifying_block" do
       end
       file "config/client.rb", <<-EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
       EOM
     end
@@ -55,7 +55,7 @@ describe "notifying_block" do
     #  2. delayed notifications are de-dup'd in the subcontext
     #  3. delayed notifications (to resources inside the subcontext) are run at the end of the subcontext
     it "should run alpha, beta, gamma, and delta in that order" do
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       expect(result.stdout).to match(/\* log\[alpha\] action write\s+\* log\[beta\] action write\s+\* log\[gamma\] action write\s+Converging 1 resources\s+\* log\[delta\] action write/)
       result.error!
     end
@@ -94,7 +94,7 @@ describe "notifying_block" do
       end
       file "config/client.rb", <<-EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
       EOM
     end
@@ -103,7 +103,7 @@ describe "notifying_block" do
     #  1. notifying block will correctly update wrapping new_resource updated_by_last_action status
     #  2. delayed notifications from a subcontext inside a resource will notify resources in their outer run_context
     it "should run foo, quux, bar, and baz in that order" do
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       expect(result.stdout).to match(/\* log\[foo\] action write\s+\* log\[quux\] action write\s+\* log\[bar\] action write\s+\* log\[baz\] action write/)
       result.error!
     end

data/spec/integration/recipes/provider_choice.rb

@@ -16,8 +16,7 @@ describe "Recipe DSL methods" do
     context "And class Chef::Provider::ProviderThingy with no provides" do
       before :context do
         class Chef::Provider::ProviderThingy < Chef::Provider
-          def load_current_resource
-          end
+          def load_current_resource; end
 
           def action_create
             Chef::Log.warn("hello from #{self.class.name}")

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -28,8 +28,7 @@ describe "Recipe DSL methods" do
           Provider
         end
         class Provider < Chef::Provider
-          def load_current_resource
-          end
+          def load_current_resource; end
 
           def action_create
             BaseThingy.created_name = new_resource.name
@@ -1154,7 +1153,8 @@ describe "Recipe DSL methods" do
           def to_s
             "MyResource"
           end
-        end end
+        end
+      end
       let(:my_resource) { :"my_resource#{Namer.current_index}" }
       let(:blarghle_blarghle_little_star) { :"blarghle_blarghle_little_star#{Namer.current_index}" }
 
@@ -1340,10 +1340,10 @@ describe "Recipe DSL methods" do
       resource_class.new("blah", run_context)
     end
     it "The actions are part of actions along with :nothing" do
-      expect(resource_class.actions).to eq [ :nothing, :create ]
+      expect(resource_class.actions).to eq %i{nothing create}
     end
     it "The actions are part of allowed_actions along with :nothing" do
-      expect(resource.allowed_actions).to eq [ :nothing, :create ]
+      expect(resource.allowed_actions).to eq %i{nothing create}
     end
 
     context "and a subclass that declares more actions" do
@@ -1358,14 +1358,14 @@ describe "Recipe DSL methods" do
       end
 
       it "The parent class actions are not part of actions" do
-        expect(subresource_class.actions).to eq [ :nothing, :delete ]
+        expect(subresource_class.actions).to eq %i{nothing delete}
       end
       it "The parent class actions are not part of allowed_actions" do
-        expect(subresource.allowed_actions).to eq [ :nothing, :delete ]
+        expect(subresource.allowed_actions).to eq %i{nothing delete}
       end
       it "The parent class actions do not change" do
-        expect(resource_class.actions).to eq [ :nothing, :create ]
-        expect(resource.allowed_actions).to eq [ :nothing, :create ]
+        expect(resource_class.actions).to eq %i{nothing create}
+        expect(resource.allowed_actions).to eq %i{nothing create}
       end
     end
   end