chef 16.2.50-universal-mingw32 → 16.2.73-universal-mingw32

data/spec/support/shared/functional/securable_resource_with_reporting.rb

@@ -1,5 +1,4 @@
 
-require "functional/resource/base"
 
 ALL_EXPANDED_PERMISSIONS = ["generic read",
                             "generic write",

data/spec/support/shared/functional/windows_script.rb

@@ -91,7 +91,7 @@ shared_context Chef::Resource::WindowsScript do
       end
 
       context "when the guard's architecture is specified as 64-bit" do
-        let (:guard_architecture) { :x86_64 }
+        let(:guard_architecture) { :x86_64 }
         it "executes a 64-bit guard", :windows64_only do
           resource.only_if resource_guard_command, architecture: guard_architecture
           resource.run_action(:run)
@@ -100,7 +100,7 @@ shared_context Chef::Resource::WindowsScript do
       end
 
       context "when the guard's architecture is specified as 32-bit" do
-        let (:guard_architecture) { :i386 }
+        let(:guard_architecture) { :i386 }
         it "executes a 32-bit guard" do
           resource.only_if resource_guard_command, architecture: guard_architecture
           resource.run_action(:run)

data/spec/support/shared/unit/provider/file.rb

@@ -484,19 +484,23 @@ shared_examples_for Chef::Provider::File do
 
         it "raises an exception if any verification fails" do
           allow(File).to receive(:directory?).with("C:\\Windows\\system32/cmd.exe").and_return(false)
-          provider.new_resource.verify windows? ? "REM" : "true"
-          provider.new_resource.verify windows? ? "cmd.exe /c exit 1" : "false"
-          msg = "Proposed content for #{provider.new_resource.path} failed verification #{windows? ? "cmd.exe /c exit 1" : "false"}"
-          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, /#{msg}/)
+          allow(provider).to receive(:tempfile).and_return(tempfile)
+          provider.new_resource.verify windows? ? "cmd.exe c exit 1" : "false"
+          provider.new_resource.verify.each do |v|
+            allow(v).to receive(:verify).and_return(false)
+          end
+          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed)
         end
 
         it "does not show verification for sensitive resources" do
           allow(File).to receive(:directory?).with("C:\\Windows\\system32/cmd.exe").and_return(false)
-          provider.new_resource.verify windows? ? "REM" : "true"
-          provider.new_resource.verify windows? ? "cmd.exe /c exit 1" : "false"
+          allow(provider).to receive(:tempfile).and_return(tempfile)
           provider.new_resource.sensitive true
-          msg = "Proposed content for #{provider.new_resource.path} failed verification [sensitive]\nTemporary file moved to #{backupfile}"
-          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, msg)
+          provider.new_resource.verify windows? ? "cmd.exe c exit 1" : "false"
+          provider.new_resource.verify.each do |v|
+            allow(v).to receive(:verify).and_return(false)
+          end
+          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, /sensitive/)
         end
       end
     end

data/spec/unit/application/solo_spec.rb

@@ -164,6 +164,8 @@ describe Chef::Application::Solo do
   end
 
   context "in local mode" do
+    let(:root_path) { windows? ? "C:/var/chef" : "/var/chef" }
+
     before do
       Chef::Config[:solo_legacy_mode] = false
     end
@@ -197,10 +199,10 @@ describe Chef::Application::Solo do
     end
 
     it "sets the repo path" do
-      expect(Chef::Config).to receive(:find_chef_repo_path).and_return("/var/chef")
+      expect(Chef::Config).to receive(:find_chef_repo_path).and_return(root_path)
       app.reconfigure
       expect(Chef::Config.key?(:chef_repo_path)).to be_truthy
-      expect(Chef::Config[:chef_repo_path]).to eq ("/var/chef")
+      expect(Chef::Config[:chef_repo_path]).to eq (root_path)
     end
 
     it "runs chef-client in local mode" do

data/spec/unit/chef_fs/config_spec.rb

@@ -203,8 +203,8 @@ describe Chef::ChefFS::Config do
         })
       end
 
-      let (:path) { "/roles/foo.json" }
-      let (:entry) { Entry.new(path) }
+      let(:path) { "/roles/foo.json" }
+      let(:entry) { Entry.new(path) }
 
       it "returns the entry's path if the cwd isn't in the config" do
         cfg = Chef::ChefFS::Config.new(config, "/my_repo/cookbooks")

data/spec/unit/chef_fs/diff_spec.rb

@@ -20,17 +20,17 @@ require "spec_helper"
 require "chef/chef_fs/file_pattern"
 require "chef/chef_fs/command_line"
 
-# Removes the date stamp from the diff and replaces it with ' DATE'
-# example match: "/dev/null\t2012-10-16 16:15:54.000000000 +0000"
-# windows match: "--- /dev/null\tTue Oct 16 18:04:34 2012"
-def remove_os_differences(diff)
-  diff = diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE')
-  diff.gsub(/^@@ -\d(,\d)? \+\d(,\d)? @@/, "CONTEXT_LINE_NUMBERS")
-end
-
 describe "diff", uses_diff: true do
   include FileSystemSupport
 
+  # Removes the date stamp from the diff and replaces it with ' DATE'
+  # example match: "/dev/null\t2012-10-16 16:15:54.000000000 +0000"
+  # windows match: "--- /dev/null\tTue Oct 16 18:04:34 2012"
+  def remove_os_differences(diff)
+    diff = diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE')
+    diff.gsub(/^@@ -\d(,\d)? \+\d(,\d)? @@/, "CONTEXT_LINE_NUMBERS")
+  end
+
   context "with two filesystems with all types of difference" do
     let(:a) do
       memory_fs("a", {

data/spec/unit/client_spec.rb

@@ -749,9 +749,12 @@ describe Chef::Client do
 
     context "when any directory of cookbook_path contains no cookbook" do
       it "raises CookbookNotFound error" do
+        invalid_cookbook_path = windows? ? "C:/path/to/invalid/cookbook_path" : "/path/to/invalid/cookbook_path"
+        msg = "None of the cookbook paths set in Chef::Config[:cookbook_path], [\"#{invalid_cookbook_path}\"], contain any cookbooks"
+
         expect do
           client.send(:assert_cookbook_path_not_empty, nil)
-        end.to raise_error(Chef::Exceptions::CookbookNotFound, 'None of the cookbook paths set in Chef::Config[:cookbook_path], ["/path/to/invalid/cookbook_path"], contain any cookbooks')
+        end.to raise_error(Chef::Exceptions::CookbookNotFound, msg)
       end
     end
   end

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -217,6 +217,8 @@ describe Chef::CookbookSynchronizer do
       path: "/tmp/cookbook_a_template_default_tempfile")
   end
 
+  let(:root) { windows? ? "C:/file-cache/cookbooks/cookbook_a" : "/file-cache/cookbooks/cookbook_a" }
+
   def setup_common_files_missing_expectations
     # Files are not in the cache:
     expect(file_cache).to receive(:key?)
@@ -234,7 +236,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_recipes_default_rb", "cookbooks/cookbook_a/recipes/default.rb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/recipes/default.rb", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .and_return("#{root}/recipes/default.rb")
 
     # Fetch and copy default.rb attribute file
     expect(server_api).to receive(:streaming_request)
@@ -244,7 +246,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_attributes_default_rb", "cookbooks/cookbook_a/attributes/default.rb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/attributes/default.rb", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .and_return("#{root}/attributes/default.rb")
   end
 
   def setup_no_lazy_files_and_templates_missing_expectations
@@ -262,7 +264,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_file_default_tempfile", "cookbooks/cookbook_a/files/default/megaman.conf")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .and_return("#{root}/default/megaman.conf")
 
     expect(server_api).to receive(:streaming_request)
       .with("http://chef.example.com/ffffff")
@@ -271,7 +273,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_template_default_tempfile", "cookbooks/cookbook_a/templates/default/apache2.conf.erb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .and_return("#{root}/templates/default/apache2.conf.erb")
   end
 
   def setup_common_files_chksum_mismatch_expectations
@@ -292,11 +294,11 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/recipes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .and_return("#{root}/recipes/default.rb")
 
     # Current file has fff000, want abc123
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .with("#{root}/recipes/default.rb")
       .and_return("fff000").at_least(:once)
 
     # Fetch and copy default.rb attribute file
@@ -308,11 +310,11 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/attributes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .and_return("#{root}/attributes/default.rb")
 
     # Current file has fff000, want abc456
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .with("#{root}/attributes/default.rb")
       .and_return("fff000").at_least(:once)
   end
 
@@ -334,7 +336,7 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .and_return("#{root}/default/megaman.conf")
 
     # Fetch and copy apache2.conf template
     expect(server_api).to receive(:streaming_request)
@@ -345,16 +347,16 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .and_return("#{root}/templates/default/apache2.conf.erb")
 
     # Current file has fff000
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .with("#{root}/default/megaman.conf")
       .and_return("fff000")
 
     # Current file has fff000
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .with("#{root}/templates/default/apache2.conf.erb")
       .and_return("fff000")
   end
 
@@ -369,23 +371,23 @@ describe Chef::CookbookSynchronizer do
 
     # Current file has abc123, want abc123
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .with("#{root}/recipes/default.rb")
       .and_return("abc123").at_least(:once)
 
     # Current file has abc456, want abc456
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .with("#{root}/attributes/default.rb")
       .and_return("abc456").at_least(:once)
 
     # :load called twice
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/recipes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .and_return("#{root}/recipes/default.rb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/attributes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .and_return("#{root}/attributes/default.rb")
   end
 
   def setup_no_lazy_files_and_templates_present_expectations
@@ -399,23 +401,23 @@ describe Chef::CookbookSynchronizer do
 
     # Current file has abc124, want abc124
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .with("#{root}/default/megaman.conf")
       .and_return("abc124")
 
     # Current file has abc125, want abc125
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .with("#{root}/templates/default/apache2.conf.erb")
       .and_return("abc125")
 
     # :load called twice
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .and_return("#{root}/default/megaman.conf")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .and_return("#{root}/templates/default/apache2.conf.erb")
   end
 
   describe "#server_api" do
@@ -535,19 +537,19 @@ describe Chef::CookbookSynchronizer do
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/recipes/default.rb", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+          .and_return("#{root}/recipes/default.rb")
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/attributes/default.rb", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+          .and_return("#{root}/attributes/default.rb")
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+          .and_return("#{root}/templates/default/apache2.conf.erb")
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/files/default/megaman.conf")
+          .and_return("#{root}/files/default/megaman.conf")
         expect(Chef::Log).to receive(:warn)
           .with("skipping cookbook synchronization! DO NOT LEAVE THIS ENABLED IN PRODUCTION!!!")
           .once

data/spec/unit/data_bag_spec.rb

@@ -240,20 +240,23 @@ describe Chef::DataBag do
 
       it "should raise an error if the configured data_bag_path is invalid" do
         file_dir_stub(@paths.first, false)
+        msg = "Data bag path '#{windows? ? "C:/var/chef" : "/var/chef"}/data_bags' not found. Please create this directory."
 
         expect do
           Chef::DataBag.load("foo")
-        end.to raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '/var/chef/data_bags' not found. Please create this directory."
+        end.to raise_error Chef::Exceptions::InvalidDataBagPath, msg
       end
 
     end
 
     describe "data bag with string path" do
-      it_should_behave_like "data bag in solo mode", "/var/chef/data_bags"
+      it_should_behave_like "data bag in solo mode", "#{windows? ? "C:/var/chef" : "/var/chef"}/data_bags"
     end
 
     describe "data bag with array path" do
-      it_should_behave_like "data bag in solo mode", ["/var/chef/data_bags", "/var/chef/data_bags_2"]
+      it_should_behave_like "data bag in solo mode", %w{data_bags data_bags_2}.map { |data_bag|
+        "#{windows? ? "C:/var/chef" : "/var/chef"}/#{data_bag}"
+      }
     end
   end
 

data/spec/unit/decorator_spec.rb

@@ -18,37 +18,37 @@
 
 require "spec_helper"
 
-def impersonates_a(klass)
-  it "#is_a?(#{klass}) is true" do
-    expect(decorator.is_a?(klass)).to be true
-  end
+describe Chef::Decorator do
+  def self.impersonates_a(klass)
+    it "#is_a?(#{klass}) is true" do
+      expect(decorator.is_a?(klass)).to be true
+    end
 
-  it "#is_a?(Chef::Decorator) is true" do
-    expect(decorator.is_a?(Chef::Decorator)).to be true
-  end
+    it "#is_a?(Chef::Decorator) is true" do
+      expect(decorator.is_a?(Chef::Decorator)).to be true
+    end
 
-  it "#kind_of?(#{klass}) is true" do
-    expect(decorator.is_a?(klass)).to be true
-  end
+    it "#kind_of?(#{klass}) is true" do
+      expect(decorator.is_a?(klass)).to be true
+    end
 
-  it "#kind_of?(Chef::Decorator) is true" do
-    expect(decorator.is_a?(Chef::Decorator)).to be true
-  end
+    it "#kind_of?(Chef::Decorator) is true" do
+      expect(decorator.is_a?(Chef::Decorator)).to be true
+    end
 
-  it "#instance_of?(#{klass}) is false" do
-    expect(decorator.instance_of?(klass)).to be false
-  end
+    it "#instance_of?(#{klass}) is false" do
+      expect(decorator.instance_of?(klass)).to be false
+    end
 
-  it "#instance_of?(Chef::Decorator) is true" do
-    expect(decorator.instance_of?(Chef::Decorator)).to be true
-  end
+    it "#instance_of?(Chef::Decorator) is true" do
+      expect(decorator.instance_of?(Chef::Decorator)).to be true
+    end
 
-  it "#class is Chef::Decorator" do
-    expect(decorator.class).to eql(Chef::Decorator)
+    it "#class is Chef::Decorator" do
+      expect(decorator.class).to eql(Chef::Decorator)
+    end
   end
-end
 
-describe Chef::Decorator do
   let(:obj) {}
   let(:decorator) { Chef::Decorator.new(obj) }
 

data/spec/unit/environment_spec.rb

@@ -454,7 +454,11 @@ describe Chef::Environment do
 
         expect do
           Chef::Environment.load("foo")
-        end.to raise_error Chef::Exceptions::InvalidEnvironmentPath, "Environment path '/var/chef/environments' is invalid"
+        end.to raise_error(
+          an_instance_of(Chef::Exceptions::InvalidEnvironmentPath).and having_attributes(
+            message: "Environment path '#{windows? ? "C:/var/chef/environments" : "/var/chef/environments"}' is invalid"
+          )
+        )
       end
 
       it "should raise an error if the file does not exist" do

data/spec/unit/guard_interpreter_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::GuardInterpreter do
   describe "#for_resource" do
-    let (:resource) { Chef::Resource.new("foo") }
+    let(:resource) { Chef::Resource.new("foo") }
 
     it "returns a DefaultGuardInterpreter if the resource has guard_interpreter set to :default" do
       resource.guard_interpreter :default

data/spec/unit/http/api_versions_spec.rb

@@ -72,7 +72,7 @@ describe Chef::HTTP::APIVersions do
   end
 
   context "with an unacceptable api version" do
-    let (:return_value) { "406" }
+    let(:return_value) { "406" }
     it "resets the list of supported versions" do
       Chef::ServerAPIVersions.instance.set_versions({ "min_version" => 1, "max_version" => 3 })
       run_api_version_handler

data/spec/unit/knife/bootstrap_spec.rb

@@ -1927,6 +1927,7 @@ describe Chef::Knife::Bootstrap do
       Chef::Config[:knife][:test_key_c] = "c from Chef::Config"
       Chef::Config[:knife][:alt_test_key_c] = "alt c from Chef::Config"
       knife.merge_configs
+      Chef::Config[:treat_deprecation_warnings_as_errors] = false
     end
 
     it "returns the Chef::Config value from the cli when the CLI key is set" do

data/spec/unit/knife/cookbook_download_spec.rb

@@ -83,7 +83,7 @@ describe Chef::Knife::CookbookDownload do
         }
       end
 
-      let (:cookbook) do
+      let(:cookbook) do
         cb = Chef::CookbookVersion.new("foobar")
         cb.version = "1.0.0"
         cb.manifest = manifest_data
@@ -91,7 +91,7 @@ describe Chef::Knife::CookbookDownload do
       end
 
       describe "and no version" do
-        let (:manifest_data) { { all_files: [] } }
+        let(:manifest_data) { { all_files: [] } }
         it "should determine which version to download" do
           expect(@knife).to receive(:determine_version).and_return("1.0.0")
           expect(File).to receive(:exists?).with("/var/tmp/chef/foobar-1.0.0").and_return(false)