chef 12.0.3-x86-mingw32 → 12.1.0.rc.0-x86-mingw32

data/spec/unit/resource/file_spec.rb

@@ -66,6 +66,20 @@ describe Chef::Resource::File do
     expect { @resource.action :blues }.to raise_error(ArgumentError)
   end
 
+  it "should accept a block, symbol, or string for verify" do
+    expect {@resource.verify {}}.not_to raise_error
+    expect {@resource.verify ""}.not_to raise_error
+    expect {@resource.verify :json}.not_to raise_error
+    expect {@resource.verify true}.to raise_error
+    expect {@resource.verify false}.to raise_error
+  end
+
+  it "should accept multiple verify statements" do
+    @resource.verify "foo"
+    @resource.verify "bar"
+    @resource.verify.length == 2
+  end
+
   it "should use the object name as the path by default" do
     expect(@resource.path).to eql("fakey_fakerton")
   end

data/spec/unit/resource/openbsd_package_spec.rb

@@ -0,0 +1,49 @@
+#
+# Authors:: AJ Christensen (<aj@opscode.com>)
+#           Richard Manyanza (<liseki@nyikacraftsmen.com>)
+#           Scott Bonds (<scott@ggr.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2014 Richard Manyanza, Scott Bonds
+# 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'
+require 'ostruct'
+
+describe Chef::Resource::OpenbsdPackage do
+
+  before(:each) do
+    @node = Chef::Node.new
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @resource = Chef::Resource::OpenbsdPackage.new("foo", @run_context)
+  end
+
+  describe "Initialization" do
+    it "should return a Chef::Resource::OpenbsdPackage" do
+      expect(@resource).to be_a_kind_of(Chef::Resource::OpenbsdPackage)
+    end
+
+    it "should set the resource_name to :openbsd_package" do
+      expect(@resource.resource_name).to eql(:openbsd_package)
+    end
+
+    it "should not set the provider" do
+      expect(@resource.provider).to be_nil
+    end
+  end
+
+end
+

data/spec/unit/resource/remote_file_spec.rb

@@ -113,40 +113,40 @@ describe Chef::Resource::RemoteFile do
   describe "ftp_active_mode" do
     it "should accept a boolean for the ftp_active_mode object" do
       @resource.ftp_active_mode true
-      expect(@resource.ftp_active_mode).to be_true
+      expect(@resource.ftp_active_mode).to be_truthy
     end
 
     it "should default to false" do
-      expect(@resource.ftp_active_mode).to be_false
+      expect(@resource.ftp_active_mode).to be_falsey
     end
   end
 
   describe "conditional get options" do
     it "defaults to using etags and last modified" do
-      expect(@resource.use_etags).to be_true
-      expect(@resource.use_last_modified).to be_true
+      expect(@resource.use_etags).to be_truthy
+      expect(@resource.use_last_modified).to be_truthy
     end
 
     it "enable or disables etag and last modified options as a group" do
       @resource.use_conditional_get(false)
-      expect(@resource.use_etags).to be_false
-      expect(@resource.use_last_modified).to be_false
+      expect(@resource.use_etags).to be_falsey
+      expect(@resource.use_last_modified).to be_falsey
 
       @resource.use_conditional_get(true)
-      expect(@resource.use_etags).to be_true
-      expect(@resource.use_last_modified).to be_true
+      expect(@resource.use_etags).to be_truthy
+      expect(@resource.use_last_modified).to be_truthy
     end
 
     it "disables etags indivdually" do
       @resource.use_etags(false)
-      expect(@resource.use_etags).to be_false
-      expect(@resource.use_last_modified).to be_true
+      expect(@resource.use_etags).to be_falsey
+      expect(@resource.use_last_modified).to be_truthy
     end
 
     it "disables last modified individually" do
       @resource.use_last_modified(false)
-      expect(@resource.use_last_modified).to be_false
-      expect(@resource.use_etags).to be_true
+      expect(@resource.use_last_modified).to be_falsey
+      expect(@resource.use_etags).to be_truthy
     end
 
   end

data/spec/unit/resource/resource_notification_spec.rb

@@ -24,34 +24,34 @@ describe Chef::Resource::Notification do
   end
 
   it "has a resource to be notified" do
-    @notification.resource.should == :service_apache
+    expect(@notification.resource).to eq(:service_apache)
   end
 
   it "has an action to take on the service" do
-    @notification.action.should == :restart
+    expect(@notification.action).to eq(:restart)
   end
 
   it "has a notifying resource" do
-    @notification.notifying_resource.should == :template_httpd_conf
+    expect(@notification.notifying_resource).to eq(:template_httpd_conf)
   end
 
   it "is a duplicate of another notification with the same target resource and action" do
     other = Chef::Resource::Notification.new(:service_apache, :restart, :sync_web_app_code)
-    @notification.duplicates?(other).should be_true
+    expect(@notification.duplicates?(other)).to be_truthy
   end
 
   it "is not a duplicate of another notification if the actions differ" do
     other = Chef::Resource::Notification.new(:service_apache, :enable, :install_apache)
-    @notification.duplicates?(other).should be_false
+    expect(@notification.duplicates?(other)).to be_falsey
   end
 
   it "is not a duplicate of another notification if the target resources differ" do
     other = Chef::Resource::Notification.new(:service_sshd, :restart, :template_httpd_conf)
-    @notification.duplicates?(other).should be_false
+    expect(@notification.duplicates?(other)).to be_falsey
   end
 
   it "raises an ArgumentError if you try to check a non-ducktype object for duplication" do
-    lambda {@notification.duplicates?(:not_a_notification)}.should raise_error(ArgumentError)
+    expect {@notification.duplicates?(:not_a_notification)}.to raise_error(ArgumentError)
   end
 
   it "takes no action to resolve a resource reference that doesn't need to be resolved" do
@@ -62,7 +62,7 @@ describe Chef::Resource::Notification do
     @resource_collection = Chef::ResourceCollection.new
     # would raise an error since the resource is not in the collection
     @notification.resolve_resource_reference(@resource_collection)
-    @notification.resource.should == @keyboard_cat
+    expect(@notification.resource).to eq(@keyboard_cat)
   end
 
   it "resolves a lazy reference to a resource" do
@@ -73,7 +73,7 @@ describe Chef::Resource::Notification do
     @long_cat = Chef::Resource::Cat.new("long_cat")
     @notification.notifying_resource = @long_cat
     @notification.resolve_resource_reference(@resource_collection)
-    @notification.resource.should == @keyboard_cat
+    expect(@notification.resource).to eq(@keyboard_cat)
   end
 
   it "resolves a lazy reference to its notifying resource" do
@@ -84,7 +84,7 @@ describe Chef::Resource::Notification do
     @resource_collection = Chef::ResourceCollection.new
     @resource_collection << @long_cat
     @notification.resolve_resource_reference(@resource_collection)
-    @notification.notifying_resource.should == @long_cat
+    expect(@notification.notifying_resource).to eq(@long_cat)
   end
 
   it "resolves lazy references to both its resource and its notifying resource" do
@@ -96,8 +96,8 @@ describe Chef::Resource::Notification do
     @long_cat = Chef::Resource::Cat.new("long_cat")
     @resource_collection << @long_cat
     @notification.resolve_resource_reference(@resource_collection)
-    @notification.resource.should == @keyboard_cat
-    @notification.notifying_resource.should == @long_cat
+    expect(@notification.resource).to eq(@keyboard_cat)
+    expect(@notification.notifying_resource).to eq(@long_cat)
   end
 
   it "raises a RuntimeError if you try to reference multiple resources" do
@@ -109,7 +109,7 @@ describe Chef::Resource::Notification do
     @resource_collection << @cheez_cat
     @long_cat = Chef::Resource::Cat.new("long_cat")
     @notification.notifying_resource = @long_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+    expect {@notification.resolve_resource_reference(@resource_collection)}.to raise_error(RuntimeError)
   end
 
   it "raises a RuntimeError if you try to reference multiple notifying resources" do
@@ -121,7 +121,7 @@ describe Chef::Resource::Notification do
     @resource_collection << @cheez_cat
     @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
     @notification.resource = @keyboard_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+    expect {@notification.resolve_resource_reference(@resource_collection)}.to raise_error(RuntimeError)
   end
 
   it "raises a RuntimeError if it can't find a resource in the resource collection when resolving a lazy reference" do
@@ -131,7 +131,7 @@ describe Chef::Resource::Notification do
     @resource_collection << @cheez_cat
     @long_cat = Chef::Resource::Cat.new("long_cat")
     @notification.notifying_resource = @long_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+    expect {@notification.resolve_resource_reference(@resource_collection)}.to raise_error(RuntimeError)
   end
 
   it "raises a RuntimeError if it can't find a notifying resource in the resource collection when resolving a lazy reference" do
@@ -141,7 +141,7 @@ describe Chef::Resource::Notification do
     @resource_collection << @cheez_cat
     @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
     @notification.resource = @keyboard_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+    expect {@notification.resolve_resource_reference(@resource_collection)}.to raise_error(RuntimeError)
   end
 
   it "raises an ArgumentError if improper syntax is used in the lazy reference to its resource" do
@@ -151,7 +151,7 @@ describe Chef::Resource::Notification do
     @resource_collection << @keyboard_cat
     @long_cat = Chef::Resource::Cat.new("long_cat")
     @notification.notifying_resource = @long_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(ArgumentError)
+    expect {@notification.resolve_resource_reference(@resource_collection)}.to raise_error(ArgumentError)
   end
 
   it "raises an ArgumentError if improper syntax is used in the lazy reference to its notifying resource" do
@@ -161,7 +161,7 @@ describe Chef::Resource::Notification do
     @resource_collection << @long_cat
     @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
     @notification.resource = @keyboard_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(ArgumentError)
+    expect {@notification.resolve_resource_reference(@resource_collection)}.to raise_error(ArgumentError)
   end
 
   # Create test to resolve lazy references to both notifying resource and dest. resource

data/spec/unit/resource/rpm_package_spec.rb

@@ -32,3 +32,15 @@ describe Chef::Resource::RpmPackage, "initialize" do
   end
 
 end
+
+describe Chef::Resource::RpmPackage, "allow_downgrade" do
+  before(:each) do
+    @resource = Chef::Resource::RpmPackage.new("foo")
+  end
+
+  it "should allow you to specify whether allow_downgrade is true or false" do
+    expect { @resource.allow_downgrade true }.not_to raise_error
+    expect { @resource.allow_downgrade false }.not_to raise_error
+    expect { @resource.allow_downgrade "monkey" }.to raise_error(ArgumentError)
+  end
+end

data/spec/unit/resource/scm_spec.rb

@@ -110,22 +110,22 @@ describe Chef::Resource::Scm do
 
   it "takes a boolean for #enable_submodules" do
     @resource.enable_submodules true
-    expect(@resource.enable_submodules).to be_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_false
+    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_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_true
+    expect(@resource.enable_checkout).to be_truthy
   end
 
   it "takes a string for the remote" do

data/spec/unit/resource/script_spec.rb

@@ -29,18 +29,16 @@ describe Chef::Resource::Script do
     expect(script_resource.interpreter).to eql("naaaaNaNaNaaNaaNaaNaa")
   end
 
-  describe "when it has interpreter and flags" do
+  context "when it has interpreter and flags" do
     before do
-      script_resource.command("grep")
       script_resource.interpreter("gcc")
       script_resource.flags("-al")
     end
 
-   it "returns the command as its identity" do
-      expect(script_resource.identity).to eq("grep")
+    it "returns the name as its identity" do
+      expect(script_resource.identity).to eq(resource_instance_name)
     end
   end
 
   it_behaves_like "a script resource"
 end
-

data/spec/unit/resource/subversion_spec.rb

@@ -62,6 +62,6 @@ describe Chef::Resource::Subversion do
   it "hides password from custom exception message" do
     @svn.svn_password "l33th4x0rpa$$w0rd"
     e = @svn.customize_exception(Chef::Exceptions::Exec.new "Exception with password #{@svn.svn_password}")
-    expect(e.message.include?(@svn.svn_password)).to be_false
+    expect(e.message.include?(@svn.svn_password)).to be_falsey
   end
 end

data/spec/unit/resource_builder_spec.rb

@@ -0,0 +1 @@
+# see spec/unit/recipe_spec.rb

data/spec/unit/resource_collection/resource_list_spec.rb

@@ -60,7 +60,7 @@ describe Chef::ResourceCollection::ResourceList do
     end
 
     it "should be empty by default" do
-      expect(resource_list.empty?).to be_true
+      expect(resource_list.empty?).to be_truthy
     end
 
     describe "when resources are inserted" do
@@ -100,7 +100,7 @@ describe Chef::ResourceCollection::ResourceList do
       end
 
       it "should be able to check if the list is empty" do
-        expect(resource_list.empty?).to be_false
+        expect(resource_list.empty?).to be_falsey
       end
     end
   end

data/spec/unit/resource_collection/resource_set_spec.rb

@@ -166,15 +166,15 @@ describe Chef::ResourceCollection::ResourceSet do
 
   describe "validate_lookup_spec!" do
     it "accepts a string of the form 'resource_type[resource_name]'" do
-      expect(collection.validate_lookup_spec!("resource_type[resource_name]")).to be_true
+      expect(collection.validate_lookup_spec!("resource_type[resource_name]")).to be_truthy
     end
 
     it "accepts a single-element :resource_type => 'resource_name' Hash" do
-      expect(collection.validate_lookup_spec!(:service => "apache2")).to be_true
+      expect(collection.validate_lookup_spec!(:service => "apache2")).to be_truthy
     end
 
     it "accepts a chef resource object" do
-      expect(collection.validate_lookup_spec!(zen_master)).to be_true
+      expect(collection.validate_lookup_spec!(zen_master)).to be_truthy
     end
 
     it "rejects a malformed query string" do

data/spec/unit/resource_collection/stepable_iterator_spec.rb

@@ -21,7 +21,7 @@ describe Chef::ResourceCollection::StepableIterator do
   CRSI = Chef::ResourceCollection::StepableIterator
 
   it "has an empty array for its collection by default" do
-    CRSI.new.collection.should == []
+    expect(CRSI.new.collection).to eq([])
   end
 
   describe "doing basic iteration" do
@@ -31,8 +31,8 @@ describe Chef::ResourceCollection::StepableIterator do
     end
 
     it "re-initializes the instance with a collection" do
-      @iterator.collection.should equal(@simple_collection)
-      @iterator.size.should == 4
+      expect(@iterator.collection).to equal(@simple_collection)
+      expect(@iterator.size).to eq(4)
     end
 
     it "iterates over the collection" do
@@ -40,7 +40,7 @@ describe Chef::ResourceCollection::StepableIterator do
       @iterator.each do |int|
         sum += int
       end
-      sum.should == 10
+      expect(sum).to eq(10)
     end
 
     it "iterates over the collection with each_index" do
@@ -48,8 +48,8 @@ describe Chef::ResourceCollection::StepableIterator do
       @iterator.each_index do |idx|
         collected_by_index << @simple_collection[idx]
       end
-      collected_by_index.should == @simple_collection
-      collected_by_index.should_not equal(@simple_collection)
+      expect(collected_by_index).to eq(@simple_collection)
+      expect(collected_by_index).not_to equal(@simple_collection)
     end
 
     it "iterates over the collection with index and element" do
@@ -57,7 +57,7 @@ describe Chef::ResourceCollection::StepableIterator do
       @iterator.each_with_index do |element, index|
         collected[index] = element
       end
-      collected.should == {0=>1, 1=>2, 2=>3, 3=>4}
+      expect(collected).to eq({0=>1, 1=>2, 2=>3, 3=>4})
     end
 
   end
@@ -76,49 +76,49 @@ describe Chef::ResourceCollection::StepableIterator do
     end
 
     it "allows the iteration to be paused" do
-      @snitch_var.should == 23
+      expect(@snitch_var).to eq(23)
     end
 
     it "allows the iteration to be resumed" do
-      @snitch_var.should == 23
+      expect(@snitch_var).to eq(23)
       @iterator.resume
-      @snitch_var.should == 42
+      expect(@snitch_var).to eq(42)
     end
 
     it "allows iteration to be rewound" do
       @iterator.skip_back(2)
       @iterator.resume
-      @snitch_var.should == 23
+      expect(@snitch_var).to eq(23)
       @iterator.resume
-      @snitch_var.should == 42
+      expect(@snitch_var).to eq(42)
     end
 
     it "allows iteration to be fast forwarded" do
       @iterator.skip_forward
       @iterator.resume
-      @snitch_var.should == 23
+      expect(@snitch_var).to eq(23)
     end
 
     it "allows iteration to be rewound" do
       @snitch_var = nil
       @iterator.rewind
-      @iterator.position.should == 0
+      expect(@iterator.position).to eq(0)
       @iterator.resume
-      @snitch_var.should == 23
+      expect(@snitch_var).to eq(23)
     end
 
     it "allows iteration to be stepped" do
       @snitch_var = nil
       @iterator.rewind
       @iterator.step
-      @iterator.position.should == 1
-      @snitch_var.should == 23
+      expect(@iterator.position).to eq(1)
+      expect(@snitch_var).to eq(23)
     end
 
     it "doesn't step if there are no more steps" do
-      @iterator.step.should == 3
-      lambda {@iterator.step}.should_not raise_error
-      @iterator.step.should be_nil
+      expect(@iterator.step).to eq(3)
+      expect {@iterator.step}.not_to raise_error
+      expect(@iterator.step).to be_nil
     end
 
     it "allows the iteration to start by being stepped" do
@@ -126,17 +126,17 @@ describe Chef::ResourceCollection::StepableIterator do
       @iterator = CRSI.for_collection(@collection)
       @iterator.iterate_on(:element) { |proc| proc.call }
       @iterator.step
-      @iterator.position.should == 1
-      @snitch_var.should == 23
+      expect(@iterator.position).to eq(1)
+      expect(@snitch_var).to eq(23)
     end
 
     it "should work correctly when elements are added to the collection during iteration" do
       @collection.insert(2, lambda { @snitch_var = 815})
       @collection.insert(3, lambda { @iterator.pause })
       @iterator.resume
-      @snitch_var.should == 815
+      expect(@snitch_var).to eq(815)
       @iterator.resume
-      @snitch_var.should == 42
+      expect(@snitch_var).to eq(42)
     end
 
   end