chef 16.18.30 → 17.0.242

data/spec/unit/resource/homebrew_cask_spec.rb

@@ -19,40 +19,22 @@ require "spec_helper"
 
 describe Chef::Resource::HomebrewCask do
 
-  context "name with under bar" do
-    let(:resource) { Chef::Resource::HomebrewCask.new("fakey_fakerton") }
+  let(:resource) { Chef::Resource::HomebrewCask.new("fakey_fakerton") }
 
-    it "has a resource name of :homebrew_cask" do
-      expect(resource.resource_name).to eql(:homebrew_cask)
-    end
-
-    it "the cask_name property is the name_property" do
-      expect(resource.cask_name).to eql("fakey_fakerton")
-    end
-
-    it "sets the default action as :install" do
-      expect(resource.action).to eql([:install])
-    end
-
-    it "supports :install, :remove actions" do
-      expect { resource.action :install }.not_to raise_error
-      expect { resource.action :remove }.not_to raise_error
-    end
+  it "has a resource name of :homebrew_cask" do
+    expect(resource.resource_name).to eql(:homebrew_cask)
   end
 
-  context "name with high fun" do
-    let(:resource) { Chef::Resource::HomebrewCask.new("fakey-fakerton") }
-
-    it "the cask_name property is the name_property" do
-      expect(resource.cask_name).to eql("fakey-fakerton")
-    end
+  it "the cask_name property is the name_property" do
+    expect(resource.cask_name).to eql("fakey_fakerton")
   end
 
-  context "name with at mark" do
-    let(:resource) { Chef::Resource::HomebrewCask.new("fakey-fakerton@10") }
+  it "sets the default action as :install" do
+    expect(resource.action).to eql([:install])
+  end
 
-    it "the cask_name property is the name_property" do
-      expect(resource.cask_name).to eql("fakey-fakerton@10")
-    end
+  it "supports :install, :remove actions" do
+    expect { resource.action :install }.not_to raise_error
+    expect { resource.action :remove }.not_to raise_error
   end
 end

data/spec/unit/resource/mount_spec.rb

@@ -59,16 +59,6 @@ describe Chef::Resource::Mount do
     expect(resource.mount_point).to eql("//192.168.11.102/Share/backup")
   end
 
-  it "does not strip slash when mount_point is root directory" do
-    resource.mount_point "/"
-    expect(resource.mount_point).to eql("/")
-  end
-
-  it "does not strip slash when mount_point is root of network mount" do
-    resource.mount_point "127.0.0.1:/"
-    expect(resource.mount_point).to eql("127.0.0.1:/")
-  end
-
   it "raises error when mount_point property is not set" do
     expect { resource.mount_point nil }.to raise_error(Chef::Exceptions::ValidationFailed, "Property mount_point must be one of: String!  You passed nil.")
   end

data/spec/unit/resource/powershell_script_spec.rb

@@ -47,9 +47,9 @@ describe Chef::Resource::PowershellScript do
     expect(resource.convert_boolean_return).to eq(false)
   end
 
-  it "inherits exactly the :cwd, :domain, :environment, :group, :password, :path, :user, :umask, :architecture, :elevated, :interpreter properties from a parent resource class" do
+  it "inherits exactly the :cwd, :domain, :environment, :group, :password, :path, :user, :umask, :architecture, :elevated, :interpreter, :login properties from a parent resource class" do
     inherited_difference = Chef::Resource::PowershellScript.guard_inherited_attributes -
-      %i{cwd domain environment group password path user umask architecture elevated interpreter}
+      %i{cwd domain environment group password path user umask architecture elevated interpreter login}
 
     expect(inherited_difference).to eq([])
   end

data/spec/unit/resource/rhsm_subscription_spec.rb

@@ -18,24 +18,15 @@
 require "spec_helper"
 
 describe Chef::Resource::RhsmSubscription do
-  let(:event_dispatch) { Chef::EventDispatch::Dispatcher.new }
-  let(:node) { Chef::Node.new }
-  let(:run_context) { Chef::RunContext.new(node, {}, event_dispatch) }
-
-  let(:pool_id) { "8a8dd78c766232550226b46e59404aba" }
-  let(:resource) { Chef::Resource::RhsmSubscription.new(pool_id, run_context) }
-  let(:provider) { resource.provider_for_action(Array(resource.action).first) }
-
-  before do
-    allow(resource).to receive(:provider_for_action).with(:attach).and_return(provider)
-  end
+  let(:resource) { Chef::Resource::RhsmSubscription.new("fakey_fakerton") }
+  let(:provider) { resource.provider_for_action(:attach) }
 
   it "has a resource name of :rhsm_subscription" do
     expect(resource.resource_name).to eql(:rhsm_subscription)
   end
 
   it "the pool_id property is the name_property" do
-    expect(resource.pool_id).to eql(pool_id)
+    expect(resource.pool_id).to eql("fakey_fakerton")
   end
 
   it "sets the default action as :attach" do
@@ -47,44 +38,6 @@ describe Chef::Resource::RhsmSubscription do
     expect { resource.action :remove }.not_to raise_error
   end
 
-  describe "#action_attach" do
-    let(:yum_package_double) { instance_double("Chef::Resource::YumPackage") }
-    let(:so_double) { instance_double("Mixlib::ShellOut", stdout: "Successfully attached a subscription for: My Subscription", exitstatus: 0, error?: false) }
-
-    before do
-      allow(provider).to receive(:shell_out!).with("subscription-manager attach --pool=#{resource.pool_id}").and_return(so_double)
-      allow(provider).to receive(:build_resource).with(:package, "rhsm_subscription-#{pool_id}-flush_cache").and_return(yum_package_double)
-      allow(yum_package_double).to receive(:run_action).with(:flush_cache)
-    end
-
-    context "when already attached to pool" do
-      before do
-        allow(provider).to receive(:subscription_attached?).with(resource.pool_id).and_return(true)
-      end
-
-      it "does not attach to pool" do
-        expect(provider).not_to receive(:shell_out!)
-        resource.run_action(:attach)
-      end
-    end
-
-    context "when not attached to pool" do
-      before do
-        allow(provider).to receive(:subscription_attached?).with(resource.pool_id).and_return(false)
-      end
-
-      it "attaches to pool" do
-        expect(provider).to receive(:shell_out!).with("subscription-manager attach --pool=#{resource.pool_id}")
-        resource.run_action(:attach)
-      end
-
-      it "flushes package provider cache" do
-        expect(yum_package_double).to receive(:run_action).with(:flush_cache)
-        resource.run_action(:attach)
-      end
-    end
-  end
-
   describe "#subscription_attached?" do
     let(:cmd)    { double("cmd") }
     let(:output) { "Pool ID:    pool123" }

data/spec/unit/resource/systemd_unit_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::Resource::SystemdUnit do
   let(:resource) { Chef::Resource::SystemdUnit.new("sysstat-collect.timer") }
-  let(:unit_content_string) { "[Unit]\nDescription=Run system activity accounting tool every 10 minutes\nDocumentation=foo\nDocumentation=bar\n\n[Timer]\nOnCalendar=*:00/10\n\n[Install]\nWantedBy=sysstat.service\n" }
+  let(:unit_content_string) { "[Unit]\nDescription = Run system activity accounting tool every 10 minutes\nDocumentation = foo\nDocumentation = bar\n\n[Timer]\nOnCalendar = *:00/10\n\n[Install]\nWantedBy = sysstat.service\n" }
   let(:unit_content_hash) do
     {
       "Unit" => {

data/spec/unit/resource/user_ulimit_spec.rb

@@ -17,6 +17,7 @@
 #
 
 require "spec_helper"
+
 describe Chef::Resource::UserUlimit do
   let(:node) { Chef::Node.new }
   let(:events) { Chef::EventDispatch::Dispatcher.new }
@@ -49,18 +50,4 @@ describe Chef::Resource::UserUlimit do
     expect { resource.action :create }.not_to raise_error
     expect { resource.action :delete }.not_to raise_error
   end
-
-  describe "sensitive attribute" do
-    context "should be insensitive by default" do
-      it { expect(resource.sensitive).to(be_falsey) }
-    end
-
-    context "when set" do
-      before { resource.sensitive(true) }
-
-      it "should be set on the resource" do
-        expect(resource.sensitive).to(be_truthy)
-      end
-    end
-  end
 end

data/spec/unit/resource/windows_task_spec.rb

@@ -218,7 +218,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
     end
 
     it "raise error when priority value less than 0" do
-      expect { resource.priority (-1) }.to raise_error(Chef::Exceptions::ValidationFailed, "Option priority's value -1 should be in range of 0 to 10!")
+      expect { resource.priority(-1) }.to raise_error(Chef::Exceptions::ValidationFailed, "Option priority's value -1 should be in range of 0 to 10!")
     end
 
     it "raise error when priority values is greater than 10" do

data/spec/unit/resource_spec.rb

@@ -348,11 +348,6 @@ describe Chef::Resource do
     it "should recognize dynamically defined resources" do
       expect(resource.defined_at).to eq("dynamically defined")
     end
-
-    it "should return nil for the cookbook_version when the cookbook_name is @recipe_files" do
-      resource.cookbook_name = "@recipe_files"
-      expect(resource.cookbook_version).to be nil
-    end
   end
 
   describe "to_s" do
@@ -931,14 +926,14 @@ describe Chef::Resource do
 
     it "adds mappings for all platforms", ruby: "< 2.7" do
       expect(Chef.resource_handler_map).to receive(:set).with(
-        :tape_deck, Chef::Resource::Klz
+        :tape_deck, Chef::Resource::Klz, {}
       )
       klz.provides :tape_deck
     end
 
     it "adds mappings for all platforms", ruby: ">= 2.7" do
       expect(Chef.resource_handler_map).to receive(:set).with(
-        :tape_deck, Chef::Resource::Klz, {}
+        :tape_deck, Chef::Resource::Klz
       )
       klz.provides :tape_deck
     end

data/spec/unit/user_spec.rb

@@ -201,7 +201,7 @@ describe Chef::User do
   end
 
   describe "API Interactions" do
-    before (:each) do
+    before(:each) do
       @user = Chef::User.new
       @user.name "foobar"
       @http_client = double("Chef::ServerAPI mock")

data/spec/unit/user_v1_spec.rb

@@ -176,8 +176,10 @@ describe Chef::UserV1 do
       expect(@user.to_json).to include(%{"display_name":"get_displayed"})
     end
 
-    it "does not include the display name if not present" do
-      expect(@json).not_to include("display_name")
+    it "does not include the display name if user name not present" do
+      unless @user.username
+        expect(@json).not_to include("display_name")
+      end
     end
 
     it "includes the first name when present" do
@@ -314,7 +316,7 @@ describe Chef::UserV1 do
     let(:response_406) { OpenStruct.new(code: "406") }
     let(:exception_406) { Net::HTTPClientException.new("406 Not Acceptable", response_406) }
 
-    before (:each) do
+    before(:each) do
       @user = Chef::UserV1.new
       allow(@user).to receive(:chef_root_rest_v0).and_return(double("chef rest root v0 object"))
       allow(@user).to receive(:chef_root_rest_v1).and_return(double("chef rest root v1 object"))
@@ -535,7 +537,7 @@ describe Chef::UserV1 do
   end # Versioned API Interactions
 
   describe "API Interactions" do
-    before (:each) do
+    before(:each) do
       @user = Chef::UserV1.new
       @user.username "foobar"
       @http_client = double("Chef::ServerAPI mock")

data/spec/unit/util/dsc/local_configuration_manager_spec.rb

@@ -50,7 +50,7 @@ describe Chef::Util::DSC::LocalConfigurationManager do
   end
 
   let(:powershell) do
-    double("ChefPowerShell::PowerShell", errors: lcm_errors, error?: !lcm_errors.empty?, result: lcm_result)
+    double("Chef::PowerShell", errors: lcm_errors, error?: !lcm_errors.empty?, result: lcm_result)
   end
 
   describe "test_configuration method invocation" do
@@ -185,7 +185,7 @@ describe Chef::Util::DSC::LocalConfigurationManager do
     context "when invalid dsc script is given" do
       it "raises exception" do
         configuration_document = "invalid-config"
-        expect { lcm.send(:run_configuration_cmdlet, configuration_document, true) }.to raise_error(ChefPowerShell::PowerShellExceptions::PowerShellCommandFailed)
+        expect { lcm.send(:run_configuration_cmdlet, configuration_document, true) }.to raise_error(Chef::PowerShell::CommandFailed)
       end
     end
   end

data/tasks/rspec.rb

@@ -25,8 +25,9 @@ begin
 
   desc "Run specs for Chef's Gem Components"
   task :component_specs do
-    %w{chef-utils chef-config}.each do |gem|
+    %w{chef-utils chef-config knife}.each do |gem|
       Dir.chdir(gem) do
+        puts "--- Running #{gem} specs"
         Bundler.with_unbundled_env do
           sh("bundle install --jobs=3 --retry=3 --path=../vendor/bundle")
           sh("bundle exec rake spec")
@@ -39,19 +40,24 @@ begin
 
   task spec: :component_specs
 
-  desc "Run all specs in spec directory"
+  desc "Run all chef specs in spec directory"
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.verbose = false
     t.rspec_opts = %w{--profile}
-    t.pattern = FileList["spec/**/*_spec.rb"]
+    t.pattern = FileList["spec/**/*_spec.rb"].reject do |path|
+      path =~ /knife.*/
+    end
   end
 
   namespace :spec do
-    desc "Run all specs in spec directory"
+    desc "Run all chef specs in spec directory"
     RSpec::Core::RakeTask.new(:all) do |t|
       t.verbose = false
       t.rspec_opts = %w{--profile}
       t.pattern = FileList["spec/**/*_spec.rb"]
+      t.pattern = FileList["spec/**/*_spec.rb"].reject do |path|
+        path =~ /knife.*/
+      end
     end
 
     desc "Print Specdoc for all specs"
@@ -61,7 +67,7 @@ begin
       t.pattern = FileList["spec/**/*_spec.rb"]
     end
 
-    desc "Run the specs under spec/unit with activesupport loaded"
+    desc "Run chef's node and role unit specs with activesupport loaded"
     RSpec::Core::RakeTask.new(:activesupport) do |t|
       t.verbose = false
       t.rspec_opts = %w{--require active_support/core_ext --profile}
@@ -70,11 +76,13 @@ begin
     end
 
     %i{unit functional integration stress}.each do |sub|
-      desc "Run the specs under spec/#{sub}"
+      desc "Run the chef specs under spec/#{sub}"
       RSpec::Core::RakeTask.new(sub) do |t|
         t.verbose = false
         t.rspec_opts = %w{--profile}
-        t.pattern = FileList["spec/#{sub}/**/*_spec.rb"]
+        t.pattern = FileList["spec/#{sub}/**/*_spec.rb"].reject do |path|
+          path =~ /knife.*/
+        end
       end
     end
   end