chef 15.11.3-universal-mingw32 → 16.1.16-universal-mingw32

data/spec/unit/resource/cron_spec.rb

@@ -115,19 +115,19 @@ describe Chef::Resource::Cron do
   end
 
   it "rejects any minute over 59" do
-    expect { resource.minute "60" }.to raise_error(RangeError)
+    expect { resource.minute "60" }.to raise_error(Chef::Exceptions::ValidationFailed)
   end
 
   it "rejects any hour over 23" do
-    expect { resource.hour "24" }.to raise_error(RangeError)
+    expect { resource.hour "24" }.to raise_error(Chef::Exceptions::ValidationFailed)
   end
 
   it "rejects any day over 31" do
-    expect { resource.day "32" }.to raise_error(RangeError)
+    expect { resource.day "32" }.to raise_error(Chef::Exceptions::ValidationFailed)
   end
 
   it "rejects any month over 12" do
-    expect { resource.month "13" }.to raise_error(RangeError)
+    expect { resource.month "13" }.to raise_error(Chef::Exceptions::ValidationFailed)
   end
 
   describe "weekday" do
@@ -139,12 +139,6 @@ describe Chef::Resource::Cron do
     end
   end
 
-  it "converts integer schedule values to a string" do
-    %w{minute hour day month weekday}.each do |x|
-      expect(resource.send(x, 5)).to eql("5")
-    end
-  end
-
   describe "when it has a time (minute, hour, day, month, weekend) and user" do
     before do
       resource.command("tackle")

data/spec/unit/resource/gem_package_spec.rb

@@ -53,11 +53,11 @@ describe Chef::Resource::GemPackage, "gem_binary" do
   end
 end
 
-describe Chef::Resource::GemPackage, "clear_gem_sources" do
+describe Chef::Resource::GemPackage, "clear_sources" do
   let(:resource) { Chef::Resource::GemPackage.new("foo") }
 
-  it "is false by default" do
-    expect(resource.clear_sources).to be false
+  it "is nil by default" do
+    expect(resource.clear_sources).to be_nil
   end
 
   it "sets the default of clear_sources to the config value" do

data/spec/unit/resource/helpers/cron_validations_spec.rb

@@ -0,0 +1,77 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "chef/resource/helpers/cron_validations"
+
+describe Chef::ResourceHelpers::CronValidations do
+  context "#validate_dow" do
+    it "it accepts a string day" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_dow("mon")).to be true
+    end
+
+    it "it accepts an integer day" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_dow(0)).to be true
+    end
+
+    it "it accepts the string of *" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_dow("*")).to be true
+    end
+
+    it "returns false for an out of range integer" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_dow(8)).to be false
+    end
+
+    it "returns false for an invalid string" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_dow("monday")).to be false
+    end
+  end
+
+  context "#validate_month" do
+    it "it accepts a string month" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_month("feb")).to be true
+    end
+
+    it "it accepts an integer month" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_month(2)).to be true
+    end
+
+    it "it accepts the string of *" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_month("*")).to be true
+    end
+
+    it "returns false for an out of range integer" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_month(13)).to be false
+    end
+
+    it "returns false for an invalid string (typo)" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_month("janurary")).to be false
+    end
+  end
+
+  context "#validate_numeric" do
+    it "returns true if the value is in the allowed range" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_numeric(5, 1, 100)).to be true
+    end
+
+    it "returns false if the value less than the allowed range" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_numeric(-1, 1, 100)).to be false
+    end
+
+    it "returns false if the value more than the allowed range" do
+      expect(Chef::ResourceHelpers::CronValidations.validate_numeric(101, 1, 100)).to be false
+    end
+  end
+end

data/spec/unit/resource/link_spec.rb

@@ -22,10 +22,6 @@ require "spec_helper"
 describe Chef::Resource::Link do
   let(:resource) { Chef::Resource::Link.new("fakey_fakerton") }
 
-  before(:each) do
-    expect_any_instance_of(Chef::Resource::Link).to receive(:verify_links_supported!).and_return(true)
-  end
-
   it "the target_file property is the name_property" do
     expect(resource.target_file).to eql("fakey_fakerton")
   end

data/spec/unit/resource/locale_spec.rb

@@ -186,38 +186,4 @@ describe Chef::Resource::Locale do
       end
     end
   end
-
-  describe "#up_to_date?" do
-    context "when file does not exists" do
-      it "returns false" do
-        allow(File).to receive(:read).and_raise(Errno::ENOENT, "No such file or directory")
-        expect(provider.up_to_date?).to be_falsy
-      end
-    end
-
-    context "when file exists" do
-      let(:content) { "LANG=en_US\nLC_MESSAGES=en_AG.utf8\nLC_TIME=en_AG.utf8\n" }
-      before do
-        allow(provider).to receive(:new_content).and_return(content)
-      end
-      context "but is empty" do
-        it "returns false" do
-          allow(File).to receive(:read).and_return("")
-          expect(provider.up_to_date?).to be_falsy
-        end
-      end
-      context "and contains old key-vals" do
-        it "returns false" do
-          allow(File).to receive(:read).and_return("LC_MESSAGES=en_AG.utf8\n")
-          expect(provider.up_to_date?).to be_falsy
-        end
-      end
-      context "and contains new key-vals" do
-        it "returns true" do
-          allow(File).to receive(:read).and_return(content)
-          expect(provider.up_to_date?).to be_truthy
-        end
-      end
-    end
-  end
 end

data/spec/unit/resource/msu_package_spec.rb

@@ -60,4 +60,8 @@ describe Chef::Resource::MsuPackage do
     resource.source("package.msu")
     expect(resource.source).not_to eq("package.msu")
   end
+
+  it "sets timeout property to 3600 by default" do
+    expect(resource.timeout).to eql(3600)
+  end
 end

data/spec/unit/resource/ohai_spec.rb

@@ -19,8 +19,11 @@
 require "spec_helper"
 
 describe Chef::Resource::Ohai do
-
-  let(:resource) { Chef::Resource::Ohai.new("fakey_fakerton") }
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:resource) { Chef::Resource::Ohai.new("fakey_fakerton", run_context) }
+  let(:provider) { resource.provider_for_action(:reload) }
 
   it "has a resource name of :ohai" do
     expect(resource.resource_name).to eql(:ohai)
@@ -55,4 +58,55 @@ describe Chef::Resource::Ohai do
     end
   end
 
+  describe "reload action" do
+    before(:each) do
+      # Copied from client_spec
+      @fqdn = "hostname.domainname"
+      @hostname = "hostname"
+      @platform = "example-platform"
+      @platform_version = "example-platform"
+      Chef::Config[:node_name] = @fqdn
+      mock_ohai = {
+        fqdn: @fqdn,
+        hostname: @hostname,
+        platform: @platform,
+        platform_version: @platform_version,
+        data: {
+          origdata: "somevalue",
+        },
+        data2: {
+          origdata: "somevalue",
+          newdata: "somevalue",
+        },
+      }
+      allow(mock_ohai).to receive(:all_plugins).and_return(true)
+      allow(mock_ohai).to receive(:data).and_return(mock_ohai[:data],
+        mock_ohai[:data2])
+      allow(Ohai::System).to receive(:new).and_return(mock_ohai)
+      allow(Chef::Platform).to receive(:find_platform_and_version).and_return({ "platform" => @platform,
+                                                                                "platform_version" => @platform_version })
+      # Fake node with a dummy save
+      node.name(@fqdn)
+      allow(node).to receive(:save).and_return(node)
+      ohai = Ohai::System.new
+      ohai.all_plugins
+      node.consume_external_attrs(ohai.data, {})
+      node.automatic_attrs[:origdata] = "somevalue"
+    end
+
+    it "applies updated ohai data to the node" do
+      expect(node[:origdata]).to eq("somevalue")
+      expect(node[:newdata]).to be_nil
+      provider.run_action(:reload)
+      expect(node[:origdata]).to eq("somevalue")
+      expect(node[:newdata]).to eq("somevalue")
+    end
+
+    it "supports reloading a specific plugin and causes node to pick up new values" do
+      resource.plugin "someplugin"
+      provider.run_action(:reload)
+      expect(node[:origdata]).to eq("somevalue")
+      expect(node[:newdata]).to eq("somevalue")
+    end
+  end
 end

data/spec/unit/resource/plist_spec.rb

@@ -0,0 +1,130 @@
+#
+# Author:: Tim Smith (<tsmith@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: 2017-2020, Microsoft Corporation
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Resource::PlistResource do
+  let(:resource) { Chef::Resource::PlistResource.new("fakey_fakerton") }
+
+  it "sets the default action as :set" do
+    expect(resource.action).to eql([:set])
+  end
+
+  it "path is the name property" do
+    expect(resource.path).to eql("fakey_fakerton")
+  end
+
+  describe "#plistbuddy_command" do
+    it "the bool arguments contain the data type" do
+      expect(resource.plistbuddy_command(:add, "FooEntry", "path/to/file.plist", true)).to eq "/usr/libexec/PlistBuddy -c 'Add :\"FooEntry\" bool' \"path/to/file.plist\""
+    end
+
+    it "the add command only adds the data type" do
+      expect(resource.plistbuddy_command(:add, "QuuxEntry", "path/to/file.plist", 50)).to eq "/usr/libexec/PlistBuddy -c 'Add :\"QuuxEntry\" integer' \"path/to/file.plist\""
+    end
+
+    it "the delete command is formatted properly" do
+      expect(resource.plistbuddy_command(:delete, "BarEntry", "path/to/file.plist")).to eq "/usr/libexec/PlistBuddy -c 'Delete :\"BarEntry\"' \"path/to/file.plist\""
+    end
+
+    it "the set command is formatted properly" do
+      expect(resource.plistbuddy_command(:set, "BazEntry", "path/to/file.plist", false)).to eq "/usr/libexec/PlistBuddy -c 'Set :\"BazEntry\" false' \"path/to/file.plist\""
+    end
+
+    it "the print command is formatted properly" do
+      expect(resource.plistbuddy_command(:print, "QuxEntry", "path/to/file.plist")).to eq "/usr/libexec/PlistBuddy -c 'Print :\"QuxEntry\"' \"path/to/file.plist\""
+    end
+
+    it "the command to set a dictionary data type is formatted properly" do
+      expect(resource.plistbuddy_command(:set, "AppleFirstWeekday", "path/to/file.plist", gregorian: 4)).to eq "/usr/libexec/PlistBuddy -c 'Set :\"AppleFirstWeekday\":gregorian 4' \"path/to/file.plist\""
+    end
+
+    it "returns the value properly formatted with double quotes when the value has spaces" do
+      expect(resource.plistbuddy_command(:print, "Foo Bar Baz", "path/to/file.plist")).to eq "/usr/libexec/PlistBuddy -c 'Print :\"Foo Bar Baz\"' \"path/to/file.plist\""
+    end
+
+    it "returns the value properly formatted with double quotes when The value to be added contains spaces" do
+      expect(resource.plistbuddy_command(:add, "Foo Bar Baz", "path/to/file.plist", true)).to eq "/usr/libexec/PlistBuddy -c 'Add :\"Foo Bar Baz\" bool' \"path/to/file.plist\""
+    end
+
+    it "returns the value properly formatted with double quotes when the plist itself contains spaces" do
+      expect(resource.plistbuddy_command(:print, "Foo Bar Baz", "Library/Preferences/com.parallels.Parallels Desktop.plist")).to eq "/usr/libexec/PlistBuddy -c 'Print :\"Foo Bar Baz\"' \"Library/Preferences/com.parallels.Parallels Desktop.plist\""
+    end
+  end
+
+  describe "#convert_to_data_type_from_string" do
+    it "returns true if entry is 1 and the type is boolean" do
+      expect(resource.convert_to_data_type_from_string("boolean", "1")).to eq true
+    end
+
+    it "returns false if entry is 0 and the type is boolean" do
+      expect(resource.convert_to_data_type_from_string("boolean", "0")).to eq false
+    end
+
+    it "returns the value as an integer when the type is integer and the value is 1" do
+      expect(resource.convert_to_data_type_from_string("integer", "1")).to eq 1
+    end
+
+    it "returns the value as an integer when the type is integer and the value is 0" do
+      expect(resource.convert_to_data_type_from_string("integer", "0")).to eq 0
+    end
+
+    it "returns the correct value as an integer when the type is integer and the value is 950224" do
+      expect(resource.convert_to_data_type_from_string("integer", "950224")).to eq 950224
+    end
+
+    it "returns the correct value still as a string when the type is string and the value is also a string" do
+      expect(resource.convert_to_data_type_from_string("string", "corge")).to eq "corge"
+    end
+
+    it "returns the correct value as a float when the type is float and the value is 3.14159265359" do
+      expect(resource.convert_to_data_type_from_string("float", "3.14159265359")).to eq 3.14159265359
+    end
+
+    it "returns an empty string when the type nor the value is given" do
+      expect(resource.convert_to_data_type_from_string(nil, "")).to eq ""
+    end
+  end
+
+  describe "#type_to_commandline_string" do
+    it "returns the required boolean entry type as a string" do
+      expect(resource.type_to_commandline_string(true)).to eq "bool"
+    end
+
+    it "returns the required array entry type as a string" do
+      expect(resource.type_to_commandline_string(%w{foo bar})).to eq "array"
+    end
+
+    it "returns the required dictionary entry type as a string" do
+      expect(resource.type_to_commandline_string("baz" => "qux")).to eq "dict"
+    end
+
+    it "returns the required string entry type as a string" do
+      expect(resource.type_to_commandline_string("quux")).to eq "string"
+    end
+
+    it "returns the required integer entry type as a string" do
+      expect(resource.type_to_commandline_string(1)).to eq "integer"
+    end
+
+    it "returns the required float entry type as a string" do
+      expect(resource.type_to_commandline_string(1.0)).to eq "float"
+    end
+  end
+end

data/spec/unit/resource/powershell_script_spec.rb

@@ -47,11 +47,6 @@ describe Chef::Resource::PowershellScript do
     expect(@resource.convert_boolean_return).to eq(false)
   end
 
-  it "raises an error when architecture is i386 on Windows Nano Server" do
-    allow(Chef::Platform).to receive(:windows_nano_server?).and_return(true)
-    expect { @resource.architecture(:i386) }.to raise_error(Chef::Exceptions::Win32ArchitectureIncorrect, "cannot execute script with requested architecture 'i386' on Windows Nano Server")
-  end
-
   context "when using guards" do
     let(:resource) { @resource }
     before(:each) do

data/spec/unit/resource/{git_spec.rb → scm/git_spec.rb}

@@ -17,6 +17,7 @@
 #
 
 require "spec_helper"
+require_relative "scm"
 
 describe Chef::Resource::Git do
 
@@ -29,8 +30,55 @@ describe Chef::Resource::Git do
 
   let(:resource) { Chef::Resource::Git.new("fakey_fakerton") }
 
-  it "is a subclass of Chef::Resource::Scm" do
-    expect(resource).to be_a_kind_of(Chef::Resource::Scm)
+  it_behaves_like "an SCM resource"
+
+  it "takes the depth as an integer for shallow clones" do
+    resource.depth 5
+    expect(resource.depth).to eq(5)
+    expect { resource.depth "five" }.to raise_error(ArgumentError)
+  end
+
+  it "defaults to nil depth for a full clone" do
+    expect(resource.depth).to be_nil
+  end
+
+  it "takes a boolean for #enable_submodules" do
+    resource.enable_submodules true
+    expect(resource.enable_submodules).to be_truthy
+    expect { resource.enable_submodules "lolz" }.to raise_error(ArgumentError)
+  end
+
+  it "defaults to not enabling submodules" do
+    expect(resource.enable_submodules).to be_falsey
+  end
+
+  it "takes a boolean for #enable_checkout" do
+    resource.enable_checkout true
+    expect(resource.enable_checkout).to be_truthy
+    expect { resource.enable_checkout "lolz" }.to raise_error(ArgumentError)
+  end
+
+  it "defaults to enabling checkout" do
+    expect(resource.enable_checkout).to be_truthy
+  end
+
+  it "takes a string for the remote" do
+    resource.remote "opscode"
+    expect(resource.remote).to eql("opscode")
+    expect { resource.remote 1337 }.to raise_error(ArgumentError)
+  end
+
+  it "defaults to ``origin'' for the remote" do
+    expect(resource.remote).to eq("origin")
+  end
+
+  it "takes a string for the ssh wrapper" do
+    resource.ssh_wrapper "with_ssh_fu"
+    expect(resource.ssh_wrapper).to eql("with_ssh_fu")
+  end
+
+  it "defaults to nil for the ssh wrapper" do
+    expect(resource.ssh_wrapper).to be_nil
   end
 
   it "uses aliases revision as branch" do