chef 11.16.4 → 11.18.0

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

@@ -85,7 +85,7 @@ describe Chef::Provider::RemoteFile::CacheControlData do
       cache["etag"] = etag
       cache["mtime"] = mtime
       cache["checksum"] = last_fetched_checksum
-      cache.to_json
+      Chef::JSONCompat.to_json(cache)
     end
 
     before do

data/spec/unit/resource/dsc_script_spec.rb

@@ -95,33 +95,4 @@ describe Chef::Resource::DscScript do
       expect { dsc_test_resource.configuration_data_script(configuration_data_script) }.to raise_error(ArgumentError)
     end
   end
-
-  context 'when Powershell does not supported Dsc' do
-    ['1.0', '2.0', '3.0'].each do |version|
-      it "raises an exception for powershell version '#{version}'" do
-        node = Chef::Node.new
-        node.automatic[:languages][:powershell][:version] = version
-        empty_events = Chef::EventDispatch::Dispatcher.new
-        dsc_test_run_context = Chef::RunContext.new(node, {}, empty_events)
-
-        expect {
-          Chef::Resource::DscScript.new(dsc_test_resource_name, dsc_test_run_context)
-        }.to raise_error(Chef::Exceptions::NoProviderAvailable)
-      end
-    end
-  end
-
-  context 'when Powershell is not present' do
-    let (:dsc_test_run_context) {
-      node = Chef::Node.new
-      empty_events = Chef::EventDispatch::Dispatcher.new
-      dsc_test_run_context = Chef::RunContext.new(node, {}, empty_events)
-    }
-
-    it 'raises an exception if powershell is not present' do
-        expect {
-          Chef::Resource::DscScript.new(dsc_test_resource_name, dsc_test_run_context)
-        }.to raise_error(Chef::Exceptions::NoProviderAvailable)
-      end
-  end
 end

data/spec/unit/resource_collection_spec.rb

@@ -245,12 +245,16 @@ describe Chef::ResourceCollection do
       json.should =~ /json_class/
       json.should =~ /instance_vars/
     end
+
+    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+      let(:subject) { @rc }
+    end
   end
 
   describe "self.from_json" do
     it "should deserialize itself from json" do
       @rc << @resource
-      json = @rc.to_json
+      json = Chef::JSONCompat.to_json(@rc)
       s_rc = Chef::JSONCompat.from_json(json)
       s_rc.should be_a_kind_of(Chef::ResourceCollection)
       s_rc[0].name.should eql(@resource.name)

data/spec/unit/resource_reporter_spec.rb

@@ -421,7 +421,7 @@ describe Chef::ResourceReporter do
 
       it "includes the run_list" do
         @report.should have_key("run_list")
-        @report["run_list"].should == @run_status.node.run_list.to_json
+        @report["run_list"].should == Chef::JSONCompat.to_json(@run_status.node.run_list)
       end
 
       it "includes the end_time" do
@@ -484,7 +484,7 @@ describe Chef::ResourceReporter do
 
       it "includes the exception trace in the event data" do
         @report["data"]["exception"].should have_key("backtrace")
-        @report["data"]["exception"]["backtrace"].should == @backtrace.to_json
+        @report["data"]["exception"]["backtrace"].should == Chef::JSONCompat.to_json(@backtrace)
       end
 
       it "includes the error inspector output in the event data" do
@@ -701,7 +701,7 @@ describe Chef::ResourceReporter do
           })
           data_stream = Zlib::GzipReader.new(StringIO.new(data))
           data = data_stream.read
-          data.should eq(@expected_data.to_json)
+          data.should eq(Chef::JSONCompat.to_json(@expected_data))
           response
         end
 

data/spec/unit/resource_spec.rb

@@ -336,6 +336,10 @@ describe Chef::Resource do
       json.should =~ /json_class/
       json.should =~ /instance_vars/
     end
+
+    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+      let(:subject) { @resource }
+    end
   end
 
   describe "to_hash" do
@@ -354,7 +358,7 @@ describe Chef::Resource do
 
   describe "self.json_create" do
     it "should deserialize itself from json" do
-      json = @resource.to_json
+      json = Chef::JSONCompat.to_json(@resource)
       serialized_node = Chef::JSONCompat.from_json(json)
       serialized_node.should be_a_kind_of(Chef::Resource)
       serialized_node.name.should eql(@resource.name)

data/spec/unit/role_spec.rb

@@ -215,6 +215,10 @@ describe Chef::Role do
       end
 
     end
+
+    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+      let(:subject) { @role }
+    end
   end
 
   describe "when created from JSON", :json => true do

data/spec/unit/run_list_spec.rb

@@ -304,7 +304,11 @@ describe Chef::RunList do
     end
 
     it "converts to json by converting its array form" do
-      @run_list.to_json.should == ["recipe[nagios::client]", "role[production]", "recipe[apache2]"].to_json
+      Chef::JSONCompat.to_json(@run_list).should == Chef::JSONCompat.to_json(["recipe[nagios::client]", "role[production]", "recipe[apache2]"])
+    end
+
+    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+      let(:subject) { @run_list }
     end
 
   end

data/spec/unit/user_spec.rb

@@ -154,6 +154,10 @@ describe Chef::User do
     it "does not include the password if not present" do
       @json.should_not include("password")
     end
+
+    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+      let(:subject) { @user }
+    end
   end
 
   describe "when deserializing from JSON" do
@@ -163,7 +167,7 @@ describe Chef::User do
         "private_key" => "pandas",
         "password" => "password",
         "admin" => true }
-      @user = Chef::User.from_json(user.to_json)
+      @user = Chef::User.from_json(Chef::JSONCompat.to_json(user))
     end
 
     it "should deserialize to a Chef::User object" do

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

@@ -32,7 +32,7 @@ EOH
   }
 
   let(:no_whatif_lcm_output) { <<-EOH
-Start-DscConfiguration : A parameter cannot be found that matches parameter name 'whatif'.
+Start-DscConfiguration : A parameter cannot be found\r\n that matches parameter name 'whatif'.
 At line:1 char:123
 + run-somecommand -whatif
 +                        ~~~~~~~~
@@ -77,8 +77,13 @@ EOH
         let(:lcm_standard_error) { no_whatif_lcm_output }
         let(:lcm_cmdlet_success) { false }
 
+        it 'returns true when passed to #whatif_not_supported?' do
+          expect(lcm.send(:whatif_not_supported?, no_whatif_lcm_output)).to be_true
+        end
+
         it 'should should return a (possibly empty) array of ResourceInfo instances' do
           expect(Chef::Log).to receive(:warn)
+          expect(lcm).to receive(:whatif_not_supported?).and_call_original
           test_configuration_result = nil
           expect {test_configuration_result = lcm.test_configuration('config')}.not_to raise_error
           expect(test_configuration_result.class).to be(Array)
@@ -92,7 +97,7 @@ EOH
 
         it 'should log a warning if the message is formatted as expected when a resource import failure occurs' do
           expect(Chef::Log).to receive(:warn)
-          expect(lcm).to receive(:output_has_dsc_module_failure?).and_call_original
+          expect(lcm).to receive(:dsc_module_import_failure?).and_call_original
           test_configuration_result = nil
           expect {test_configuration_result = lcm.test_configuration('config')}.not_to raise_error
         end
@@ -105,29 +110,29 @@ EOH
         end
       end
 
-      context 'that fails due to an PowerShell cmdlet error that cannot be handled' do
+      context 'that fails due to an unknown PowerShell cmdlet error' do
         let(:lcm_standard_output) { 'some output' }
         let(:lcm_standard_error) { 'Abort, Retry, Fail?' }
         let(:lcm_cmdlet_success) { false }
 
-        it 'should raise a Chef::Exceptions::PowershellCmdletException' do
-          expect(Chef::Log).not_to receive(:warn)
-          expect(lcm).to receive(:output_has_dsc_module_failure?).and_call_original
-          expect {lcm.test_configuration('config')}.to raise_error(Chef::Exceptions::PowershellCmdletException)
+        it 'should log a warning' do
+          expect(Chef::Log).to receive(:warn)
+          expect(lcm).to receive(:dsc_module_import_failure?).and_call_original
+          expect {lcm.test_configuration('config')}.not_to raise_error
         end
       end
     end
 
     it 'should identify a correctly formatted error message as a resource import failure' do
-      expect(lcm.send(:output_has_dsc_module_failure?, dsc_resource_import_failure_output)).to be(true)
+      expect(lcm.send(:dsc_module_import_failure?, dsc_resource_import_failure_output)).to be(true)
     end
 
     it 'should not identify an incorrectly formatted error message as a resource import failure' do
-      expect(lcm.send(:output_has_dsc_module_failure?, dsc_resource_import_failure_output.gsub('module', 'gibberish'))).to be(false)
+      expect(lcm.send(:dsc_module_import_failure?, dsc_resource_import_failure_output.gsub('module', 'gibberish'))).to be(false)
     end
 
     it 'should not identify a message without a CimException reference as a resource import failure' do
-      expect(lcm.send(:output_has_dsc_module_failure?, dsc_resource_import_failure_output.gsub('CimException', 'ArgumentException'))).to be(false)
+      expect(lcm.send(:dsc_module_import_failure?, dsc_resource_import_failure_output.gsub('CimException', 'ArgumentException'))).to be(false)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.16.4
+  version: 11.18.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -230,20 +230,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -1536,6 +1536,7 @@ files:
 - spec/support/shared/integration/app_server_support.rb
 - spec/support/shared/integration/integration_helper.rb
 - spec/support/shared/integration/knife_support.rb
+- spec/support/shared/shared_examples.rb
 - spec/support/shared/unit/api_error_inspector.rb
 - spec/support/shared/unit/execute_resource.rb
 - spec/support/shared/unit/file_system_support.rb
@@ -1554,6 +1555,7 @@ files:
 - spec/unit/application/server_spec.rb
 - spec/unit/application/solo_spec.rb
 - spec/unit/application_spec.rb
+- spec/unit/chef_fs/data_handler/group_handler_spec.rb
 - spec/unit/chef_fs/diff_spec.rb
 - spec/unit/chef_fs/file_pattern_spec.rb
 - spec/unit/chef_fs/file_system/operation_failed_error_spec.rb
@@ -1930,7 +1932,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration