spark_api 1.4.34 → 1.5.0

data/spec/unit/spark_api/models/dirty_spec.rb

@@ -15,15 +15,15 @@ describe Dirty do
   end
 
   it "lets you know if you've changed any attributes" do
-    @model.changed?.should be true
+    expect(@model.changed?).to be true
   end
 
   it "should return an array of the attributes that have been changed" do
-    @model.changed.should eq(["Name"])
+    expect(@model.changed).to eq(["Name"])
   end
 
   it "should return a hash diff of current changes on a model" do
-    @model.changes.should eq({
+    expect(@model.changes).to eq({
       "Name" => ["some old name", "a new name"]
     })
   end
@@ -31,34 +31,34 @@ describe Dirty do
   it "should return previously changed attributes after save" do
     stub_api_post('/test/example', { :MyExampleModels => [ @model.attributes ] }, 'base.json')
     @model.save
-    @model.previous_changes.should eq({
+    expect(@model.previous_changes).to eq({
     })
   end
 
   it "should return changed attributes with old values" do
-    @model.changed_attributes.should eq({
+    expect(@model.changed_attributes).to eq({
       "Name" => "some old name"
     })
   end
 
   it "should return changed attributes with new values" do
-    @model.dirty_attributes.should eq({
+    expect(@model.dirty_attributes).to eq({
       "Name" => "a new name"
     })
   end
 
   it "does not mark attributes dirty when initialized" do
     @model = MyExampleModel.new(:Name => "some sort of name")
-    @model.attributes.size.should eq(1)
-    @model.changed_attributes.should eq({})
-    @model.dirty_attributes.should eq({})
+    expect(@model.attributes.size).to eq(1)
+    expect(@model.changed_attributes).to eq({})
+    expect(@model.dirty_attributes).to eq({})
   end
 
   it "marks attributes dirty that are loaded later" do
     @model.load(:Name => "some sort of name")
-    @model.attributes.size.should eq(1)
-    @model.changed_attributes.should eq({"Name"=>"some old name"})
-    @model.dirty_attributes.should eq({"Name"=>"some sort of name"})
+    expect(@model.attributes.size).to eq(1)
+    expect(@model.changed_attributes).to eq({"Name"=>"some old name"})
+    expect(@model.dirty_attributes).to eq({"Name"=>"some sort of name"})
   end
 
 end

data/spec/unit/spark_api/models/document_spec.rb

@@ -11,7 +11,7 @@ describe Document do
   end
 
   it "should respond to a few methods" do
-    Document.should respond_to(:find_by_listing_key)
+    expect(Document).to respond_to(:find_by_listing_key)
   end
 
   context "/listings/<listing_id>/documents" do
@@ -20,8 +20,8 @@ describe Document do
       stub_api_get('/listings/1234/documents','listings/document_index.json')
 
       v = Document.find_by_listing_key('1234')
-      v.should be_an(Array)
-      v.length.should == 2
+      expect(v).to be_an(Array)
+      expect(v.length).to eq(2)
     end
   end
 

data/spec/unit/spark_api/models/fields_spec.rb

@@ -7,7 +7,7 @@ describe Fields do
 
   context "/fields/order", :support do
     on_get_it "should find field orders for all property types" do
-      Fields.should respond_to(:order)
+      expect(Fields).to respond_to(:order)
 
       # stub request
       stub_api_get('/fields/order','fields/order.json')
@@ -16,20 +16,20 @@ describe Fields do
       resources = subject.class.order
 
       # a standard array of results
-      resources.should be_an(Array)
-      resources.length.should eq(1)
+      expect(resources).to be_an(Array)
+      expect(resources.length).to eq(1)
 
       # make sure multiple property types are present
-      resources.first.should have_key("A")
-      resources.first.should have_key("B")
+      expect(resources.first).to have_key("A")
+      expect(resources.first).to have_key("B")
 
-      resources.first["A"].should be_an(Array)
+      expect(resources.first["A"]).to be_an(Array)
     end
   end
 
   context "/fields/order/<property_type>", :support do
     on_get_it "should find field order for a single property type" do
-      Fields.should respond_to(:order)
+      expect(Fields).to respond_to(:order)
 
       # stub request
       stub_api_get('/fields/order/A','fields/order_a.json')
@@ -38,15 +38,15 @@ describe Fields do
       resources = subject.class.order("A")
 
       # a standard array of results
-      resources.should be_an(Array)
-      resources.length.should eq(2)
+      expect(resources).to be_an(Array)
+      expect(resources.length).to eq(2)
 
       # validate a single entity
       group = resources.first[resources.first.keys.first]
-      group.should be_an(Array)
-      group.length.should eq(2)
+      expect(group).to be_an(Array)
+      expect(group.length).to eq(2)
       group.each do |field|
-        field.should have_key("Field")
+        expect(field).to have_key("Field")
       end
 
     end
@@ -54,7 +54,7 @@ describe Fields do
 
   context "/fields/order/settings", :support do
     on_get_it "returns the field order settings" do
-      Fields.should respond_to(:settings)
+      expect(Fields).to respond_to(:settings)
 
       # stub request
       stub_api_get('/fields/order/settings','fields/settings.json')
@@ -63,12 +63,12 @@ describe Fields do
       settings = subject.class.settings
 
       # a standard array of results
-      settings.should be_an(Array)
-      settings.length.should eq(1)
+      expect(settings).to be_an(Array)
+      expect(settings.length).to eq(1)
 
       # make sure ShowingInstructions is present
-      settings.first.should have_key("ShowingInstructions")
-      settings.first["ShowingInstructions"].should be_an(Array)
+      expect(settings.first).to have_key("ShowingInstructions")
+      expect(settings.first["ShowingInstructions"]).to be_an(Array)
     end
   end
 

data/spec/unit/spark_api/models/finders_spec.rb

@@ -14,13 +14,13 @@ describe Finders, "Finders model" do
   it "should get first result" do
     stub_api_get("/my_resource", 'finders.json')
     resource = MyResource.first
-    resource.Id.should eq(1)
+    expect(resource.Id).to eq(1)
   end
 
   it "should get last result" do
     stub_api_get("/my_resource", 'finders.json')
     resource = MyResource.last
-    resource.Id.should eq(2)
+    expect(resource.Id).to eq(2)
   end
 
   it "should find one result" do
@@ -29,23 +29,23 @@ describe Finders, "Finders model" do
       :_filter => "Something Eq 'dude'"
     })
     resource = MyResource.find_one(:_filter => "Something Eq 'dude'")
-    resource.Id.should eq(1)
+    expect(resource.Id).to eq(1)
   end
 
   describe "find" do
 
     it "should throw an error if no argument is passed" do
       stub_api_get("/my_resource/", 'finders.json')
-      lambda {
+      expect {
         MyResource.find()
-      }.should raise_error(ArgumentError)
+      }.to raise_error(ArgumentError)
     end
 
     it "should throw an error when the first argument is nil" do
       stub_api_get("/my_resource/", 'finders.json', {:_limit => 1})
-      lambda {
+      expect {
         MyResource.find(nil, {:_limit => 1})
-      }.should raise_error(ArgumentError)
+      }.to raise_error(ArgumentError)
     end
 
   end

data/spec/unit/spark_api/models/floplan_spec.rb

@@ -3,7 +3,7 @@ require './spec/spec_helper'
 describe FloPlan do
 
   it "responds to" do
-    FloPlan.should respond_to(:find_by_listing_key)
+    expect(FloPlan).to respond_to(:find_by_listing_key)
   end
 
   describe "/listings/<listing_id>/videos", :support do
@@ -14,9 +14,9 @@ describe FloPlan do
 
     on_get_it "should correctly split images and thumbnails" do
       p = FloPlan.find_by_listing_key('1234').first
-      p.attributes['Images'].length.should == 2
-      p.images.length.should == 1
-      p.thumbnails.length.should == 1
+      expect(p.attributes['Images'].length).to eq(2)
+      expect(p.images.length).to eq(1)
+      expect(p.thumbnails.length).to eq(1)
     end
 
   end

data/spec/unit/spark_api/models/listing_cart_spec.rb

@@ -9,9 +9,9 @@ describe ListingCart do
     on_get_it "should get all listing carts" do
       stub_api_get("/#{subject.class.element_name}", 'listing_carts/listing_cart.json')
       resources = subject.class.get
-      resources.should be_an(Array)
-      resources.length.should eq(2)
-      resources.first.Id.should eq("20100912153422758914000000")
+      expect(resources).to be_an(Array)
+      expect(resources.length).to eq(2)
+      expect(resources.first.Id).to eq("20100912153422758914000000")
     end
 
     on_post_it "should save a new listing cart" do
@@ -20,8 +20,8 @@ describe ListingCart do
                             '20110302120238448431000000',
                             '20110510011212354751000000']
       subject.Name = "My Cart's Name"
-      subject.save.should be(true)
-      subject.ResourceUri.should eq("/v1/listingcarts/20100912153422758914000000")
+      expect(subject.save).to be(true)
+      expect(subject.ResourceUri).to eq("/v1/listingcarts/20100912153422758914000000")
     end
 
     on_post_it "should fail saving" do
@@ -29,8 +29,8 @@ describe ListingCart do
         request.to_return(:status => 400, :body => fixture('errors/failure.json'))
       end
       subject
-      subject.save.should be(false)
-      expect{ subject.save! }.to raise_error(SparkApi::ClientError){ |e| e.status.should == 400 }
+      expect(subject.save).to be(false)
+      expect{ subject.save! }.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to eq(400) }
     end
   end
 
@@ -38,9 +38,9 @@ describe ListingCart do
     on_get_it "should get a listing cart" do
       stub_api_get("/#{subject.class.element_name}", 'listing_carts/listing_cart.json')
       resource = subject.class.get.first
-      resource.Id.should eq("20100912153422758914000000")
-      resource.Name.should eq("My Listing Cart")
-      resource.ListingCount.should eq(10)
+      expect(resource.Id).to eq("20100912153422758914000000")
+      expect(resource.Name).to eq("My Listing Cart")
+      expect(resource.ListingCount).to eq(10)
     end
 
     on_put_it "should save a listing cart Name" do
@@ -48,9 +48,9 @@ describe ListingCart do
       resource = subject.class.get.first
       stub_api_put("/#{subject.class.element_name}/#{resource.Id}", 'listing_carts/put_name.json', 'success.json')
       resource.Name = "My Cart's Name"
-      resource.changed?.should be(true)
-      resource.save.should be(true)
-      resource.ResourceUri.should eq("/v1/listingcarts/20100912153422758914000000")
+      expect(resource.changed?).to be(true)
+      expect(resource.save).to be(true)
+      expect(resource.ResourceUri).to eq("/v1/listingcarts/20100912153422758914000000")
     end
 
     on_put_it "should save a listing cart ListingIds" do
@@ -60,41 +60,41 @@ describe ListingCart do
       resource.ListingIds = ['20110112234857732941000000',
                              '20110302120238448431000000',
                              '20110510011212354751000000']
-      resource.changed?.should be(true)
-      resource.save.should be(true)
-      resource.ResourceUri.should eq("/v1/listingcarts/20100912153422758914000000")
+      expect(resource.changed?).to be(true)
+      expect(resource.save).to be(true)
+      expect(resource.ResourceUri).to eq("/v1/listingcarts/20100912153422758914000000")
     end
 
     on_post_it "should add a listing to a cart" do
       list_id = "20110621133454434543000000"
       stub_api_get("/#{subject.class.element_name}", 'listing_carts/listing_cart.json')
       resource = subject.class.get.first
-      resource.Id.should eq("20100912153422758914000000")
+      expect(resource.Id).to eq("20100912153422758914000000")
       stub_api_post("/#{subject.class.element_name}/#{resource.Id}",'listing_carts/add_listing_post.json', 'listing_carts/add_listing.json')
-      resource.ListingCount.should eq(10)
+      expect(resource.ListingCount).to eq(10)
       resource.add_listing(list_id)
-      resource.ListingCount.should eq(11)
+      expect(resource.ListingCount).to eq(11)
     end
 
     on_post_it "should add multiple listings to a cart" do
       listing_ids = ["20110621133454434543000000", "20110621133454434543000001"]
       stub_api_get("/#{subject.class.element_name}", 'listing_carts/listing_cart.json')
       resource = subject.class.get.first
-      resource.Id.should eq("20100912153422758914000000")
+      expect(resource.Id).to eq("20100912153422758914000000")
       stub_api_post("/#{subject.class.element_name}/#{resource.Id}",'listing_carts/add_listings_post.json', 'listing_carts/add_listings.json')
-      resource.ListingCount.should eq(10)
+      expect(resource.ListingCount).to eq(10)
       resource.add_listings(listing_ids)
-      resource.ListingCount.should eq(12)
+      expect(resource.ListingCount).to eq(12)
     end
 
     on_delete_it "should delete a listing cart" do
       stub_api_get("/#{subject.class.element_name}", 'listing_carts/listing_cart.json')
       resource = subject.class.get.first
-      resource.Id.should eq("20100912153422758914000000")
-      resource.Name.should eq("My Listing Cart")
-      resource.ListingCount.should eq(10)
+      expect(resource.Id).to eq("20100912153422758914000000")
+      expect(resource.Name).to eq("My Listing Cart")
+      expect(resource.ListingCount).to eq(10)
       stub_api_delete("/#{subject.class.element_name}/#{resource.Id}", 'success.json')
-      resource.delete.should be(true)
+      expect(resource.delete).to be(true)
     end
   end
 
@@ -103,11 +103,11 @@ describe ListingCart do
       list_id = "20110621133454434543000000"
       stub_api_get("/#{subject.class.element_name}", 'listing_carts/listing_cart.json')
       resource = subject.class.get.first
-      resource.Id.should eq("20100912153422758914000000")
+      expect(resource.Id).to eq("20100912153422758914000000")
       stub_api_delete("/#{subject.class.element_name}/#{resource.Id}/listings/#{list_id}", 'listing_carts/remove_listing.json')
-      resource.ListingCount.should eq(10)
+      expect(resource.ListingCount).to eq(10)
       resource.remove_listing(list_id)
-      resource.ListingCount.should eq(9)
+      expect(resource.ListingCount).to eq(9)
     end
   end
 
@@ -117,9 +117,9 @@ describe ListingCart do
       stub_api_get("/#{subject.class.element_name}/for/#{listing.Id}", 'listing_carts/listing_cart.json')
       [listing, listing.Id ].each do |l|
         resources = subject.class.for(l)
-        resources.should be_an(Array)
-        resources.length.should eq(2)
-        resources.first.Id.should eq("20100912153422758914000000")
+        expect(resources).to be_an(Array)
+        expect(resources.length).to eq(2)
+        expect(resources.first.Id).to eq("20100912153422758914000000")
       end
     end
   end
@@ -128,9 +128,9 @@ describe ListingCart do
     on_get_it "should get the carts for a user" do
       stub_api_get("/my/#{subject.class.element_name}", 'listing_carts/listing_cart.json')
       resources = subject.class.my
-      resources.should be_an(Array)
-      resources.length.should eq(2)
-      resources.first.Id.should eq("20100912153422758914000000")
+      expect(resources).to be_an(Array)
+      expect(resources.length).to eq(2)
+      expect(resources.first.Id).to eq("20100912153422758914000000")
     end
   end
 
@@ -138,9 +138,9 @@ describe ListingCart do
     on_get_it "should get the carts specific to a portal user" do
       stub_api_get("/#{subject.class.element_name}/portal", 'listing_carts/listing_cart.json')
       resources = subject.class.portal
-      resources.should be_an(Array)
-      resources.length.should eq(2)
-      resources.first.Id.should eq("20100912153422758914000000")
+      expect(resources).to be_an(Array)
+      expect(resources.length).to eq(2)
+      expect(resources.first.Id).to eq("20100912153422758914000000")
     end
   end
 
@@ -148,38 +148,38 @@ describe ListingCart do
     it "should return the listings in the cart" do 
       resource = subject.class.new Id: 5, ListingIds: ["1234"]
       stub_api_get("/#{subject.class.element_name}/#{resource.Id}/listings", 'listings/multiple.json')
-      resource.listings.should be_a(Array)
-      resource.listings.first.should be_a(Listing)
+      expect(resource.listings).to be_a(Array)
+      expect(resource.listings.first).to be_a(Listing)
     end
 
     it "should return an empty array if there aren't any listings" do 
       resource = subject.class.new Id: 5
-      resource.listings.should be_a(Array)
-      resource.listings.count.should === 0
+      expect(resource.listings).to be_a(Array)
+      expect(resource.listings.count).to be === 0
     end
   end
 
   describe "filter" do
     it "should return a filter string for the cart" do
       resource = subject.class.new Id: 5
-      resource.filter.should eq("ListingCart Eq '5'")
+      expect(resource.filter).to eq("ListingCart Eq '5'")
     end
   end
 
   describe "#deletable?" do
     it "should return true for private custom carts" do
       resource = subject.class.new
-      expect(resource.deletable?).to be_true
+      expect(resource.deletable?).to be true
     end
     
     it "should return true for custom vow carts" do
       resource = subject.class.new PortalCartType: "Custom"
-      expect(resource.deletable?).to be_true
+      expect(resource.deletable?).to be true
     end
 
     it "should return false for vow carts" do
       resource = subject.class.new PortalCartType: "Favorites"
-      expect(resource.deletable?).to be_false
+      expect(resource.deletable?).to be false
     end
   end
 

data/spec/unit/spark_api/models/listing_meta_translations_spec.rb

@@ -12,18 +12,18 @@ describe ListingMetaTranslations do
       stub_api_get("/flexmls/propertytypes/A/translations", 'listing_meta_translations/get.json')
       
       translations = ListingMetaTranslations.for_property_type('A')
-      translations.should be_an(ListingMetaTranslations)
-      translations.StandardFields.should be_an(Hash)
-      translations.CustomFields.should be_an(Hash)
+      expect(translations).to be_an(ListingMetaTranslations)
+      expect(translations.StandardFields).to be_an(Hash)
+      expect(translations.CustomFields).to be_an(Hash)
     end
     
     on_get_it "doesn't explode if there are no results" do
       stub_api_get("/flexmls/propertytypes/A/translations", 'no_results.json')
       
       translations = ListingMetaTranslations.for_property_type('A')
-      translations.should be_an(ListingMetaTranslations)
-      translations.StandardFields.should be_an(Hash)
-      translations.CustomFields.should be_an(Hash)
+      expect(translations).to be_an(ListingMetaTranslations)
+      expect(translations.StandardFields).to be_an(Hash)
+      expect(translations.CustomFields).to be_an(Hash)
     end
   end