chef 16.5.77-universal-mingw32 → 16.9.16-universal-mingw32

data/spec/unit/provider/package/rubygems_spec.rb

@@ -50,6 +50,8 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
   before do
     @gem_env = Chef::Provider::Package::Rubygems::CurrentGemEnvironment.new
     allow(@gem_env).to receive(:logger).and_return(logger)
+
+    WebMock.disable_net_connect!
   end
 
   it "determines the gem paths from the in memory rubygems" do
@@ -113,28 +115,55 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
     end
 
     it "finds a matching gem candidate version on rubygems 2.0.0+" do
-      dep = Gem::Dependency.new("rspec", ">= 0")
+      stub_request(:head, "https://rubygems.org/api/v1/dependencies")
+
+      stub_request(:get, "https://rubygems.org/api/v1/dependencies?gems=sexp_processor")
+        .to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "sexp_processor")))
+
+      stub_request(:get, "https://rubygems.org/quick/Marshal.4.8/sexp_processor-4.15.1.gemspec.rz")
+        .to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "sexp_processor-4.15.1.gemspec.rz")))
+
+      dep = Gem::Dependency.new("sexp_processor", ">= 0")
       expect(@gem_env.candidate_version_from_remote(dep)).to be_kind_of(Gem::Version)
     end
 
     it "gives the candidate version as nil if none is found" do
-      dep = Gem::Dependency.new("lksdjflksdjflsdkfj", ">= 0")
+      stub_request(:head, "https://rubygems.org/api/v1/dependencies")
+
+      stub_request(:get, "https://rubygems.org/api/v1/dependencies?gems=nonexistent_gem")
+        .to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "nonexistent_gem")))
+
+      dep = Gem::Dependency.new("nonexistent_gem", ">= 0")
       expect(@gem_env.candidate_version_from_remote(dep)).to be_nil
     end
 
     it "finds a matching gem from a specific gemserver when explicit sources are given (to a server that doesn't respond to api requests)" do
-      dep = Gem::Dependency.new("rspec", ">= 0")
-      expect(@gem_env.candidate_version_from_remote(dep, "https://rubygems.org")).to be_kind_of(Gem::Version)
+      stub_request(:head, "https://rubygems2.org/api/v1/dependencies")
+
+      stub_request(:get, "https://rubygems2.org/api/v1/dependencies?gems=sexp_processor")
+        .to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "sexp_processor")))
+
+      stub_request(:get, "https://rubygems2.org/quick/Marshal.4.8/sexp_processor-4.15.1.gemspec.rz")
+        .to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "sexp_processor-4.15.1.gemspec.rz")))
+
+      dep = Gem::Dependency.new("sexp_processor", ">= 0")
+      expect(@gem_env.candidate_version_from_remote(dep, "https://rubygems2.org")).to be_kind_of(Gem::Version)
     end
   end
 
   context "old rubygems caching behavior" do
     before do
       Chef::Config[:rubygems_cache_enabled] = true
+
+      stub_request(:get, "https://rubygems.org/latest_specs.4.8.gz")
+        .to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "latest_specs.4.8.gz")))
     end
 
     it "finds a matching gem candidate version on rubygems 2.0.0+" do
-      dep = Gem::Dependency.new("rspec", ">= 0")
+      stub_request(:get, "https://rubygems.org/quick/Marshal.4.8/sexp_processor-4.15.1.gemspec.rz")
+        .to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "sexp_processor-4.15.1.gemspec.rz")))
+
+      dep = Gem::Dependency.new("sexp_processor", ">= 0")
       expect(@gem_env.candidate_version_from_remote(dep)).to be_kind_of(Gem::Version)
     end
 
@@ -144,8 +173,11 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
     end
 
     it "finds a matching gem from a specific gemserver when explicit sources are given" do
-      dep = Gem::Dependency.new("rspec", ">= 0")
-      expect(@gem_env.candidate_version_from_remote(dep, "http://production.cf.rubygems.org")).to be_kind_of(Gem::Version)
+      stub_request(:get, "https://rubygems.org/quick/Marshal.4.8/sexp_processor-4.15.1.gemspec.rz")
+        .to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "sexp_processor-4.15.1.gemspec.rz")))
+
+      dep = Gem::Dependency.new("sexp_processor", ">= 0")
+      expect(@gem_env.candidate_version_from_remote(dep, "http://rubygems2.org")).to be_kind_of(Gem::Version)
     end
   end
 

data/spec/unit/provider/package/zypper_spec.rb

@@ -96,31 +96,6 @@ describe Chef::Provider::Package::Zypper do
       provider.load_current_resource
     end
 
-    it "should set the candidate version if zypper info has one (zypper version < 1.13.0)" do
-      status = double(stdout: "Version: 1.0\nInstalled: No\nStatus: out-of-date (version 0.9 installed)", exitstatus: 0)
-
-      allow(provider).to receive(:shell_out_compacted!).and_return(status)
-      provider.load_current_resource
-      expect(provider.candidate_version).to eql(["1.0"])
-    end
-
-    it "should set the candidate version if zypper info has one (zypper version >= 1.13.0)" do
-      status = double(stdout: "Version        : 1.0                             \nInstalled      : No                              \nStatus         : out-of-date (version 0.9 installed)", exitstatus: 0)
-
-      allow(provider).to receive(:shell_out_compacted!).and_return(status)
-      provider.load_current_resource
-      expect(provider.candidate_version).to eql(["1.0"])
-    end
-
-    it "should have differing current and candidate versions if zypper detects an upgrade" do
-      status = double(stdout: "Version        : 1.0                             \nInstalled      : Yes                              \nStatus         : out-of-date (version 0.9 installed)", exitstatus: 0)
-
-      allow(provider).to receive(:shell_out_compacted!).and_return(status)
-      provider.load_current_resource
-      expect(provider.get_current_versions).to eq(["0.9"])
-      expect(provider.get_candidate_versions).to eq(["1.0"])
-    end
-
     it "should return the current resouce" do
       expect(provider.load_current_resource).to eql(current_resource)
     end

data/spec/unit/provider/package_spec.rb

@@ -517,8 +517,8 @@ describe "Chef::Provider::Package - Multi" do
     end
 
     it "installs the specified version when some are out of date" do
-      current_resource.version(["1.0", "6.2"])
-      new_resource.version(["1.0", "6.3"])
+      current_resource.version(["1.0", "6.1"])
+      new_resource.version(["1.0", "6.2"])
       provider.run_action(:install)
       expect(new_resource).to be_updated
     end

data/spec/unit/provider/powershell_script_spec.rb

@@ -46,5 +46,16 @@ describe Chef::Provider::PowershellScript, "action_run" do
 
       expect(provider.command).to eq(expected)
     end
+
+    it "uses pwsh when given the pwsh interpreter" do
+      new_resource.interpreter = "pwsh"
+      provider.send(:script_file_path=, "C:\\Temp\\Script.ps1")
+
+      expected = <<~CMD.strip
+        "pwsh" -NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -InputFormat None  -File "C:\\Temp\\Script.ps1"
+      CMD
+
+      expect(provider.command).to eq(expected)
+    end
   end
 end

data/spec/unit/provider/subversion_spec.rb

@@ -271,9 +271,6 @@ describe Chef::Provider::Subversion do
   end
 
   context "selects the correct svn binary" do
-    before do
-    end
-
     it "selects 'svn' as the binary by default" do
       @resource.svn_binary nil
       allow(ChefUtils).to receive(:windows?) { false }

data/spec/unit/provider/systemd_unit_spec.rb

@@ -18,7 +18,7 @@
 
 require "spec_helper"
 
-describe Chef::Provider::SystemdUnit do
+describe Chef::Provider::SystemdUnit, :linux_only do
 
   let(:node) { Chef::Node.new }
   let(:events) { Chef::EventDispatch::Dispatcher.new }

data/spec/unit/provider/user_spec.rb

@@ -259,6 +259,7 @@ describe Chef::Provider::User do
     it "should call manage_user if the user exists and has mismatched properties" do
       @provider.user_exists = true
       allow(@provider).to receive(:compare_user).and_return(true)
+      allow(@provider).to receive(:change_desc).and_return([ ])
       expect(@provider).to receive(:manage_user).and_return(true)
       @provider.action_create
     end
@@ -266,6 +267,7 @@ describe Chef::Provider::User do
     it "should set the new_resources updated flag when it creates the user if we call manage_user" do
       @provider.user_exists = true
       allow(@provider).to receive(:compare_user).and_return(true)
+      allow(@provider).to receive(:change_desc).and_return([ ])
       allow(@provider).to receive(:manage_user).and_return(true)
       @provider.action_create
       @provider.set_updated_status
@@ -315,14 +317,16 @@ describe Chef::Provider::User do
       # @provider.stub(:manage_user).and_return(true)
     end
 
-    it "should run manage_user if the user exists and has mismatched properties" do
+    it "should call manage_user if the user exists and has mismatched properties" do
       expect(@provider).to receive(:compare_user).and_return(true)
+      allow(@provider).to receive(:change_desc).and_return([ ])
       expect(@provider).to receive(:manage_user).and_return(true)
       @provider.action_manage
     end
 
     it "should set the new resources updated flag to true if manage_user is called" do
       allow(@provider).to receive(:compare_user).and_return(true)
+      allow(@provider).to receive(:change_desc).and_return([ ])
       allow(@provider).to receive(:manage_user).and_return(true)
       @provider.action_manage
       @provider.set_updated_status
@@ -360,12 +364,14 @@ describe Chef::Provider::User do
 
     it "should run manage_user if the user exists and has mismatched properties" do
       expect(@provider).to receive(:compare_user).and_return(true)
+      allow(@provider).to receive(:change_desc).and_return([ ])
       expect(@provider).to receive(:manage_user).and_return(true)
       @provider.action_modify
     end
 
     it "should set the new resources updated flag to true if manage_user is called" do
       allow(@provider).to receive(:compare_user).and_return(true)
+      allow(@provider).to receive(:change_desc).and_return([ ])
       allow(@provider).to receive(:manage_user).and_return(true)
       @provider.action_modify
       @provider.set_updated_status

data/spec/unit/provider/windows_env_spec.rb

@@ -18,21 +18,17 @@
 
 require "spec_helper"
 
-describe Chef::Provider::WindowsEnv, :windows_only do
+describe "windows_env provider", :windows_only do
 
   let(:run_context) do
     Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
   end
 
   before do
-    @new_resource = Chef::Resource::WindowsEnv.new("FOO")
+    @new_resource = Chef::Resource::WindowsEnv.new("FOO", run_context)
     @new_resource.value("bar")
     @new_resource.user("<System>")
-    @provider = Chef::Provider::WindowsEnv.new(@new_resource, run_context)
-  end
-
-  it "assumes the key_name exists by default" do
-    expect(@provider.key_exists).to be_truthy
+    @provider = @new_resource.provider_for_action(:create)
   end
 
   describe "when loading the current status" do
@@ -41,7 +37,7 @@ describe Chef::Provider::WindowsEnv, :windows_only do
       # Chef::Resource::Env.stub(:new).and_return(@current_resource)
       @provider.current_resource = @current_resource
       allow(@provider).to receive(:env_value).with("FOO").and_return("bar")
-      allow(@provider).to receive(:env_key_exists).and_return(true)
+      allow(@provider).to receive(:key_exists?).and_return(true)
     end
 
     it "should create a current resource with the same name as the new resource" do
@@ -59,18 +55,6 @@ describe Chef::Provider::WindowsEnv, :windows_only do
       expect(@provider.current_resource.key_name).to eq("FOO")
     end
 
-    it "should check if the key_name and user exist" do
-      expect(@provider).to receive(:env_key_exists).with("FOO").and_return(true)
-      @provider.load_current_resource
-      expect(@provider.key_exists).to be_truthy
-    end
-
-    it "should flip the value of exists if the key does not exist" do
-      expect(@provider).to receive(:env_key_exists).with("FOO").and_return(false)
-      @provider.load_current_resource
-      expect(@provider.key_exists).to be_falsey
-    end
-
     it "should return the current resource" do
       expect(@provider.load_current_resource).to be_a_kind_of(Chef::Resource::WindowsEnv)
     end
@@ -78,7 +62,7 @@ describe Chef::Provider::WindowsEnv, :windows_only do
 
   describe "action_create" do
     before do
-      @provider.key_exists = false
+      allow(@provider).to receive(:key_exists?).and_return(false)
       allow(@provider).to receive(:create_env).and_return(true)
       allow(@provider).to receive(:modify_env).and_return(true)
     end
@@ -94,20 +78,20 @@ describe Chef::Provider::WindowsEnv, :windows_only do
     end
 
     it "should check to see if the values are the same if the key exists" do
-      @provider.key_exists = true
+      allow(@provider).to receive(:key_exists?).and_return(true)
       expect(@provider).to receive(:requires_modify_or_create?).and_return(false)
       @provider.action_create
     end
 
     it "should call modify_env if the key exists with provided user and values are not equal" do
-      @provider.key_exists = true
+      allow(@provider).to receive(:key_exists?).and_return(true)
       allow(@provider).to receive(:requires_modify_or_create?).and_return(true)
       expect(@provider).to receive(:modify_env).and_return(true)
       @provider.action_create
     end
 
     it "should set the new_resources updated flag when it updates an existing value" do
-      @provider.key_exists = true
+      allow(@provider).to receive(:key_exists?).and_return(true)
       allow(@provider).to receive(:requires_modify_or_create?).and_return(true)
       allow(@provider).to receive(:modify_env).and_return(true)
       @provider.action_create
@@ -118,7 +102,7 @@ describe Chef::Provider::WindowsEnv, :windows_only do
   describe "action_delete" do
     before(:each) do
       @provider.current_resource = @current_resource
-      @provider.key_exists = false
+      allow(@provider).to receive(:key_exists?).and_return(false)
       allow(@provider).to receive(:delete_element).and_return(false)
       allow(@provider).to receive(:delete_env).and_return(true)
     end
@@ -134,13 +118,13 @@ describe Chef::Provider::WindowsEnv, :windows_only do
     end
 
     it "should call delete_env if the key exists" do
-      @provider.key_exists = true
+      allow(@provider).to receive(:key_exists?).and_return(true)
       expect(@provider).to receive(:delete_env)
       @provider.action_delete
     end
 
     it "should set the new_resources updated flag to true if the key is deleted" do
-      @provider.key_exists = true
+      allow(@provider).to receive(:key_exists?).and_return(true)
       @provider.action_delete
       expect(@new_resource).to be_updated
     end
@@ -149,7 +133,7 @@ describe Chef::Provider::WindowsEnv, :windows_only do
   describe "action_modify" do
     before(:each) do
       @provider.current_resource = @current_resource
-      @provider.key_exists = true
+      allow(@provider).to receive(:key_exists?).and_return(true)
       allow(@provider).to receive(:modify_env).and_return(true)
     end
 
@@ -179,7 +163,7 @@ describe Chef::Provider::WindowsEnv, :windows_only do
     end
 
     it "should raise a Chef::Exceptions::WindowsEnv if the key doesn't exist" do
-      @provider.key_exists = false
+      allow(@provider).to receive(:key_exists?).and_return(false)
       expect { @provider.action_modify }.to raise_error(Chef::Exceptions::WindowsEnv)
     end
   end
@@ -324,12 +308,12 @@ describe Chef::Provider::WindowsEnv, :windows_only do
 
   context "when environment variable is not PATH" do
     let(:new_resource) do
-      new_resource = Chef::Resource::WindowsEnv.new("CHEF_WINDOWS_ENV_TEST")
+      new_resource = Chef::Resource::WindowsEnv.new("CHEF_WINDOWS_ENV_TEST", run_context)
       new_resource.value("foo")
       new_resource
     end
     let(:provider) do
-      provider = Chef::Provider::WindowsEnv.new(new_resource, run_context)
+      provider = new_resource.provider_for_action(:create)
       allow(provider).to receive(:env_obj).and_return(double("null object").as_null_object)
       provider
     end
@@ -337,7 +321,7 @@ describe Chef::Provider::WindowsEnv, :windows_only do
     describe "action_create" do
       before do
         ENV.delete("CHEF_WINDOWS_ENV_TEST")
-        provider.key_exists = false
+        allow(provider).to receive(:key_exists?).and_return(false)
       end
 
       it "should update the ruby ENV object when it creates the key" do
@@ -376,12 +360,12 @@ describe Chef::Provider::WindowsEnv, :windows_only do
       let(:system_root) { "%SystemRoot%" }
       let(:system_root_value) { 'D:\Windows' }
       let(:new_resource) do
-        new_resource = Chef::Resource::WindowsEnv.new("PATH")
+        new_resource = Chef::Resource::WindowsEnv.new("PATH", run_context)
         new_resource.value(system_root)
         new_resource
       end
       let(:provider) do
-        provider = Chef::Provider::WindowsEnv.new(new_resource, run_context)
+        provider = new_resource.provider_for_action(:create)
         allow(provider).to receive(:env_obj).and_return(double("null object").as_null_object)
         provider
       end

data/spec/unit/provider/windows_path_spec.rb

@@ -18,7 +18,7 @@
 
 require "spec_helper"
 
-describe Chef::Provider::WindowsPath, :windows_only do
+describe "windows_path provider", :windows_only do
   before(:all) do
     @old_path = ENV["PATH"].dup
   end
@@ -27,14 +27,9 @@ describe Chef::Provider::WindowsPath, :windows_only do
     ENV["PATH"] = @old_path
   end
 
-  let(:new_resource) { Chef::Resource::WindowsPath.new("some_path") }
-
-  let(:provider) do
-    node = Chef::Node.new
-    events = Chef::EventDispatch::Dispatcher.new
-    run_context = Chef::RunContext.new(node, {}, events)
-    Chef::Provider::WindowsPath.new(new_resource, run_context)
-  end
+  let(:run_context) { Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new) }
+  let(:new_resource) { Chef::Resource::WindowsPath.new("some_path", run_context) }
+  let(:provider) { new_resource.provider_for_action(:add) }
 
   describe "#load_current_resource" do
     it "returns a current_resource" do
@@ -50,7 +45,7 @@ describe Chef::Provider::WindowsPath, :windows_only do
   describe "#action_add" do
     it "uses env resource to add 'path' environment variable" do
       allow(provider).to receive(:expand_env_vars)
-      expect(provider).to receive(:declare_resource).with(:env, "path")
+      expect(provider).to receive(:declare_resource).with(:env, "path", hash_including)
       provider.run_action(:add)
     end
   end
@@ -58,7 +53,7 @@ describe Chef::Provider::WindowsPath, :windows_only do
   describe "#action_remove" do
     it "uses env resource to remove 'path' environment variable" do
       allow(provider).to receive(:expand_env_vars)
-      expect(provider).to receive(:declare_resource).with(:env, "path")
+      expect(provider).to receive(:declare_resource).with(:env, "path", hash_including)
       provider.run_action(:remove)
     end
   end

data/spec/unit/provider/windows_task_spec.rb

@@ -18,15 +18,16 @@
 
 require "spec_helper"
 
-describe Chef::Provider::WindowsTask, :windows_only do
-  let(:new_resource) { Chef::Resource::WindowsTask.new("sample_task") }
+describe "windows_task provider", :windows_only do
+  let(:new_resource) { Chef::Resource::WindowsTask.new("sample_task", run_context) }
   let(:current_resource) { Chef::Resource::WindowsTask.new }
 
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
   let(:provider) do
-    node = Chef::Node.new
-    events = Chef::EventDispatch::Dispatcher.new
-    run_context = Chef::RunContext.new(node, {}, events)
-    Chef::Provider::WindowsTask.new(new_resource, run_context)
+    new_resource.provider_for_action(:create)
   end
 
   describe "#load_current_resource" do

data/spec/unit/resource/breakpoint_spec.rb

@@ -58,7 +58,7 @@ describe Chef::Resource::Breakpoint do
 
   it "names itself after the line number of the file where it's created" do
     resource = Chef::Resource::Breakpoint.new
-    expect(resource.name).to match(/breakpoint_spec\.rb\:[\d]{2}\:in \`new\'$/)
+    expect(resource.name).to match(/breakpoint_spec\.rb\:\d{2}\:in \`new\'$/)
   end
 
 end