chef 14.2.0-universal-mingw32 → 14.3.37-universal-mingw32

data/spec/integration/recipes/accumulator_spec.rb

@@ -119,7 +119,7 @@ describe "Accumulators" do
         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)
@@ -221,7 +221,7 @@ describe "Accumulators" do
         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

@@ -105,9 +105,9 @@ describe "LWRPs with inline resources" do
         r = lwrp_inline_resources_test2 "hi" do
           action :b
         end
-      end.to have_updated("lwrp_inline_resources_test2[hi]", :b).
-        and have_updated("ruby_block[run a]", :run).
-        and have_updated("ruby_block[run b]", :run)
+      end.to have_updated("lwrp_inline_resources_test2[hi]", :b)
+        .and have_updated("ruby_block[run a]", :run)
+        .and have_updated("ruby_block[run b]", :run)
       expect(r.ran_b).to eq "ran b: ran_a value was \"ran a\""
     end
   end
@@ -145,13 +145,13 @@ describe "LWRPs with inline resources" do
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       actual = result.stdout.lines.map { |l| l.chomp }.join("\n")
       expected = <<EOM
   * x_my_machine[me] action create

data/spec/integration/recipes/lwrp_spec.rb

@@ -22,29 +22,29 @@ describe "LWRPs" do
     before do
       directory "cookbooks/l-w-r-p" do
 
-        file "resources/foo.rb", <<EOM
-default_action :create
+        file "resources/foo.rb", <<~EOM
+          default_action :create
 EOM
-        file "providers/foo.rb", <<EOM
-action :create do
-end
+        file "providers/foo.rb", <<~EOM
+          action :create do
+          end
 EOM
 
-        file "recipes/default.rb", <<EOM
-l_w_r_p_foo "me"
+        file "recipes/default.rb", <<~EOM
+          l_w_r_p_foo "me"
 EOM
 
       end # directory 'cookbooks/x'
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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 '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

@@ -26,13 +26,13 @@ describe "notifications" do
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       # 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!
@@ -43,37 +43,37 @@ EOM
     before do
       directory "cookbooks/x" do
 
-        file "resources/notifying_test.rb", <<EOM
-default_action :run
-provides :notifying_test
-resource_name :notifying_test
+        file "resources/notifying_test.rb", <<~EOM
+          default_action :run
+          provides :notifying_test
+          resource_name :notifying_test
 
-action :run do
-  log "bar" do
-    notifies :write, 'log[foo]', :delayed
-  end
-end
+          action :run do
+            log "bar" do
+              notifies :write, 'log[foo]', :delayed
+            end
+          end
 EOM
 
-        file "recipes/default.rb", <<EOM
-log "foo" do
-  action :nothing
-end
-notifying_test "whatever"
-log "baz"
+        file "recipes/default.rb", <<~EOM
+          log "foo" do
+            action :nothing
+          end
+          notifying_test "whatever"
+          log "baz"
 EOM
 
       end
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       # 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!
@@ -84,39 +84,39 @@ EOM
     before do
       directory "cookbooks/x" do
 
-        file "resources/notifying_test.rb", <<EOM
-default_action :run
-provides :notifying_test
-resource_name :notifying_test
+        file "resources/notifying_test.rb", <<~EOM
+          default_action :run
+          provides :notifying_test
+          resource_name :notifying_test
 
-action :run do
-  log "bar" do
-    notifies :write, 'log[foo]', :delayed
-  end
-end
+          action :run do
+            log "bar" do
+              notifies :write, 'log[foo]', :delayed
+            end
+          end
 EOM
 
-        file "recipes/default.rb", <<EOM
-log "foo" do
-  action :nothing
-end
-notifying_test "whatever"
-log "baz" do
-  notifies :write, 'log[foo]', :delayed
-end
+        file "recipes/default.rb", <<~EOM
+          log "foo" do
+            action :nothing
+          end
+          notifying_test "whatever"
+          log "baz" do
+            notifies :write, 'log[foo]', :delayed
+          end
 EOM
 
       end
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       # 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
@@ -129,41 +129,41 @@ EOM
     before do
       directory "cookbooks/x" do
 
-        file "resources/notifying_test.rb", <<EOM
-default_action :run
-provides :notifying_test
-resource_name :notifying_test
+        file "resources/notifying_test.rb", <<~EOM
+          default_action :run
+          provides :notifying_test
+          resource_name :notifying_test
 
-action :run do
-  log "bar" do
-    notifies :write, 'log[foo]', :delayed
-  end
-end
+          action :run do
+            log "bar" do
+              notifies :write, 'log[foo]', :delayed
+            end
+          end
 EOM
 
-        file "recipes/default.rb", <<EOM
-log "foo" do
-  action :nothing
-end
-log "quux" do
-  notifies :write, 'log[foo]', :delayed
-  notifies :write, 'log[baz]', :delayed
-end
-notifying_test "whatever"
-log "baz"
+        file "recipes/default.rb", <<~EOM
+          log "foo" do
+            action :nothing
+          end
+          log "quux" do
+            notifies :write, 'log[foo]', :delayed
+            notifies :write, 'log[baz]', :delayed
+          end
+          notifying_test "whatever"
+          log "baz"
 EOM
 
       end
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       # 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
@@ -175,29 +175,29 @@ EOM
   when_the_repository "notifies delayed four" do
     before do
       directory "cookbooks/x" do
-        file "recipes/default.rb", <<EOM
-log "foo" do
-  action :nothing
-end
-log "bar" do
-  notifies :write, 'log[foo]', :delayed
-end
-log "baz" do
-  notifies :write, 'log[foo]', :delayed
-end
+        file "recipes/default.rb", <<~EOM
+          log "foo" do
+            action :nothing
+          end
+          log "bar" do
+            notifies :write, 'log[foo]', :delayed
+          end
+          log "baz" do
+            notifies :write, 'log[foo]', :delayed
+          end
 EOM
 
       end
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       # 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
@@ -210,37 +210,37 @@ EOM
     before do
       directory "cookbooks/x" do
 
-        file "resources/notifying_test.rb", <<EOM
-default_action :run
-provides :notifying_test
-resource_name :notifying_test
+        file "resources/notifying_test.rb", <<~EOM
+          default_action :run
+          provides :notifying_test
+          resource_name :notifying_test
 
-action :run do
-  log "bar" do
-    notifies :write, 'log[foo]', :immediately
-  end
-end
+          action :run do
+            log "bar" do
+              notifies :write, 'log[foo]', :immediately
+            end
+          end
 EOM
 
-        file "recipes/default.rb", <<EOM
-log "foo" do
-  action :nothing
-end
-notifying_test "whatever"
-log "baz"
+        file "recipes/default.rb", <<~EOM
+          log "foo" do
+            action :nothing
+          end
+          notifying_test "whatever"
+          log "baz"
 EOM
 
       end
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
       result.error!
     end
@@ -250,37 +250,37 @@ EOM
     before do
       directory "cookbooks/x" do
 
-        file "resources/notifying_test.rb", <<EOM
-default_action :run
-provides :notifying_test
-resource_name :notifying_test
+        file "resources/notifying_test.rb", <<~EOM
+          default_action :run
+          provides :notifying_test
+          resource_name :notifying_test
 
-action :run do
-  log "bar" do
-    notifies :write, resources(log: "foo"), :immediately
-  end
-end
+          action :run do
+            log "bar" do
+              notifies :write, resources(log: "foo"), :immediately
+            end
+          end
 EOM
 
-        file "recipes/default.rb", <<EOM
-log "foo" do
-  action :nothing
-end
-notifying_test "whatever"
-log "baz"
+        file "recipes/default.rb", <<~EOM
+          log "foo" do
+            action :nothing
+          end
+          notifying_test "whatever"
+          log "baz"
 EOM
 
       end
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
       result.error!
     end
@@ -290,34 +290,34 @@ EOM
     before do
       directory "cookbooks/x" do
 
-        file "resources/notifying_test.rb", <<EOM
-default_action :run
-provides :notifying_test
-resource_name :notifying_test
+        file "resources/notifying_test.rb", <<~EOM
+          default_action :run
+          provides :notifying_test
+          resource_name :notifying_test
 
-action :run do
-  log "bar" do
-    notifies :write, "log[foo]"
-  end
-end
+          action :run do
+            log "bar" do
+              notifies :write, "log[foo]"
+            end
+          end
 EOM
 
-        file "recipes/default.rb", <<EOM
-notifying_test "whatever"
-log "baz"
+        file "recipes/default.rb", <<~EOM
+          notifying_test "whatever"
+          log "baz"
 EOM
 
       end
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       expect(result.stdout).to match(/Chef::Exceptions::ResourceNotFound/)
       expect(result.exitstatus).not_to eql(0)
     end
@@ -327,37 +327,37 @@ EOM
     before do
       directory "cookbooks/x" do
 
-        file "resources/cloning_test.rb", <<EOM
-default_action :run
-provides :cloning_test
-resource_name :cloning_test
+        file "resources/cloning_test.rb", <<~EOM
+          default_action :run
+          provides :cloning_test
+          resource_name :cloning_test
 
-action :run do
-  log "bar" do
-    level :info
-  end
-end
+          action :run do
+            log "bar" do
+              level :info
+            end
+          end
 EOM
 
-        file "recipes/default.rb", <<EOM
-log "bar" do
-  level :warn
-end
+        file "recipes/default.rb", <<~EOM
+          log "bar" do
+            level :warn
+          end
 
-cloning_test "whatever"
+          cloning_test "whatever"
 EOM
 
       end
     end
 
     it "should complete with success" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       expect(result.stdout).not_to match(/CHEF-3694/)
       result.error!
     end
@@ -379,13 +379,13 @@ EOM
     end
 
     it "notifying the resource should work" do
-      file "config/client.rb", <<EOM
-local_mode true
-cookbook_path "#{path_to('cookbooks')}"
-log_level :warn
+      file "config/client.rb", <<~EOM
+        local_mode true
+        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)
       expect(result.stdout).to match /\* log\[a, b\] action write/
       result.error!
     end