chef 15.4.45-universal-mingw32 → 15.5.9-universal-mingw32

data/spec/unit/cookbook/cookbook_version_loader_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::Cookbook::CookbookVersionLoader do
   before do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
   end
 
   describe "loading a cookbook" do

data/spec/unit/cookbook/syntax_check_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ require "chef/cookbook/syntax_check"
 
 describe Chef::Cookbook::SyntaxCheck do
   before do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
   end
 
   let(:cookbook_path) { File.join(CHEF_SPEC_DATA, "cookbooks", "openldap") }

data/spec/unit/cookbook_loader_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::CookbookLoader do
   before do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
   end
   let(:repo_paths) do
     [
@@ -101,7 +101,7 @@ describe Chef::CookbookLoader do
         cookbook_loader.each_key do |cookbook_name|
           seen << cookbook_name
         end
-        expect(seen).to eq %w{angrybash apache2 borken ignorken irssi java name-mismatch openldap preseed supports-platform-constraints wget}
+        expect(seen).to eq %w{angrybash apache2 borken ignorken irssi java name-mismatch openldap preseed starter supports-platform-constraints wget}
       end
     end
 

data/spec/unit/cookbook_uploader_spec.rb

@@ -21,9 +21,10 @@ require "spec_helper"
 describe Chef::CookbookUploader do
 
   let(:http_client) { double("Chef::ServerAPI") }
+  let(:cookbook_path) { File.join(CHEF_SPEC_DATA, "cookbooks") }
 
   let(:cookbook_loader) do
-    loader = Chef::CookbookLoader.new(File.join(CHEF_SPEC_DATA, "cookbooks"))
+    loader = Chef::CookbookLoader.new(cookbook_path)
     loader.load_cookbooks
     loader.cookbooks_by_name["apache2"].identifier = apache2_identifier
     loader.cookbooks_by_name["java"].identifier = java_identifier
@@ -55,6 +56,10 @@ describe Chef::CookbookUploader do
 
   let(:uploader) { described_class.new(cookbooks_to_upload, rest: http_client, policy_mode: policy_mode) }
 
+  before do
+    allow(Chef::Config).to receive(:cookbook_path) { cookbook_path }
+  end
+
   it "defaults to not enabling policy mode" do
     expect(described_class.new(cookbooks_to_upload, rest: http_client).policy_mode?).to be(false)
   end

data/spec/unit/data_bag_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@ require "chef/data_bag"
 describe Chef::DataBag do
   before(:each) do
     @data_bag = Chef::DataBag.new
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
   end
 
   describe "initialize" do

data/spec/unit/data_collector_spec.rb

@@ -46,6 +46,8 @@ describe Chef::DataCollector do
 
   let(:run_list) { node.run_list }
 
+  let(:cookbooks) { node.fetch("cookbooks", {}) }
+
   let(:run_id) { run_status.run_id }
 
   let(:expansion) { Chef::RunList::RunListExpansion.new("_default", run_list.run_list_items) }
@@ -211,6 +213,11 @@ describe Chef::DataCollector do
       send_run_failed_or_completed_event
     end
 
+    it "has a cookbooks" do
+      expect_converge_message("cookbooks" => cookbooks)
+      send_run_failed_or_completed_event
+    end
+
     it "has a source" do
       expect_converge_message("source" => "chef_client")
       send_run_failed_or_completed_event

data/spec/unit/dsl/platform_introspection_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Seth Falcon (<seth@chef.io>)
-# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -127,3 +127,33 @@ describe Chef::DSL::PlatformIntrospection::PlatformFamilyDependentValue do
   end
 
 end
+
+describe "ChefHelper functions mixed into classes" do
+  METHODS = %i{windows? fedora_derived? bsd_based? rhel? aix? gentoo?}.freeze
+
+  METHODS.each do |method|
+    it "mixes #{method} into Chef::Resource instances" do
+      expect(Chef::Resource.instance_methods.include?(method)).to be true
+    end
+
+    it "mixes #{method} into Chef::Resource classes (provides lines, etc)" do
+      expect(Chef::Resource.respond_to?(method)).to be true
+    end
+
+    it "mixes #{method} into Chef::Provider instances (actions)" do
+      expect(Chef::Provider.instance_methods.include?(method)).to be true
+    end
+
+    it "mixes #{method} into Chef::Provider classes (provides lines, etc)" do
+      expect(Chef::Provider.respond_to?(method)).to be true
+    end
+
+    it "mixes #{method} into Chef::Recipe instances (recipe files)" do
+      expect(Chef::Recipe.instance_methods.include?(method)).to be true
+    end
+
+    it "mixes #{method} into Chef::Node instances (attribute files)" do
+      expect(Chef::Recipe.instance_methods.include?(method)).to be true
+    end
+  end
+end

data/spec/unit/file_content_management/deploy/mv_windows_spec.rb

@@ -18,7 +18,7 @@
 
 require "spec_helper"
 
-unless Chef::Platform.windows?
+unless ChefUtils.windows?
   class Chef
     module ReservedNames
       module Win32

data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/knife/cookbook_metadata_from_file_spec.rb

@@ -40,6 +40,13 @@ describe Chef::Knife::CookbookMetadataFromFile do
   end
 
   describe "run" do
+    it "should print usage and exit when a FILE is not provided" do
+      @knife.name_args = []
+      expect(@knife).to receive(:show_usage)
+      expect(@knife.ui).to receive(:fatal).with(/You must specify the FILE./)
+      expect { @knife.run }.to raise_error(SystemExit)
+    end
+
     it "should determine cookbook name from path" do
       expect(@md).to receive(:name).with(no_args)
       expect(@md).to receive(:name).with("quick_start")

data/spec/unit/knife/cookbook_show_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright 2008-2017, Chef Software Inc.
-# License:: Apache License, eersion 2.0
+# 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.

data/spec/unit/knife/core/gem_glob_loader_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
   let(:plugin_dir) { File.join(home, ".chef", "plugins", "knife") }
 
   before do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
     Chef::Util::PathHelper.class_variable_set(:@@home_dir, home)
   end
 

data/spec/unit/knife/core/hashed_command_loader_spec.rb

@@ -19,7 +19,7 @@ require "spec_helper"
 
 describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
   before do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
   end
 
   let(:plugin_manifest) do

data/spec/unit/knife/core/subcommand_loader_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Knife::SubcommandLoader do
   let(:plugin_dir) { File.join(home, ".chef", "plugins", "knife") }
 
   before do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
     Chef::Util::PathHelper.class_variable_set(:@@home_dir, home)
   end
 

data/spec/unit/knife/core/ui_spec.rb

@@ -3,7 +3,7 @@
 # Author:: Tim Hinderliter (<tim@chef.io>)
 # Author:: Daniel DeLeo (<dan@chef.io>)
 # Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -482,7 +482,7 @@ describe Chef::Knife::UI do
       before(:each) do
         stdout = double("StringIO", tty?: true)
         allow(@ui).to receive(:stdout).and_return(stdout)
-        allow(ChefConfig).to receive(:windows?) { true }
+        allow(ChefUtils).to receive(:windows?) { true }
         Chef::Config.reset
       end
 

data/spec/unit/knife/data_bag_from_file_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Seth Falcon (<seth@chef.io>)
-# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,7 @@ Chef::Knife::DataBagFromFile.load_deps
 
 describe Chef::Knife::DataBagFromFile do
   before :each do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
     Chef::Config[:node_name] = "webmonkey.example.com"
     FileUtils.mkdir_p([db_folder, db_folder2])
     db_file.write(Chef::JSONCompat.to_json(plain_data))

data/spec/unit/knife/environment_from_file_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Stephen Delano (<stephen@ospcode.com>)
 # Author:: Seth Falcon (<seth@ospcode.com>)
-# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,7 @@ Chef::Knife::EnvironmentFromFile.load_deps
 
 describe Chef::Knife::EnvironmentFromFile do
   before(:each) do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
     @knife = Chef::Knife::EnvironmentFromFile.new
     @stdout = StringIO.new
     allow(@knife.ui).to receive(:stdout).and_return(@stdout)

data/spec/unit/knife/ssh_spec.rb

@@ -360,29 +360,39 @@ describe Chef::Knife::Ssh do
   end
 
   describe "#run" do
-    before do
-      @query = Chef::Search::Query.new
-      expect(@query).to receive(:search).and_yield(@node_foo)
-      allow(Chef::Search::Query).to receive(:new).and_return(@query)
-      allow(@knife).to receive(:ssh_command).and_return(exit_code)
-      @knife.name_args = ["*:*", "false"]
+
+    it "should print usage and exit when a SEARCH QUERY is not provided" do
+      @knife.name_args = []
+      expect(@knife).to receive(:show_usage)
+      expect(@knife.ui).to receive(:fatal).with(/You must specify the SEARCH QUERY./)
+      expect { @knife.run }.to raise_error(SystemExit)
     end
 
-    context "with an error" do
-      let(:exit_code) { 1 }
+    context "exit" do
+      before do
+        @query = Chef::Search::Query.new
+        expect(@query).to receive(:search).and_yield(@node_foo)
+        allow(Chef::Search::Query).to receive(:new).and_return(@query)
+        allow(@knife).to receive(:ssh_command).and_return(exit_code)
+        @knife.name_args = ["*:*", "false"]
+      end
+
+      context "with an error" do
+        let(:exit_code) { 1 }
 
-      it "should exit with a non-zero exit code" do
-        expect(@knife).to receive(:exit).with(exit_code)
-        @knife.run
+        it "should exit with a non-zero exit code" do
+          expect(@knife).to receive(:exit).with(exit_code)
+          @knife.run
+        end
       end
-    end
 
-    context "with no error" do
-      let(:exit_code) { 0 }
+      context "with no error" do
+        let(:exit_code) { 0 }
 
-      it "should not exit" do
-        expect(@knife).not_to receive(:exit)
-        @knife.run
+        it "should not exit" do
+          expect(@knife).not_to receive(:exit)
+          @knife.run
+        end
       end
     end
   end

data/spec/unit/knife/status_spec.rb

@@ -30,7 +30,7 @@ describe Chef::Knife::Status do
     @query = double("Chef::Search::Query")
     allow(@query).to receive(:search).and_yield(node)
     allow(Chef::Search::Query).to receive(:new).and_return(@query)
-    @knife  = Chef::Knife::Status.new
+    @knife = Chef::Knife::Status.new
     @stdout = StringIO.new
     allow(@knife.ui).to receive(:stdout).and_return(@stdout)
   end

data/spec/unit/knife/supermarket_install_spec.rb

@@ -31,7 +31,7 @@ describe Chef::Knife::SupermarketInstall do
            merge_updates_from: true)
   end
   let(:install_path) do
-    if Chef::Platform.windows?
+    if ChefUtils.windows?
       "C:/tmp/chef"
     else
       "/var/tmp/chef"

data/spec/unit/mixin/path_sanity_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright 2011-2017, Chef Software Inc.
+# Copyright:: Copyright 2011-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,7 @@ describe Chef::Mixin::PathSanity do
       @gem_bindir = "/some/gem/bin"
       allow(Gem).to receive(:bindir).and_return(@gem_bindir)
       allow(RbConfig::CONFIG).to receive(:[]).with("bindir").and_return(@ruby_bindir)
-      allow(ChefConfig).to receive(:windows?).and_return(false)
+      allow(ChefUtils).to receive(:windows?).and_return(false)
     end
 
     it "adds all useful PATHs even if environment is an empty hash" do
@@ -83,7 +83,7 @@ describe Chef::Mixin::PathSanity do
       gem_bindir = 'C:\gems\bin'
       allow(Gem).to receive(:bindir).and_return(gem_bindir)
       allow(RbConfig::CONFIG).to receive(:[]).with("bindir").and_return(ruby_bindir)
-      allow(ChefConfig).to receive(:windows?).and_return(true)
+      allow(ChefUtils).to receive(:windows?).and_return(true)
       env = { "PATH" => 'C:\Windows\system32;C:\mr\softie' }
       @sanity.enforce_path_sanity(env)
       expect(env["PATH"]).to eq("#{gem_bindir};#{ruby_bindir};C:\\Windows\\system32;C:\\mr\\softie")

data/spec/unit/mixin/shell_out_spec.rb

@@ -24,13 +24,12 @@ require "spec_helper"
 require "chef/mixin/path_sanity"
 
 describe Chef::Mixin::ShellOut do
-  include Chef::Mixin::PathSanity
-
+  include ChefUtils::DSL::PathSanity
   let(:shell_out_class) { Class.new { include Chef::Mixin::ShellOut } }
   subject(:shell_out_obj) { shell_out_class.new }
 
   def env_path
-    if Chef::Platform.windows?
+    if ChefUtils.windows?
       "Path"
     else
       "PATH"

data/spec/unit/mixin/template_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ require "spec_helper"
 require "cgi"
 describe Chef::Mixin::Template, "render_template" do
 
-  let(:sep) { Chef::Platform.windows? ? "\r\n" : "\n" }
+  let(:sep) { ChefUtils.windows? ? "\r\n" : "\n" }
 
   before :each do
     @context = Chef::Mixin::Template::TemplateContext.new({})
@@ -39,7 +39,7 @@ describe Chef::Mixin::Template, "render_template" do
 
   describe "when running on windows" do
     before do
-      allow(ChefConfig).to receive(:windows?).and_return(true)
+      allow(ChefUtils).to receive(:windows?).and_return(true)
     end
 
     it "should render the templates with windows line endings" do
@@ -54,7 +54,7 @@ describe Chef::Mixin::Template, "render_template" do
 
   describe "when running on unix" do
     before do
-      allow(ChefConfig).to receive(:windows?).and_return(false)
+      allow(ChefUtils).to receive(:windows?).and_return(false)
     end
 
     it "should render the templates with unix line endings" do

data/spec/unit/mixin/user_context_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Edwards (<adamed@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,7 +39,7 @@ describe "a class that mixes in user_context" do
 
   context "when running on Windows" do
     before do
-      allow(::Chef::Platform).to receive(:windows?).and_return(true)
+      allow(ChefUtils).to receive(:windows?).and_return(true)
       allow(::Chef::Util::Windows::LogonSession).to receive(:new).and_return(logon_session)
     end
 
@@ -97,7 +97,7 @@ describe "a class that mixes in user_context" do
 
   context "when not running on Windows" do
     before do
-      allow(::Chef::Platform).to receive(:windows?).and_return(false)
+      allow(ChefUtils).to receive(:windows?).and_return(false)
     end
 
     it "raises a ::Chef::Exceptions::UnsupportedPlatform exception" do