fixing post merge test breaks

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb
index c772a0cfb4..fc90079846 100644
--- a/lib/chef/provider/package/windows.rb
+++ b/lib/chef/provider/package/windows.rb
@@ -49,7 +49,7 @@ class Chef
             current_resource.version(:unknown.to_s)
           else
             current_resource.version(package_provider.installed_version)
-            new_resource.version(package_provider.package_version)
+            new_resource.version(package_provider.package_version) if package_provider.package_version
           end
 
           current_resource
diff --git a/spec/unit/provider/package/windows_spec.rb b/spec/unit/provider/package/windows_spec.rb
index 2c578b1b40..6952a91d92 100644
--- a/spec/unit/provider/package/windows_spec.rb
+++ b/spec/unit/provider/package/windows_spec.rb
@@ -33,7 +33,7 @@ describe Chef::Provider::Package::Windows, :windows_only do
   let(:resource_name) { 'calculator' }
   let(:new_resource) do
     new_resource = Chef::Resource::WindowsPackage.new(resource_name)
-    new_resource.source(resource_source)
+    new_resource.source(resource_source) if resource_source
     new_resource
   end
   let(:provider) { Chef::Provider::Package::Windows.new(new_resource, run_context) }
@@ -98,7 +98,7 @@ describe Chef::Provider::Package::Windows, :windows_only do
     shared_examples "a local file" do
 
       it "checks that the source path is valid" do
-        expect(Chef::Util::PathHelper).to receive(:validate_path)
+        expect(Chef::Util::PathHelper).to receive(:validate_path).and_call_original
         provider.package_provider
       end