chef 14.3.37 → 14.4.56

data/spec/unit/provider/osx_profile_spec.rb

@@ -116,7 +116,7 @@ describe Chef::Provider::OsxProfile do
       allow(provider).to receive(:generate_tempfile).and_return(tempfile)
       allow(provider).to receive(:get_installed_profiles).and_call_original
       allow(provider).to receive(:read_plist).and_return(all_profiles)
-      expect(provider).to receive(:shell_out!).with("profiles -P -o '/tmp/allprofiles.plist'")
+      expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-P", "-o", "/tmp/allprofiles.plist")
       provider.load_current_resource
     end
 
@@ -139,6 +139,7 @@ describe Chef::Provider::OsxProfile do
       new_resource.profile test_profile
       allow(provider).to receive(:get_installed_profiles).and_return(no_profiles)
       provider.load_current_resource
+      expect(provider).to receive(:install_profile)
       expect { provider.run_action(:install) }.to_not raise_error
     end
 
@@ -154,6 +155,7 @@ describe Chef::Provider::OsxProfile do
       new_resource.profile test_profile
       all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
       provider.load_current_resource
+      expect(provider).to receive(:install_profile)
       expect { provider.run_action(:install) }.to_not raise_error
     end
 
@@ -164,7 +166,7 @@ describe Chef::Provider::OsxProfile do
       all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
       provider.load_current_resource
       allow(provider).to receive(:write_profile_to_disk).and_return(profile_path)
-      expect(provider).to receive(:shell_out).with("profiles -I -F '#{profile_path}'").and_return(shell_out_success)
+      expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-I", "-F", profile_path).and_return(shell_out_success)
       provider.action_install()
     end
 
@@ -248,7 +250,7 @@ describe Chef::Provider::OsxProfile do
       new_resource.identifier "com.testprofile.screensaver"
       new_resource.action(:remove)
       provider.load_current_resource
-      expect(provider).to receive(:shell_out).with("profiles -R -p '#{new_resource.identifier}'").and_return(shell_out_success)
+      expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-R", "-p", new_resource.identifier).and_return(shell_out_success)
       provider.action_remove()
     end
   end

data/spec/unit/provider/package/freebsd/pkg_spec.rb

@@ -64,7 +64,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
     end
   end
 
-  describe "when querying for package state and attributes" do
+  describe "when querying for package state and properties" do
     before do
       # @new_resource = Chef::Resource::Package.new("zsh")
 

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

@@ -27,6 +27,19 @@ module GemspecBackcompatCreator
   end
 end
 
+# this is a global variable we construct of the highest rspec-core version which is installed, using APIs which
+# will break out of the bundle -- and done this way so that we can mock all these internal Gem APIs later...
+class RspecVersionString
+  def self.rspec_version_string
+    @rspec_version_string ||= begin
+                                stubs = Gem::Specification.send(:installed_stubs, Gem::Specification.dirs, "rspec-core-*.gemspec")
+                                stubs.select! { |stub| stub.name == "rspec-core" && Gem::Dependency.new("rspec-core", ">= 0").requirement.satisfied_by?(stub.version) }
+                                stubs.max_by(&:version).version.to_s
+                              end
+  end
+end
+RspecVersionString.rspec_version_string
+
 require "spec_helper"
 require "ostruct"
 
@@ -57,7 +70,7 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
   end
 
   it "determines the installed versions of gems from the source index (part2: the unmockening)" do
-    expected = ["rspec-core", Gem::Version.new(RSpec::Core::Version::STRING)]
+    expected = ["rspec-core", Gem::Version.new( RspecVersionString.rspec_version_string )]
     actual = @gem_env.installed_versions(Gem::Dependency.new("rspec-core", nil)).map { |spec| [spec.name, spec.version] }
     expect(actual).to include(expected)
   end
@@ -247,7 +260,7 @@ describe Chef::Provider::Package::Rubygems::AlternateGemEnvironment do
                   end
     skip("cant find your gem executable") if path_to_gem.empty?
     gem_env = Chef::Provider::Package::Rubygems::AlternateGemEnvironment.new(path_to_gem)
-    expected = ["rspec-core", Gem::Version.new(RSpec::Core::Version::STRING)]
+    expected = ["rspec-core", Gem::Version.new( RspecVersionString.rspec_version_string )]
     actual = gem_env.installed_versions(Gem::Dependency.new("rspec-core", nil)).map { |s| [s.name, s.version] }
     expect(actual).to include(expected)
   end
@@ -400,7 +413,7 @@ describe Chef::Provider::Package::Rubygems do
   end
 
   describe "when new_resource version is an rspec version" do
-    let(:current_version) { RSpec::Core::Version::STRING }
+    let(:current_version) { RspecVersionString.rspec_version_string }
     let(:target_version) { current_version }
 
     it "triggers a gem configuration load so a later one will not stomp its config values" do

data/spec/unit/provider/package/windows/exe_spec.rb

@@ -99,7 +99,7 @@ describe Chef::Provider::Package::Windows::Exe do
       end
     end
 
-    it "returns the version attribute if given" do
+    it "returns the version property if given" do
       new_resource.version("v55555")
       expect(provider.package_version).to eql("v55555")
     end

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

@@ -360,6 +360,7 @@ describe Chef::Provider::Package::Windows, :windows_only do
         before do
           new_resource.version("5.5.5")
           allow(provider).to receive(:current_version_array).and_return([ ["5.5.0", "4.3.0", "1.1.1"] ])
+          allow(provider).to receive(:version_compare).and_return(false)
         end
 
         it "installs given version" do

data/spec/unit/provider/package_spec.rb

@@ -702,7 +702,7 @@ describe "Chef::Provider::Package - Multi" do
 
     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.1"])
+      new_resource.version(["1.0", "6.3"])
       provider.run_action(:install)
       expect(new_resource).to be_updated
     end
@@ -714,6 +714,13 @@ describe "Chef::Provider::Package - Multi" do
       expect(new_resource).not_to be_updated_by_last_action
     end
 
+    it "does not install older version" do
+      current_resource.version(["1.1", "6.2"])
+      new_resource.version(["1.0", "6.1"])
+      provider.run_action(:install)
+      expect(new_resource).not_to be_updated_by_last_action
+    end
+
     it "does not install any version if all are installed, and no version was specified" do
       current_resource.version(["1.0", "6.2"])
       provider.run_action(:install)

data/spec/unit/provider/remote_file/cache_control_data_spec.rb

@@ -182,7 +182,7 @@ describe Chef::Provider::RemoteFile::CacheControlData do
       cache_control_data.checksum = fetched_file_checksum
     end
 
-    it "serializes its attributes to JSON" do
+    it "serializes its properties to JSON" do
       # we have to test this separately because ruby 1.8 hash order is unstable
       # so we can't count on the order of the keys in the json format.
 

data/spec/unit/provider/route_spec.rb

@@ -72,7 +72,7 @@ describe Chef::Provider::Route do
         expect(provider.is_running).to be_falsey
       end
 
-      it "should detect existing routes and set is_running attribute correctly" do
+      it "should detect existing routes and set is_running property correctly" do
         resource = Chef::Resource::Route.new("192.168.100.0/24")
         allow(resource).to receive(:gateway).and_return("192.168.132.9")
         allow(resource).to receive(:device).and_return("eth0")
@@ -114,7 +114,7 @@ describe Chef::Provider::Route do
     end
 
     it "should not delete config file for :add action (CHEF-3332)" do
-      @node.automatic_attrs[:platform] = "centos"
+      @node.automatic_attrs[:platform_family] = "rhel"
 
       route_file = StringIO.new
       expect(File).to receive(:new).and_return(route_file)
@@ -167,7 +167,7 @@ describe Chef::Provider::Route do
       expect(@provider.generate_command(:add).join(" ")).not_to match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}/)
     end
 
-    it "should use the gatway when target is default" do
+    it "should use the gateway when target is default" do
       @default_resource.gateway("10.0.0.10")
       expect(@default_provider.generate_command(:add).join(" ")).to match(/10.0.0.10/)
     end
@@ -220,9 +220,9 @@ describe Chef::Provider::Route do
   end
 
   describe Chef::Provider::Route, "generate_config method" do
-    %w{ centos redhat fedora }.each do |platform|
-      it "should write a route file on #{platform} platform" do
-        @node.automatic_attrs[:platform] = platform
+    %w{ rhel fedora amazon }.each do |platform_family|
+      it "should write a route file on #{platform_family} platform family" do
+        @node.automatic_attrs[:platform_family] = platform_family
 
         route_file = StringIO.new
         expect(File).to receive(:new).with("/etc/sysconfig/network-scripts/route-eth0", "w").and_return(route_file)
@@ -231,9 +231,9 @@ describe Chef::Provider::Route do
       end
 
     end
-    %w{ centos redhat fedora }.each do |platform|
-      it "should write a default route file on #{platform} platform" do
-        @node.automatic_attrs[:platform] = platform
+    %w{ rhel fedora amazon }.each do |platform_family|
+      it "should write a default route file on #{platform_family} platform family" do
+        @node.automatic_attrs[:platform_family] = platform_family
 
         route_file = StringIO.new
         allow(File).to receive(:exist?).with("/etc/sysconfig/network").and_return(false)
@@ -245,7 +245,7 @@ describe Chef::Provider::Route do
     end
 
     it "should put all routes for a device in a route config file" do
-      @node.automatic_attrs[:platform] = "centos"
+      @node.automatic_attrs[:platform_family] = "rhel"
 
       route_file = StringIO.new
       expect(File).to receive(:new).and_return(route_file)

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

@@ -35,7 +35,7 @@ describe Chef::Provider::Service::AixInit do
   end
 
   describe "load_current_resource" do
-    it "sets current resource attributes" do
+    it "sets current resource properties" do
       expect(@provider).to receive(:set_current_resource_attributes)
 
       @provider.load_current_resource

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

@@ -91,14 +91,14 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
 
   end
 
-  it "should raise error if the node has a nil ps attribute and no other means to get status" do
+  it "should raise error if the node has a nil ps property and no other means to get status" do
     @node.automatic_attrs[:command] = { ps: nil }
     @provider.define_resource_requirements
     @provider.action = :start
     expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
   end
 
-  it "should raise error if the node has an empty ps attribute and no other means to get status" do
+  it "should raise error if the node has an empty ps property and no other means to get status" do
     @node.automatic_attrs[:command] = { ps: "" }
     @provider.define_resource_requirements
     @provider.action = :start

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

@@ -136,7 +136,7 @@ describe Chef::Provider::Service::Freebsd do
       end
     end
 
-    context "when we have a 'ps' attribute" do
+    context "when we have a 'ps' property" do
       let(:stdout) do
         StringIO.new(<<~PS_SAMPLE)
           413  ??  Ss     0:02.51 /usr/sbin/syslogd -s

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

@@ -108,7 +108,7 @@ PS
 
   describe "when the node has not specified a ps command" do
 
-    it "should raise an error if the node has a nil ps attribute" do
+    it "should raise an error if the node has a nil ps property" do
       @node.automatic_attrs[:command] = { ps: nil }
       @provider.load_current_resource
       @provider.action = :start
@@ -116,7 +116,7 @@ PS
       expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
     end
 
-    it "should raise an error if the node has an empty ps attribute" do
+    it "should raise an error if the node has an empty ps property" do
       @node.automatic_attrs[:command] = { ps: "" }
       @provider.load_current_resource
       @provider.action = :start
@@ -126,7 +126,7 @@ PS
 
   end
 
-  describe "when we have a 'ps' attribute" do
+  describe "when we have a 'ps' property" do
     it "should shell_out! the node's ps command" do
       expect(@provider).to receive(:shell_out!).and_return(@status)
       @provider.load_current_resource

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

@@ -94,14 +94,14 @@ PS
   end
 
   describe "when the node has not specified a ps command" do
-    it "should raise error if the node has a nil ps attribute and no other means to get status" do
+    it "should raise error if the node has a nil ps property and no other means to get status" do
       @node.automatic_attrs[:command] = { ps: nil }
       @provider.action = :start
       @provider.define_resource_requirements
       expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
     end
 
-    it "should raise error if the node has an empty ps attribute and no other means to get status" do
+    it "should raise error if the node has an empty ps property and no other means to get status" do
       @node.automatic_attrs[:command] = { ps: "" }
       @provider.action = :start
       @provider.define_resource_requirements
@@ -110,7 +110,7 @@ PS
 
   end
 
-  describe "when we have a 'ps' attribute" do
+  describe "when we have a 'ps' property" do
     it "should shell_out! the node's ps command" do
       @status = double("Status", exitstatus: 0, stdout: @stdout)
       expect(@provider).to receive(:shell_out!).with(@node[:command][:ps]).and_return(@status)

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

@@ -50,19 +50,19 @@ NOMOCKINGSTRINGSPLZ
     @provider.load_current_resource
   end
 
-  it "should raise error if the node has a nil ps attribute and no other means to get status" do
+  it "should raise error if the node has a nil ps property and no other means to get status" do
     @node.automatic_attrs[:command] = { ps: nil }
     @provider.define_resource_requirements
     expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
   end
 
-  it "should raise error if the node has an empty ps attribute and no other means to get status" do
+  it "should raise error if the node has an empty ps property and no other means to get status" do
     @node.automatic_attrs[:command] = { ps: "" }
     @provider.define_resource_requirements
     expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
   end
 
-  describe "when we have a 'ps' attribute" do
+  describe "when we have a 'ps' property" do
     it "should shell_out! the node's ps command" do
       expect(@provider).to receive(:shell_out!).with(@node[:command][:ps]).and_return(@status)
       @provider.load_current_resource

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

@@ -18,7 +18,6 @@
 #
 
 require "spec_helper"
-require "mixlib/shellout"
 
 describe Chef::Provider::Service::Windows, "load_current_resource", :windows_only do
   include_context "Win32"
@@ -382,7 +381,7 @@ describe Chef::Provider::Service::Windows, "load_current_resource", :windows_onl
         provider.action_configure
       end
 
-      # Attributes that are Strings
+      # properties that are Strings
       %i{binary_path_name load_order_group dependencies run_as_user
          display_name description}.each do |attr|
         it "configures service if #{attr} has changed" do
@@ -394,7 +393,7 @@ describe Chef::Provider::Service::Windows, "load_current_resource", :windows_onl
         end
       end
 
-      # Attributes that are Integers
+      # properties that are Integers
       %i{service_type error_control}.each do |attr|
         it "configures service if #{attr} has changed" do
           provider.current_resource.send("#{attr}=", 1)
@@ -570,7 +569,7 @@ describe Chef::Provider::Service::Windows, "load_current_resource", :windows_onl
         new_resource.run_as_password("Wensleydale")
       end
 
-      it "calls #grant_service_logon if the :run_as_user and :run_as_password attributes are present" do
+      it "calls #grant_service_logon if the :run_as_user and :run_as_password properties are present" do
         expect(Win32::Service).to receive(:start)
         expect(provider).to receive(:grant_service_logon).and_return(true)
         provider.start_service