chef 15.12.22-universal-mingw32 → 15.13.8-universal-mingw32

data/spec/unit/provider/service/windows_spec.rb

@@ -22,12 +22,8 @@ require "spec_helper"
 describe Chef::Provider::Service::Windows, "load_current_resource" do
   include_context "Win32"
 
-  before(:all) do
-    Chef::ReservedNames::Win32::Security = Class.new unless windows?
-  end
-
-  after(:all) do
-    Chef::ReservedNames::Win32.send(:remove_const, :Security) unless windows?
+  before do
+    stub_const("Chef::ReservedNames::Win32::Security", Class.new) unless windows?
   end
 
   let(:logger) { double("Mixlib::Log::Child").as_null_object }

data/spec/unit/provider/systemd_unit_spec.rb

@@ -220,31 +220,35 @@ describe Chef::Provider::SystemdUnit do
       expect(current_resource.content).to eq(nil)
     end
 
-    it "loads the user unit content if the file exists and user is set" do
-      new_resource.user("joe")
-      allow(File).to receive(:exist?)
-        .with(unit_path_user)
-        .and_return(true)
-      allow(File).to receive(:read)
-        .with(unit_path_user)
-        .and_return(unit_content_string)
-      expect(File).to receive(:exist?)
-        .with(unit_path_user)
-      expect(File).to receive(:read)
-        .with(unit_path_user)
-      provider.load_current_resource
-      expect(current_resource.content).to eq(unit_content_string)
-    end
+    # A password is required when specifying a user on Windows. Since systemd resources
+    # won't actually run on Windows, skip these tests rather than code a workaround.
+    unless windows?
+      it "loads the user unit content if the file exists and user is set" do
+        new_resource.user("joe")
+        allow(File).to receive(:exist?)
+          .with(unit_path_user)
+          .and_return(true)
+        allow(File).to receive(:read)
+          .with(unit_path_user)
+          .and_return(unit_content_string)
+        expect(File).to receive(:exist?)
+          .with(unit_path_user)
+        expect(File).to receive(:read)
+          .with(unit_path_user)
+        provider.load_current_resource
+        expect(current_resource.content).to eq(unit_content_string)
+      end
 
-    it "does not load the user unit if the file does not exist and user is set" do
-      new_resource.user("joe")
-      allow(File).to receive(:exist?)
-        .with(unit_path_user)
-        .and_return(false)
-      expect(File).to_not receive(:read)
-        .with(unit_path_user)
-      provider.load_current_resource
-      expect(current_resource.content).to eq(nil)
+      it "does not load the user unit if the file does not exist and user is set" do
+        new_resource.user("joe")
+        allow(File).to receive(:exist?)
+          .with(unit_path_user)
+          .and_return(false)
+        expect(File).to_not receive(:read)
+          .with(unit_path_user)
+        provider.load_current_resource
+        expect(current_resource.content).to eq(nil)
+      end
     end
   end
 

data/spec/unit/provider_spec.rb

@@ -20,6 +20,7 @@ require "spec_helper"
 
 class NoWhyrunDemonstrator < Chef::Provider
   attr_reader :system_state_altered
+
   def whyrun_supported?
     false
   end

data/spec/unit/resource/windows_package_spec.rb

@@ -58,6 +58,7 @@ describe Chef::Resource::WindowsPackage, "initialize" do
     expect { resource.installer_type :msi }.not_to raise_error
     expect { resource.installer_type :nsis }.not_to raise_error
     expect { resource.installer_type :wise }.not_to raise_error
+    expect { resource.installer_type :something_else_entirely }.to raise_error(Chef::Exceptions::ValidationFailed)
     expect { resource.installer_type "msi" }.to raise_error(Chef::Exceptions::ValidationFailed)
   end
 

data/spec/unit/run_context/cookbook_compiler_spec.rb

@@ -175,7 +175,7 @@ describe Chef::RunContext::CookbookCompiler do
     describe "event dispatch" do
       let(:recipe) { "dependency1::default" }
       let(:recipe_path) do
-        File.expand_path("../../../data/run_context/cookbooks/dependency1/recipes/default.rb", __FILE__)
+        File.expand_path("../../data/run_context/cookbooks/dependency1/recipes/default.rb", __dir__)
       end
       before do
         node.run_list(recipe)

data/spec/unit/win32/security_spec.rb

@@ -81,9 +81,10 @@ describe "Chef::Win32::Security", :windows_only do
 
     context "when the user has admin privileges" do
       it "returns true" do
-        allow(Chef::ReservedNames::Win32::Security).to receive(:open_current_process_token)
-        token = Chef::ReservedNames::Win32::Security.open_current_process_token
+        token = double(:process_token)
         allow(token).to receive_message_chain(:handle, :handle)
+
+        allow(Chef::ReservedNames::Win32::Security).to receive(:open_current_process_token).and_return(token)
         allow(Chef::ReservedNames::Win32::Security).to receive(:get_token_information_elevation_type)
         allow(Chef::ReservedNames::Win32::Security).to receive(:GetTokenInformation).and_return(true)
         allow_any_instance_of(FFI::Buffer).to receive(:read_ulong).and_return(1)
@@ -128,7 +129,7 @@ describe "Chef::Win32::Security", :windows_only do
     context "when FFI::LastError.error result is not ERROR_INSUFFICIENT_BUFFER and not NO_ERROR" do
       it "raises Chef::ReservedNames::Win32::Error.raise! exception" do
         expect(FFI::LastError).to receive(:error).and_return(123).at_least(:once)
-        expect { security_class.lookup_account_name "system" }.to raise_error
+        expect { security_class.lookup_account_name "system" }.to raise_error(Chef::Exceptions::Win32APIError)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 15.12.22
+  version: 15.13.8
 platform: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.12.22
+        version: 15.13.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.12.22
+        version: 15.13.8
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.12.22
+        version: 15.13.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.12.22
+        version: 15.13.8
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -678,16 +678,22 @@ dependencies:
   name: iso8601
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: win32-certstore
   requirement: !ruby/object:Gem::Requirement