properties_spec.rb in hashme-0.2.0

- old
+ new
@@ -21,89 +21,89 @@
 
 
   describe "#get_attribute" do
     it "should provide object in model" do
       @obj[:key1] = 'value'
-      @obj.get_attribute(:key1).should eql('value')
+      expect(@obj.get_attribute(:key1)).to eql('value')
     end
   end
 
   describe "#set_attribute" do
     it "should be posible to set attribute not defined as property" do
       @obj.set_attribute('key1', 'value1')
       @obj.set_attribute(:key2, 'value2')
-      @obj[:key1].should eql('value1')
-      @obj[:key2].should eql('value2')
+      expect(@obj[:key1]).to eql('value1')
+      expect(@obj[:key2]).to eql('value2')
     end
 
     it "should set and cast attribute with property" do
       property = @model.send(:properties)[:name]
       name = "Fred Flinstone"
-      property.should_receive(:cast).with(@obj, name).and_return(name)
+      expect(property).to receive(:build).with(@obj, name).and_return(name)
       @obj.set_attribute(:name, name)
-      @obj[:name].should eql(name)
+      expect(@obj[:name]).to eql(name)
     end
   end
 
   describe ".properties" do
 
     it "should be instantiated after property set" do
-      @model.properties.should_not be_nil
-      @model.properties.class.should eql(Hash)
+      expect(@model.properties).to_not be_nil
+      expect(@model.properties.class).to eql(Hash)
     end
 
     it "should be empty if no properties" do
       model = Class.new do
         include Hashme
       end
-      model.properties.should be_empty
+      expect(model.properties).to be_empty
     end
 
     it "should be inherited from parent models" do
       mod = Class.new(@model) do
         property :surname, String
       end
-      mod.properties.keys.should include(:name)
-      mod.properties.keys.should include(:surname)
+      expect(mod.properties.keys).to include(:name)
+      expect(mod.properties.keys).to include(:surname)
       # Make sure we don't update the parent!
-      @model.properties.keys.should_not include(:surname)
+      expect(@model.properties.keys).to_not include(:surname)
     end
 
   end
 
   describe ".property" do
 
     it "should fail if no type is defined" do
-      @model.properties.length.should eql(1)
+      expect(@model.properties.length).to eql(1)
       expect {
         @model.property :foobar
       }.to raise_error(ArgumentError)
-      @model.properties.length.should eql(1)
+      expect(@model.properties.length).to eql(1)
     end
 
     it "should create a new property with helper methods" do
-      @model.properties.length.should eql(1)
+      expect(@model.properties.length).to eql(1)
       @model.property :desc, String
-      @model.properties.length.should eql(2)
+      expect(@model.properties.length).to eql(2)
 
       prop = @model.properties[:desc]
-      prop.class.should eql(Hashme::Property)
+      expect(prop.class).to eql(Hashme::Property)
 
-      @obj.should respond_to(:desc)
-      @obj.should respond_to(:desc=)
+      expect(@obj).to respond_to(:desc)
+      expect(@obj).to respond_to(:desc=)
 
       @obj.desc = "test"
-      @obj.desc.should eql("test")
+      expect(@obj.desc).to eql("test")
     end
     
     it "should return nil on property with no default" do
       @model.property :nickname, String
-      @obj.nickname.should be_nil
+      expect(@obj.nickname).to be_nil
     end
 
     it "should create helper method with support for default values" do
       @model.property :name, String, :default => "Sam"
-      @obj.name.should eql("Sam")
+      expect(@obj.name).to eql("Sam")
     end
 
   end
 
 end