ridley 4.2.0 → 4.3.0

data/spec/unit/ridley/chef/digester_spec.rb

@@ -9,14 +9,14 @@ describe Ridley::Chef::Digester do
 
   describe "when computing checksums of cookbook files and templates" do
     it "proxies the class method checksum_for_file to the instance" do
-      @cache.should_receive(:checksum_for_file).with("a_file_or_a_fail")
+      expect(@cache).to receive(:checksum_for_file).with("a_file_or_a_fail")
       described_class.checksum_for_file("a_file_or_a_fail")
     end
 
     it "generates a checksum from a non-file IO object" do
       io = StringIO.new("riseofthemachines\nriseofthechefs\n")
       expected_md5 = '0e157ac1e2dd73191b76067fb6b4bceb'
-      @cache.generate_md5_checksum(io).should == expected_md5
+      expect(@cache.generate_md5_checksum(io)).to eq(expected_md5)
     end
   end
 end

data/spec/unit/ridley/chef_object_spec.rb

@@ -10,7 +10,7 @@ describe Ridley::ChefObject do
           name: "a name"
         }
 
-        subject.any_instance.should_receive(:mass_assign).with(new_attrs)
+        expect_any_instance_of(subject).to receive(:mass_assign).with(new_attrs)
         subject.new(resource, new_attrs)
       end
     end
@@ -19,7 +19,7 @@ describe Ridley::ChefObject do
       it "sets the chef_type attr on the class" do
         subject.set_chef_type("environment")
 
-        subject.chef_type.should eql("environment")
+        expect(subject.chef_type).to eql("environment")
       end
     end
 
@@ -27,7 +27,7 @@ describe Ridley::ChefObject do
       it "sets the chef_json_class attr on the class" do
         subject.set_chef_json_class("Chef::Environment")
 
-        subject.chef_json_class.should eql("Chef::Environment")
+        expect(subject.chef_json_class).to eql("Chef::Environment")
       end
     end
 
@@ -35,25 +35,25 @@ describe Ridley::ChefObject do
       it "sets the chef_id attribute on the class" do
         subject.set_chef_id(:environment)
 
-        subject.chef_id.should eql(:environment)
+        expect(subject.chef_id).to eql(:environment)
       end
     end
 
     describe "::chef_type" do
       it "returns the underscored name of the including class if nothing is set" do
-        subject.chef_type.should eql(subject.class.name.underscore)
+        expect(subject.chef_type).to eql(subject.class.name.underscore)
       end
     end
 
     describe "::chef_json_class" do
       it "returns the chef_json if nothing has been set" do
-        subject.chef_json_class.should be_nil
+        expect(subject.chef_json_class).to be_nil
       end
     end
 
     describe "::chef_id" do
       it "returns nil if nothing is set" do
-        subject.chef_id.should be_nil
+        expect(subject.chef_id).to be_nil
       end
     end
   end
@@ -64,12 +64,12 @@ describe Ridley::ChefObject do
 
   describe "#save" do
     context "when the object is valid" do
-      before(:each) { subject.stub(:valid?).and_return(true) }
+      before(:each) { allow(subject).to receive(:valid?).and_return(true) }
 
       it "sends a create message to the implementing class" do
         updated = double('updated')
-        updated.stub(:_attributes_).and_return(Hash.new)
-        resource.should_receive(:create).with(subject).and_return(updated)
+        allow(updated).to receive(:_attributes_).and_return(Hash.new)
+        expect(resource).to receive(:create).with(subject).and_return(updated)
 
         subject.save
       end
@@ -77,10 +77,10 @@ describe Ridley::ChefObject do
       context "when there is an HTTPConflict" do
         it "sends the update message to self" do
           updated = double('updated')
-          updated.stub(:[]).and_return(Hash.new)
-          updated.stub(:_attributes_).and_return(Hash.new)
-          resource.should_receive(:create).and_raise(Ridley::Errors::HTTPConflict.new(updated))
-          subject.should_receive(:update).and_return(updated)
+          allow(updated).to receive(:[]).and_return(Hash.new)
+          allow(updated).to receive(:_attributes_).and_return(Hash.new)
+          expect(resource).to receive(:create).and_raise(Ridley::Errors::HTTPConflict.new(updated))
+          expect(subject).to receive(:update).and_return(updated)
 
           subject.save
         end
@@ -88,12 +88,12 @@ describe Ridley::ChefObject do
     end
 
     context "when the object is invalid" do
-      before(:each) { subject.stub(:valid?).and_return(false) }
+      before(:each) { allow(subject).to receive(:valid?).and_return(false) }
 
       it "raises an InvalidResource error" do
-        lambda {
+        expect {
           subject.save
-        }.should raise_error(Ridley::Errors::InvalidResource)
+        }.to raise_error(Ridley::Errors::InvalidResource)
       end
     end
   end
@@ -102,31 +102,31 @@ describe Ridley::ChefObject do
     context "when the object is valid" do
       let(:updated) do
         updated = double('updated')
-        updated.stub(:[]).and_return(Hash.new)
-        updated.stub(:_attributes_).and_return(Hash.new)
+        allow(updated).to receive(:[]).and_return(Hash.new)
+        allow(updated).to receive(:_attributes_).and_return(Hash.new)
         updated
       end
 
-      before(:each) { subject.stub(:valid?).and_return(true) }
+      before(:each) { allow(subject).to receive(:valid?).and_return(true) }
 
       it "sends an update message to the implementing class" do
-        resource.should_receive(:update).with(subject).and_return(updated)
+        expect(resource).to receive(:update).with(subject).and_return(updated)
         subject.update
       end
 
       it "returns true" do
-        resource.should_receive(:update).with(subject).and_return(updated)
-        subject.update.should eql(true)
+        expect(resource).to receive(:update).with(subject).and_return(updated)
+        expect(subject.update).to eql(true)
       end
     end
 
     context "when the object is invalid" do
-      before(:each) { subject.stub(:valid?).and_return(false) }
+      before(:each) { allow(subject).to receive(:valid?).and_return(false) }
 
       it "raises an InvalidResource error" do
-        lambda {
+        expect {
           subject.update
-        }.should raise_error(Ridley::Errors::InvalidResource)
+        }.to raise_error(Ridley::Errors::InvalidResource)
       end
     end
   end
@@ -134,10 +134,10 @@ describe Ridley::ChefObject do
   describe "#chef_id" do
     it "returns the value of the chef_id attribute" do
       subject.class.attribute(:name)
-      subject.class.stub(:chef_id) { :name }
+      allow(subject.class).to receive(:chef_id) { :name }
       subject.mass_assign(name: "reset")
 
-      subject.chef_id.should eql("reset")
+      expect(subject.chef_id).to eql("reset")
     end
   end
 
@@ -147,17 +147,17 @@ describe Ridley::ChefObject do
     before(:each) do
       subject.class.attribute(:one)
       subject.class.attribute(:two)
-      resource.stub(:find).with(subject).and_return(updated_subject)
+      allow(resource).to receive(:find).with(subject).and_return(updated_subject)
     end
 
     it "returns itself" do
-      subject.reload.should eql(subject)
+      expect(subject.reload).to eql(subject)
     end
 
     it "sets the attributes of self to equal those of the updated object" do
       subject.reload
 
-      subject.get_attribute(:one).should eql("val")
+      expect(subject.get_attribute(:one)).to eql("val")
     end
 
     it "does not include attributes not set by the updated object" do
@@ -188,7 +188,7 @@ describe Ridley::ChefObject do
       end
 
       it "is equal" do
-        one.should be_eql(two)
+        expect(one).to be_eql(two)
       end
     end
 
@@ -199,7 +199,7 @@ describe Ridley::ChefObject do
       end
 
       it "is not equal" do
-        one.should_not be_eql(two)
+        expect(one).not_to be_eql(two)
       end
     end
   end
@@ -227,7 +227,7 @@ describe Ridley::ChefObject do
       end
 
       it "returns only one unique element" do
-        nodes.uniq.should have(1).item
+        expect(nodes.uniq.size).to eq(1)
       end
     end
 
@@ -240,7 +240,7 @@ describe Ridley::ChefObject do
       end
 
       it "returns all of the elements" do
-        nodes.uniq.should have(2).item
+        expect(nodes.uniq.size).to eq(2)
       end
     end
   end

data/spec/unit/ridley/chef_objects/client_object_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe Ridley::ClientObject do
   describe "#to_json" do
-    pending
+    skip
   end
 
   describe "#regenerate_key" do
-    pending
+    skip
   end
 end

data/spec/unit/ridley/chef_objects/cookbook_object_spec.rb

@@ -7,7 +7,7 @@ describe Ridley::CookbookObject do
 
   describe "#download" do
     it "downloads each file" do
-      subject.stub(:manifest) do
+      allow(subject).to receive(:manifest) do
         {
           resources: [],
           providers: [],
@@ -37,8 +37,8 @@ describe Ridley::CookbookObject do
         }
       end
 
-      subject.should_receive(:download_file).with(:recipes, "recipes/default.rb", anything)
-      subject.should_receive(:download_file).with(:files, "files/default/plugins/README", anything)
+      expect(subject).to receive(:download_file).with(:recipes, "recipes/default.rb", anything)
+      expect(subject).to receive(:download_file).with(:files, "files/default/plugins/README", anything)
 
       subject.download
     end
@@ -48,11 +48,11 @@ describe Ridley::CookbookObject do
     let(:destination) { tmp_path.join('fake.file').to_s }
 
     before(:each) do
-      subject.stub(:root_files) { [ { path: 'metadata.rb', url: "http://test.it/file" } ] }
+      allow(subject).to receive(:root_files) { [ { path: 'metadata.rb', url: "http://test.it/file" } ] }
     end
 
     it "downloads the file from the file's url" do
-      connection.should_receive(:stream).with("http://test.it/file", destination)
+      expect(connection).to receive(:stream).with("http://test.it/file", destination)
 
       subject.download_file(:root_file, "metadata.rb", destination)
     end
@@ -67,27 +67,27 @@ describe Ridley::CookbookObject do
 
     context "when the cookbook doesn't have the specified file" do
       before(:each) do
-        subject.stub(:root_files) { Array.new }
+        allow(subject).to receive(:root_files) { Array.new }
       end
 
       it "returns nil" do
-        subject.download_file(:root_file, "metadata.rb", destination).should be_nil
+        expect(subject.download_file(:root_file, "metadata.rb", destination)).to be_nil
       end
     end
   end
 
   describe "#manifest" do
     it "returns a Hash" do
-      subject.manifest.should be_a(Hash)
+      expect(subject.manifest).to be_a(Hash)
     end
 
     it "has a key for each item in FILE_TYPES" do
-      subject.manifest.keys.should =~ described_class::FILE_TYPES
+      expect(subject.manifest.keys).to match_array(described_class::FILE_TYPES)
     end
 
     it "contains an empty array for each key" do
-      subject.manifest.should each be_a(Array)
-      subject.manifest.values.should each be_empty
+      expect(subject.manifest).to each be_a(Array)
+      expect(subject.manifest.values).to each be_empty
     end
   end
 
@@ -95,7 +95,7 @@ describe Ridley::CookbookObject do
     it "returns the updated self" do
       other = subject.dup
       other.version = "1.2.3"
-      resource.should_receive(:find).with(subject, subject.version).and_return(other)
+      expect(resource).to receive(:find).with(subject, subject.version).and_return(other)
 
       expect(subject.reload).to eq(other)
     end

data/spec/unit/ridley/chef_objects/data_bag_item_object_spec.rb

@@ -21,7 +21,7 @@ describe Ridley::DataBagItemObject do
       end
 
       it "returns a new object from attributes in the 'raw_data' field" do
-        subject.from_hash(response).attributes.should eql(response["raw_data"])
+        expect(subject.from_hash(response).attributes).to eql(response["raw_data"])
       end
     end
 
@@ -34,20 +34,20 @@ describe Ridley::DataBagItemObject do
       end
 
       it "returns a new object from the hash" do
-        subject.from_hash(response).attributes.should eql(response)
+        expect(subject.from_hash(response).attributes).to eql(response)
       end
     end
   end
 
   describe "#decrypt" do
     before(:each) do
-      resource.stub(encrypted_data_bag_secret: File.read(fixtures_path.join("encrypted_data_bag_secret").to_s))
+      allow(resource).to receive_messages(encrypted_data_bag_secret: File.read(fixtures_path.join("encrypted_data_bag_secret").to_s))
     end
 
     it "decrypts an encrypted v0 value" do
       subject.attributes[:test] = "Xk0E8lV9r4BhZzcg4wal0X4w9ZexN3azxMjZ9r1MCZc="
       subject.decrypt
-      subject.attributes[:test][:database][:username].should == "test"
+      expect(subject.attributes[:test][:database][:username]).to eq("test")
     end
 
     it "decrypts an encrypted v1 value" do
@@ -57,21 +57,21 @@ describe Ridley::DataBagItemObject do
       subject.attributes[:password][:encrypted_data] = "zG+tTjtwOWA4vEYDoUwPYreXLZ1pFyKoWDGezEejmKs="
       subject.attributes[:password][:iv] = "URVhHxv/ZrnABJBvl82qsg=="
       subject.decrypt
-      subject.attributes[:password].should == "password123"
+      expect(subject.attributes[:password]).to eq("password123")
     end
 
     it "does not decrypt the id field" do
       id = "dbi_id"
       subject.attributes[:id] = id
       subject.decrypt
-      subject.attributes[:id].should == id
+      expect(subject.attributes[:id]).to eq(id)
     end
   end
 
   describe "#decrypt_value" do
     context "when no encrypted_data_bag_secret has been configured" do
       before do
-        resource.stub(encrypted_data_bag_secret: nil)
+        allow(resource).to receive_messages(encrypted_data_bag_secret: nil)
       end
 
       it "raises an EncryptedDataBagSecretNotSet error" do

data/spec/unit/ridley/chef_objects/data_bag_object_spec.rb

@@ -5,5 +5,8 @@ describe Ridley::DataBagObject do
   let(:resource) { double('db-resource', item_resource: item_resource) }
   subject { described_class.new(resource) }
 
-  its(:item) { should be_a(Ridley::DataBagObject::DataBagItemProxy) }
+  describe '#item' do
+    subject { super().item }
+    it { is_expected.to be_a(Ridley::DataBagObject::DataBagItemProxy) }
+  end
 end

data/spec/unit/ridley/chef_objects/environment_object_spec.rb

@@ -7,10 +7,10 @@ describe Ridley::EnvironmentObject do
     it "sets an override node attribute at the nested path" do
       subject.set_override_attribute('deep.nested.item', true)
 
-      subject.override_attributes.should have_key("deep")
-      subject.override_attributes["deep"].should have_key("nested")
-      subject.override_attributes["deep"]["nested"].should have_key("item")
-      subject.override_attributes["deep"]["nested"]["item"].should be_true
+      expect(subject.override_attributes).to have_key("deep")
+      expect(subject.override_attributes["deep"]).to have_key("nested")
+      expect(subject.override_attributes["deep"]["nested"]).to have_key("item")
+      expect(subject.override_attributes["deep"]["nested"]["item"]).to be_truthy
     end
 
     context "when the override attribute is already set" do
@@ -24,7 +24,7 @@ describe Ridley::EnvironmentObject do
         }
         subject.set_override_attribute('deep.nested.item', true)
 
-        subject.override_attributes["deep"]["nested"]["item"].should be_true
+        expect(subject.override_attributes["deep"]["nested"]["item"]).to be_truthy
       end
     end
   end
@@ -33,10 +33,10 @@ describe Ridley::EnvironmentObject do
     it "sets an override node attribute at the nested path" do
       subject.set_default_attribute('deep.nested.item', true)
 
-      subject.default_attributes.should have_key("deep")
-      subject.default_attributes["deep"].should have_key("nested")
-      subject.default_attributes["deep"]["nested"].should have_key("item")
-      subject.default_attributes["deep"]["nested"]["item"].should be_true
+      expect(subject.default_attributes).to have_key("deep")
+      expect(subject.default_attributes["deep"]).to have_key("nested")
+      expect(subject.default_attributes["deep"]["nested"]).to have_key("item")
+      expect(subject.default_attributes["deep"]["nested"]["item"]).to be_truthy
     end
 
     context "when the override attribute is already set" do
@@ -50,7 +50,7 @@ describe Ridley::EnvironmentObject do
         }
         subject.set_default_attribute('deep.nested.item', true)
 
-        subject.default_attributes["deep"]["nested"]["item"].should be_true
+        expect(subject.default_attributes["deep"]["nested"]["item"]).to be_truthy
       end
     end
 

data/spec/unit/ridley/chef_objects/node_object_spec.rb

@@ -58,10 +58,10 @@ describe Ridley::NodeObject do
     it "sets a normal node attribute at the nested path" do
        subject.set_chef_attribute('deep.nested.item', true)
 
-       subject.normal.should have_key("deep")
-       subject.normal["deep"].should have_key("nested")
-       subject.normal["deep"]["nested"].should have_key("item")
-       subject.normal["deep"]["nested"]["item"].should be_true
+       expect(subject.normal).to have_key("deep")
+       expect(subject.normal["deep"]).to have_key("nested")
+       expect(subject.normal["deep"]["nested"]).to have_key("item")
+       expect(subject.normal["deep"]["nested"]["item"]).to be_truthy
     end
 
     context "when the normal attribute is already set" do
@@ -75,7 +75,7 @@ describe Ridley::NodeObject do
         }
         subject.set_chef_attribute('deep.nested.item', true)
 
-        subject.normal["deep"]["nested"]["item"].should be_true
+        expect(subject.normal["deep"]["nested"]["item"]).to be_truthy
       end
     end
   end
@@ -123,13 +123,13 @@ describe Ridley::NodeObject do
         "cloud" => Hash.new
       }
 
-      subject.cloud?.should be_true
+      expect(subject.cloud?).to be_truthy
     end
 
     it "returns false if the cloud automatic attribute is not set" do
       subject.automatic.delete(:cloud)
 
-      subject.cloud?.should be_false
+      expect(subject.cloud?).to be_falsey
     end
   end
 
@@ -141,13 +141,13 @@ describe Ridley::NodeObject do
         }
       }
 
-      subject.eucalyptus?.should be_true
+      expect(subject.eucalyptus?).to be_truthy
     end
 
     it "returns false if the node is not a cloud node" do
       subject.automatic.delete(:cloud)
 
-      subject.eucalyptus?.should be_false
+      expect(subject.eucalyptus?).to be_falsey
     end
 
     it "returns false if the node is a cloud node but not using the eucalyptus provider" do
@@ -157,7 +157,7 @@ describe Ridley::NodeObject do
         }
       }
 
-      subject.eucalyptus?.should be_false
+      expect(subject.eucalyptus?).to be_falsey
     end
   end
 
@@ -169,13 +169,13 @@ describe Ridley::NodeObject do
         }
       }
 
-      subject.ec2?.should be_true
+      expect(subject.ec2?).to be_truthy
     end
 
     it "returns false if the node is not a cloud node" do
       subject.automatic.delete(:cloud)
 
-      subject.ec2?.should be_false
+      expect(subject.ec2?).to be_falsey
     end
 
     it "returns false if the node is a cloud node but not using the ec2 provider" do
@@ -185,7 +185,7 @@ describe Ridley::NodeObject do
         }
       }
 
-      subject.ec2?.should be_false
+      expect(subject.ec2?).to be_falsey
     end
   end
 
@@ -197,13 +197,13 @@ describe Ridley::NodeObject do
         }
       }
 
-      subject.rackspace?.should be_true
+      expect(subject.rackspace?).to be_truthy
     end
 
     it "returns false if the node is not a cloud node" do
       subject.automatic.delete(:cloud)
 
-      subject.rackspace?.should be_false
+      expect(subject.rackspace?).to be_falsey
     end
 
     it "returns false if the node is a cloud node but not using the rackspace provider" do
@@ -213,7 +213,7 @@ describe Ridley::NodeObject do
         }
       }
 
-      subject.rackspace?.should be_false
+      expect(subject.rackspace?).to be_falsey
     end
   end
 
@@ -225,13 +225,13 @@ describe Ridley::NodeObject do
         }
       }
 
-      subject.cloud_provider.should eql("ec2")
+      expect(subject.cloud_provider).to eql("ec2")
     end
 
     it "returns nil if the node is not a cloud node" do
       subject.automatic.delete(:cloud)
 
-      subject.cloud_provider.should be_nil
+      expect(subject.cloud_provider).to be_nil
     end
   end
 
@@ -244,7 +244,7 @@ describe Ridley::NodeObject do
         }
       }
 
-      subject.public_ipv4.should eql("10.0.0.1")
+      expect(subject.public_ipv4).to eql("10.0.0.1")
     end
 
     it "returns the ipaddress if the node is not a cloud node" do
@@ -253,7 +253,7 @@ describe Ridley::NodeObject do
       }
       subject.automatic.delete(:cloud)
 
-      subject.public_ipv4.should eql("192.168.1.1")
+      expect(subject.public_ipv4).to eql("192.168.1.1")
     end
   end
 
@@ -265,7 +265,7 @@ describe Ridley::NodeObject do
         }
       }
 
-      subject.public_hostname.should eql("reset.cloud.riotgames.com")
+      expect(subject.public_hostname).to eql("reset.cloud.riotgames.com")
     end
 
     it "returns the FQDN if the node is not a cloud node" do
@@ -274,7 +274,7 @@ describe Ridley::NodeObject do
       }
       subject.automatic.delete(:cloud)
 
-      subject.public_hostname.should eql("reset.internal.riotgames.com")
+      expect(subject.public_hostname).to eql("reset.internal.riotgames.com")
     end
   end
 
@@ -284,14 +284,14 @@ describe Ridley::NodeObject do
     it "appends items to the run_list" do
       subject.merge_data(run_list: ["cook::one", "cook::two"])
 
-      subject.run_list.should =~ ["cook::one", "cook::two"]
+      expect(subject.run_list).to match_array(["cook::one", "cook::two"])
     end
 
     it "ensures the run_list is unique if identical items are given" do
       subject.run_list = [ "cook::one" ]
       subject.merge_data(run_list: ["cook::one", "cook::two"])
 
-      subject.run_list.should =~ ["cook::one", "cook::two"]
+      expect(subject.run_list).to match_array(["cook::one", "cook::two"])
     end
 
     it "deep merges attributes into the normal attributes" do
@@ -310,10 +310,10 @@ describe Ridley::NodeObject do
         }
       })
 
-      subject.normal[:one][:two].should have_key(:four)
-      subject.normal[:one][:two][:four].should eql(:deep)
-      subject.normal[:one][:two].should have_key(:three)
-      subject.normal[:one][:two][:three].should eql(:deep)
+      expect(subject.normal[:one][:two]).to have_key(:four)
+      expect(subject.normal[:one][:two][:four]).to eql(:deep)
+      expect(subject.normal[:one][:two]).to have_key(:three)
+      expect(subject.normal[:one][:two][:three]).to eql(:deep)
     end
   end
 end