chef 14.15.6 → 15.0.293

data/spec/unit/decorator_spec.rb

@@ -28,11 +28,11 @@ def impersonates_a(klass)
   end
 
   it "#kind_of?(#{klass}) is true" do
-    expect(decorator.is_a?(klass)).to be true
+    expect(decorator.kind_of?(klass)).to be true
   end
 
   it "#kind_of?(Chef::Decorator) is true" do
-    expect(decorator.is_a?(Chef::Decorator)).to be true
+    expect(decorator.kind_of?(Chef::Decorator)).to be true
   end
 
   it "#instance_of?(#{klass}) is false" do

data/spec/unit/deprecated_spec.rb

@@ -44,7 +44,7 @@ describe Chef::Deprecated do
     let(:location) { "the location" }
 
     it "displays the full URL" do
-      expect(TestDeprecation.new.url).to eql("https://docs.chef.io/deprecations_test.html")
+      expect(TestDeprecation.new().url).to eql("https://docs.chef.io/deprecations_test.html")
     end
 
     it "formats a complete deprecation message" do
@@ -59,7 +59,7 @@ describe Chef::Deprecated do
     end
     collisions = id_map.select { |k, v| v.size != 1 }
     unless collisions.empty?
-      raise "Found deprecation ID collisions:\n#{collisions.map { |k, v| "* #{k} #{v.map(&:name).join(", ")}" }.join("\n")}"
+      raise "Found deprecation ID collisions:\n#{collisions.map { |k, v| "* #{k} #{v.map(&:name).join(', ')}" }.join("\n")}"
     end
   end
 end

data/spec/unit/dsl/data_query_spec.rb

@@ -24,7 +24,7 @@ class DataQueryDSLTester
 end
 
 describe Chef::DSL::DataQuery do
-  let(:node) { {} }
+  let(:node) { Hash.new }
 
   let(:language) do
     language = DataQueryDSLTester.new
@@ -68,8 +68,7 @@ describe Chef::DSL::DataQuery do
         "a1" => [1, 2, 3],
         "a2" => { "b1" => true },
       },
-    }
-    end
+    } end
 
     let(:item) do
       item = Chef::DataBagItem.new

data/spec/unit/dsl/declare_resource_spec.rb

@@ -34,7 +34,7 @@ describe Chef::ResourceCollection do
 
   describe "mixed in correctly" do
     it "the resources() method winds up in the right classes" do
-      methods = %i{resources find_resource find_resource! edit_resource edit_resource! delete_resource delete_resource! declare_resource build_resource}
+      methods = [ :resources, :find_resource, :find_resource!, :edit_resource, :edit_resource!, :delete_resource, :delete_resource!, :declare_resource, :build_resource ]
       expect(Chef::Resource.instance_methods).to include(*methods)
       expect(Chef::Recipe.instance_methods).to include(*methods)
       expect(Chef::Provider.instance_methods).to include(*methods)

data/spec/unit/dsl/platform_introspection_spec.rb

@@ -40,7 +40,7 @@ describe Chef::DSL::PlatformIntrospection::PlatformDependentValue do
   before do
     platform_hash = {
       :openbsd => { default: "free, functional, secure" },
-      %i{redhat centos fedora scientific} => { default: '"stable"' },
+      [:redhat, :centos, :fedora, :scientific] => { default: '"stable"' },
       :ubuntu => { "10.04" => "using upstart more", :default => "using init more" },
       :default => "bork da bork",
     }
@@ -84,7 +84,7 @@ describe Chef::DSL::PlatformIntrospection::PlatformDependentValue do
 end
 describe Chef::DSL::PlatformIntrospection::PlatformFamilyDependentValue do
   before do
-    @array_values = %i{stop start reload}
+    @array_values = [:stop, :start, :reload]
 
     @platform_family_hash = {
       "debian" => "debian value",

data/spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb

@@ -47,8 +47,7 @@ describe Chef::EncryptedDataBagItem::CheckEncrypted do
             "a1" => [1, 2, 3],
             "a2" => { "b1" => true },
         },
-    }
-    end
+    } end
 
     let(:version) { 1 }
     let(:encoded_data) do

data/spec/unit/encrypted_data_bag_item_spec.rb

@@ -325,8 +325,7 @@ describe Chef::EncryptedDataBagItem do
       "id" => "item_name",
       "greeting" => "hello",
       "nested" => { "a1" => [1, 2, 3], "a2" => { "b1" => true } },
-  }
-  end
+  } end
   let(:secret) { "abc123SECRET" }
   let(:encoded_data) { subject.encrypt_data_bag_item(plaintext_data, secret) }
 

data/spec/unit/environment_spec.rb

@@ -48,8 +48,8 @@ describe Chef::Environment do
     end
 
     it "should not accept anything but strings" do
-      expect { @environment.name([]) }.to raise_error(ArgumentError)
-      expect { @environment.name({}) }.to raise_error(ArgumentError)
+      expect { @environment.name(Array.new) }.to raise_error(ArgumentError)
+      expect { @environment.name(Hash.new) }.to raise_error(ArgumentError)
       expect { @environment.name(2) }.to raise_error(ArgumentError)
     end
   end
@@ -65,8 +65,8 @@ describe Chef::Environment do
     end
 
     it "should not accept anything but strings" do
-      expect { @environment.description([]) }.to raise_error(ArgumentError)
-      expect { @environment.description({}) }.to raise_error(ArgumentError)
+      expect { @environment.description(Array.new) }.to raise_error(ArgumentError)
+      expect { @environment.description(Hash.new) }.to raise_error(ArgumentError)
       expect { @environment.description(42) }.to raise_error(ArgumentError)
     end
   end
@@ -82,7 +82,7 @@ describe Chef::Environment do
     end
 
     it "should throw an ArgumentError if we aren't a kind of hash" do
-      expect { @environment.default_attributes([]) }.to raise_error(ArgumentError)
+      expect { @environment.default_attributes(Array.new) }.to raise_error(ArgumentError)
     end
   end
 
@@ -97,7 +97,7 @@ describe Chef::Environment do
     end
 
     it "should throw an ArgumentError if we aren't a kind of hash" do
-      expect { @environment.override_attributes([]) }.to raise_error(ArgumentError)
+      expect { @environment.override_attributes(Array.new) }.to raise_error(ArgumentError)
     end
   end
 
@@ -121,7 +121,7 @@ describe Chef::Environment do
 
     it "should not accept anything but a hash" do
       expect { @environment.cookbook_versions("I am a string!") }.to raise_error(ArgumentError)
-      expect { @environment.cookbook_versions([]) }.to raise_error(ArgumentError)
+      expect { @environment.cookbook_versions(Array.new) }.to raise_error(ArgumentError)
       expect { @environment.cookbook_versions(42) }.to raise_error(ArgumentError)
     end
 
@@ -257,7 +257,7 @@ describe Chef::Environment do
     end
 
     it "should return false if anything other than a hash is passed as the argument" do
-      expect(Chef::Environment.validate_cookbook_versions([])).to eq(false)
+      expect(Chef::Environment.validate_cookbook_versions(Array.new)).to eq(false)
       expect(Chef::Environment.validate_cookbook_versions(42)).to eq(false)
       expect(Chef::Environment.validate_cookbook_versions(Chef::CookbookVersion.new("meta"))).to eq(false)
       expect(Chef::Environment.validate_cookbook_versions("cookbook => 1.2.3")).to eq(false)
@@ -299,7 +299,7 @@ describe Chef::Environment do
         expect do
           Chef::Environment.validate_cookbook_version("= 1.2.3.4")
         end.to raise_error Chef::Exceptions::IllegalVersionConstraint,
-          "Environment cookbook version constraints not allowed in chef-solo"
+                             "Environment cookbook version constraints not allowed in chef-solo"
       end
     end
 

data/spec/unit/event_dispatch/dispatcher_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
 #
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+# Copyright:: Copyright 2015-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,9 +43,9 @@ describe Chef::EventDispatch::Dispatcher do
 
     it "forwards events to the subscribed event sink" do
       # the events all have different arity and such so we just hit a few different events:
-
-      expect(event_sink).to receive(:run_start).with("12.4.0")
-      dispatcher.run_start("12.4.0")
+      run_status = Chef::RunStatus.new({}, {})
+      expect(event_sink).to receive(:run_start).with("12.4.0", run_status)
+      dispatcher.run_start("12.4.0", run_status)
 
       cookbook_version = double("cookbook_version")
       expect(event_sink).to receive(:synchronized_cookbook).with("apache2", cookbook_version)
@@ -119,4 +119,51 @@ describe Chef::EventDispatch::Dispatcher do
       end
     end
   end
+
+  context "events that queue events" do
+    class Accumulator
+      def self.sequence
+        @secuence ||= []
+      end
+    end
+
+    let(:event_sink_1) do
+      Class.new(Chef::EventDispatch::Base) do
+        def synchronized_cookbook(dispatcher, arg)
+          dispatcher.enqueue(:event_two, arg)
+          Accumulator.sequence << [ :sink_1_event_1, arg ]
+        end
+
+        def event_two(arg)
+          Accumulator.sequence << [ :sink_1_event_2, arg ]
+        end
+      end.new
+    end
+    let(:event_sink_2) do
+      Class.new(Chef::EventDispatch::Base) do
+        def synchronized_cookbook(dispatcher, arg)
+          Accumulator.sequence << [ :sink_2_event_1, arg ]
+        end
+
+        def event_two(arg)
+          Accumulator.sequence << [ :sink_2_event_2, arg ]
+        end
+      end.new
+    end
+
+    before do
+      dispatcher.register(event_sink_1)
+      dispatcher.register(event_sink_2)
+    end
+
+    it "runs the events in the correct order without interleaving the enqueued event" do
+      dispatcher.synchronized_cookbook(dispatcher, "two")
+      expect(Accumulator.sequence).to eql([
+        [:sink_1_event_1, "two"], # the call to enqueue the event happens here
+        [:sink_2_event_1, "two"], # event 1 fully finishes
+        [:sink_1_event_2, "two"],
+        [:sink_2_event_2, "two"], # then event 2 runs and finishes
+      ])
+    end
+  end
 end

data/spec/unit/event_dispatch/dsl_spec.rb

@@ -63,7 +63,7 @@ describe Chef::EventDispatch::DSL do
     resource = Chef::Resource::RubyBlock.new("foo", run_context)
     resource.block {}
     resource.run_action(:run)
-    expect(calls).to eq(%i{started updated})
+    expect(calls).to eq([:started, :updated])
   end
 
   it "preserve instance variables across handler callbacks" do

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

@@ -38,9 +38,9 @@ describe Chef::FileContentManagement::Deploy::MvUnix do
     let(:target_file_mode) { 0644 }
     let(:target_file_stat) do
       double "File::Stat struct for target file",
-        mode: target_file_mode,
-        uid: target_file_uid,
-        gid: target_file_gid
+           mode: target_file_mode,
+           uid: target_file_uid,
+           gid: target_file_gid
     end
 
     before do

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

@@ -84,8 +84,8 @@ describe Chef::FileContentManagement::Deploy::MvWindows do
 
       let(:target_file_security_descriptor) do
         double "security descriptor for target file",
-          group: original_target_file_group,
-          owner: original_target_file_owner
+             group: original_target_file_group,
+             owner: original_target_file_owner
       end
 
       let(:updated_target_security_descriptor) do

data/spec/unit/formatters/doc_spec.rb

@@ -76,24 +76,6 @@ describe Chef::Formatters::Base do
     expect(formatter.pretty_elapsed_time).to include("10 hours 10 minutes 10 seconds")
   end
 
-  it "shows nothing if total is nil" do
-    res = Chef::Resource::RemoteFile.new("canteloupe")
-    formatter.resource_update_progress(res, 35, nil, 10)
-    expect(out.string).to eq("")
-  end
-
-  it "shows nothing if total is 0" do
-    res = Chef::Resource::RemoteFile.new("canteloupe")
-    formatter.resource_update_progress(res, 35, 0, 10)
-    expect(out.string).to eq("")
-  end
-
-  it "shows nothing if current and total are 0" do
-    res = Chef::Resource::RemoteFile.new("canteloupe")
-    formatter.resource_update_progress(res, 0, 0, 10)
-    expect(out.string).to eq("")
-  end
-
   it "shows the percentage completion of an action" do
     res = Chef::Resource::RemoteFile.new("canteloupe")
     formatter.resource_update_progress(res, 35, 50, 10)

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

@@ -60,7 +60,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
       @trace = [
         "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
         "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
-        "/usr/local/lib/ruby/gems/chef/lib/chef/client.rb:123:in `run'", # should not display
+        "/usr/local/lib/ruby/gems/chef/lib/chef/client.rb:123:in `run'" # should not display
       ]
       @exception = Chef::Exceptions::Package.new("No such package 'non-existing-package'")
       @exception.set_backtrace(@trace)
@@ -122,7 +122,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
         source_line = "C:/Users/btm/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existent' for main:Object (NameError)"
         @resource.source_line = source_line
         @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
-        expect(@inspector.recipe_snippet).to match(%r{^# In C:/Users/btm})
+        expect(@inspector.recipe_snippet).to match(/^# In C:\/Users\/btm/)
       end
 
       it "parses a Windows path" do
@@ -136,7 +136,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
         source_line = "/home/btm/src/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existent' for main:Object (NameError)"
         @resource.source_line = source_line
         @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
-        expect(@inspector.recipe_snippet).to match(%r{^# In /home/btm})
+        expect(@inspector.recipe_snippet).to match(/^# In \/home\/btm/)
       end
 
       context "when the recipe file does not exist" do

data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb

@@ -22,7 +22,7 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
   let(:node) do
     node = Chef::Node.new
 
-    node.default["kernel"] = {}
+    node.default["kernel"] = Hash.new
     node.default["kernel"][:machine] = :x86_64.to_s
     node.automatic[:os] = "windows"
     node

data/spec/unit/http/authenticator_spec.rb

@@ -23,7 +23,7 @@ describe Chef::HTTP::Authenticator do
   let(:class_instance) { Chef::HTTP::Authenticator.new(client_name: "test") }
   let(:method) { "GET" }
   let(:url) { URI("https://chef.example.com/organizations/test") }
-  let(:headers) { {} }
+  let(:headers) { Hash.new }
   let(:data) { "" }
 
   context "when handle_request is called" do
@@ -92,8 +92,7 @@ describe Chef::HTTP::Authenticator do
       it "calls authentication_headers with the proper input" do
         expect(class_instance).to receive(:authentication_headers).with(
           method, url, data,
-          { "X-Ops-Server-API-Version" => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION }
-        ).and_return({})
+          { "X-Ops-Server-API-Version" => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION }).and_return({})
         class_instance.handle_request(method, url, headers, data)
       end
     end

data/spec/unit/http/json_input_spec.rb

@@ -21,7 +21,7 @@ require "chef/http/json_input"
 
 describe Chef::HTTP::JSONInput do
 
-  let(:json_encoder) { described_class.new }
+  let(:json_encoder) { described_class.new() }
 
   let(:url) { URI.parse("http://example.com") }
   let(:headers) { {} }

data/spec/unit/key_spec.rb

@@ -66,7 +66,7 @@ describe Chef::Key do
 
     context "when you feed it anything but a string" do
       it "should raise an ArgumentError" do
-        expect { key.send(field, {}) }.to raise_error(ArgumentError)
+        expect { key.send(field, Hash.new) }.to raise_error(ArgumentError)
       end
     end
   end
@@ -406,9 +406,9 @@ describe Chef::Key do
 
           it "creates a new key via the API with the fingerprint as the name" do
             expect(rest).to receive(:post).with(url,
-              { "name" => "12:3e:33:73:0b:f4:ec:72:dc:f0:4c:51:62:27:08:76:96:24:f4:4a",
-                "public_key" => key.public_key,
-                "expiration_date" => key.expiration_date }).and_return({})
+                                                     { "name" => "12:3e:33:73:0b:f4:ec:72:dc:f0:4c:51:62:27:08:76:96:24:f4:4a",
+                                                       "public_key" => key.public_key,
+                                                       "expiration_date" => key.expiration_date }).and_return({})
             key.create
           end
         end
@@ -424,9 +424,9 @@ describe Chef::Key do
           context "when create_key is false" do
             it "creates a new key via the API" do
               expect(rest).to receive(:post).with(url,
-                { "name" => key.name,
-                  "public_key" => key.public_key,
-                  "expiration_date" => key.expiration_date }).and_return({})
+                                                       { "name" => key.name,
+                                                         "public_key" => key.public_key,
+                                                         "expiration_date" => key.expiration_date }).and_return({})
               key.create
             end
           end