spark_api 1.4.34 → 1.5.3

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

@@ -21,18 +21,18 @@ describe Message do
     on_get_it "should get all my messages" do
       stub_api_get("/messages", 'messages/get.json')
       messages = Message.find(:all)
-      messages.size.should == 2
+      expect(messages.size).to eq(2)
     end
 
     on_post_it "should save a new message" do
       stub_api_post("/messages", 'messages/new.json', 'messages/post.json')
-      subject.save.should be(true)
+      expect(subject.save).to be(true)
     end
 
     on_post_it "should save a new message with recipients" do
       stub_api_post("/messages", 'messages/new_with_recipients.json', 'messages/post.json')
       subject.attributes["Recipients"] =  ["20110112234857732941000000","20110092234857738467000000"]
-      subject.save.should be(true)
+      expect(subject.save).to be(true)
     end
 
     on_post_it "should fail saving" do
@@ -40,8 +40,8 @@ describe Message do
         request.to_return(:status => 400, :body => fixture('errors/failure.json'))
       end
       m=subject.class.new
-      m.save.should be(false)
-      expect{ m.save! }.to raise_error(SparkApi::ClientError){ |e| e.status.should == 400 }
+      expect(m.save).to be(false)
+      expect{ m.save! }.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to eq(400) }
     end
   end
 
@@ -49,7 +49,7 @@ describe Message do
     on_get_it "should get a single message" do
       subject.attributes["Id"] = "20110353423434130982000000"
       stub_api_get("/messages/#{subject.Id}", "messages/get.json")
-      subject.should be_a(Message)
+      expect(subject).to be_a(Message)
     end
   end
 
@@ -57,7 +57,7 @@ describe Message do
     on_get_it "should get all the replies" do
       subject.attributes["Id"] = "20110353423434130982000000"
       stub_api_get("/messages/#{subject.Id}/replies", "messages/get.json", :_expand => 'Body, Sender')
-      subject.replies.size.should == 2
+      expect(subject.replies.size).to eq(2)
     end
 
   end
@@ -67,13 +67,13 @@ describe Message do
     on_get_it "gets unread messages" do
       stub_api_get("/messages/unread", 'messages/get.json', {})
       messages = Message.unread
-      messages.size.should == 2
-      messages.first.should be_a Message
+      expect(messages.size).to eq(2)
+      expect(messages.first).to be_a Message
     end
 
     on_get_it "gets unread messages count" do
       stub_api_get("/messages/unread", 'messages/count.json', _pagination: 'count')
-      Message.unread_count.should == 78
+      expect(Message.unread_count).to eq(78)
     end
 
   end

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

@@ -3,10 +3,10 @@ require './spec/spec_helper'
 describe Note do
 
   it "responds to instance and class methods" do
-    Note.should respond_to(:get)
-    Note.new.should respond_to(:save)
-    Note.new.should respond_to(:save!)
-    Note.new.should respond_to(:delete)
+    expect(Note).to respond_to(:get)
+    expect(Note.new).to respond_to(:save)
+    expect(Note.new).to respond_to(:save!)
+    expect(Note.new).to respond_to(:delete)
   end
 
   context "when shared with a contact" do
@@ -16,19 +16,19 @@ describe Note do
     end
 
     it "should have the correct path" do
-      @note.path.should == "/listings/1234/shared/notes/contacts/5678"
+      expect(@note.path).to eq("/listings/1234/shared/notes/contacts/5678")
     end
 
     context "/listings/<listing_id>/shared/notes/contacts/<contact_id>", :support do
       on_get_it "GET should get my notes" do
         stub_api_get("#{@note.path}", 'notes/agent_shared.json')
         ret = @note.get
-        ret.Note.should == "lorem ipsum dolor sit amet"
+        expect(ret.Note).to eq("lorem ipsum dolor sit amet")
       end
 
       on_get_it "should return a nil when no shared notes exist" do
         stub_api_get("#{@note.path}", 'notes/agent_shared_empty.json')
-        @note.get.should be_nil
+        expect(@note.get).to be_nil
       end
 
       on_delete_it "should allow you to delete an existing note" do
@@ -43,15 +43,15 @@ describe Note do
           request.to_return(:status => 500, :body => fixture('generic_failure.json'))
         end
 
-        expect { n.save! }.to raise_error(SparkApi::ClientError) { |e| e.status.should == 500 }
-        expect { n.save }.to raise_error(SparkApi::ClientError) { |e| e.status.should == 500 }
+        expect { n.save! }.to raise_error(SparkApi::ClientError) { |e| expect(e.status).to eq(500) }
+        expect { n.save }.to raise_error(SparkApi::ClientError) { |e| expect(e.status).to eq(500) }
       end
 
       on_put_it "should allow adding of a note" do
         n = @note.new(:Note => "lorem ipsum dolor")
         stub_api_put("#{@note.path}", 'notes/new.json', 'notes/add.json')
         n.save
-        n.ResourceUri.should == '/v1/listings/20100909200152674436000000/shared/notes/contacts/20110407212043616271000000/'
+        expect(n.ResourceUri).to eq('/v1/listings/20100909200152674436000000/shared/notes/contacts/20110407212043616271000000/')
       end
 
     end

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

@@ -19,13 +19,13 @@ describe Notification do
       stub_api_get('/notifications', 'notifications/notifications.json')
 
       notifications = Notification.get
-      notifications.should be_an(Array)
-      notifications.count.should equal(3)
+      expect(notifications).to be_an(Array)
+      expect(notifications.count).to equal(3)
     end
 
     on_post_it "should create a new notification" do
       stub_api_post("/notifications", 'notifications/new.json', 'notifications/post.json')
-      subject.save.should be(true)
+      expect(subject.save).to be(true)
     end
 
     on_post_it "should fail saving" do
@@ -36,8 +36,8 @@ describe Notification do
       m.attributes['Message'] = 'Your PDF generation has completed!'
       m.attributes['BrowserUri'] = 'http://myapplication.com/cmas/19581825.pdf'
       m.attributes['ResourceUri'] = 'http://myapplication.com/cmas/19581825.json'
-      m.save.should be(false)
-      expect{ m.save! }.to raise_error(SparkApi::ClientError){ |e| e.status.should == 400 }
+      expect(m.save).to be(false)
+      expect{ m.save! }.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to eq(400) }
     end
   end
 
@@ -56,7 +56,7 @@ describe Notification do
       stub_api_get('/notifications/unread', 'notifications/unread.json', {:_pagination => 'count'})
 
       notification_count = Notification.unread
-      notification_count.should equal(30)
+      expect(notification_count).to equal(30)
     end
   end
 end

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

@@ -14,7 +14,7 @@ describe OpenHouse do
   end
 
   it "should respond to a few methods" do
-    subject.class.should respond_to(:find_by_listing_key)
+    expect(subject.class).to respond_to(:find_by_listing_key)
   end
 
   context "/listings/<listing_id>/openhouses", :support do
@@ -22,9 +22,9 @@ describe OpenHouse do
       stub_auth_request
       stub_api_get('/listings/20060412165917817933000000/openhouses','listings/open_houses.json')
       houses = subject.class.find_by_listing_key('20060412165917817933000000')
-      houses.should be_an(Array)
-      houses.length.should eq(2)
-      houses.first.Id.should eq("20101127153422574618000000")
+      expect(houses).to be_an(Array)
+      expect(houses.length).to eq(2)
+      expect(houses.first.Id).to eq("20101127153422574618000000")
     end
   end
 

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

@@ -20,14 +20,14 @@ describe Photo do
     end
 
     it "responds to" do
-      subject.should respond_to(:primary?)
-      Photo.should respond_to(:find_by_listing_key)
+      expect(subject).to respond_to(:primary?)
+      expect(Photo).to respond_to(:find_by_listing_key)
     end
 
     it "knows if it's the primary photo" do
-      subject.primary?.should be_true
+      expect(subject.primary?).to be true
       subject.Primary = false
-      subject.primary?.should be_false
+      expect(subject.primary?).to be false
     end
   end
 
@@ -42,7 +42,7 @@ describe Photo do
     end
 
     it "should be scoped to a listing" do
-      subject.class.path.should eq("/listings/1234/photos")
+      expect(subject.class.path).to eq("/listings/1234/photos")
     end
 
     describe "/listings/<listing_id>/photos", :support  do
@@ -53,7 +53,7 @@ describe Photo do
 
       on_get_it "should get an array of photos" do
         p = Photo.find_by_listing_key('1234')
-        p.should be_an(Array)
+        expect(p).to be_an(Array)
       end
 
       on_post_it "should upload a new photo" do
@@ -62,7 +62,7 @@ describe Photo do
         subject.Caption = "Creators of flexMLS!"
         subject.load_picture("spec/fixtures/logo_fbs.png")
         subject.save!
-        subject.Id.should eq("20110826220032167405000000")
+        expect(subject.Id).to eq("20110826220032167405000000")
       end
     end
 
@@ -78,7 +78,7 @@ describe Photo do
         subject.Caption = "Creators of flexMLS!"
         subject.load_picture("spec/fixtures/logo_fbs.png")
         subject.save!
-        subject.Id.should eq("20110826220032167405000000")
+        expect(subject.Id).to eq("20110826220032167405000000")
       end
 
       on_put_it "should rotate a photo" do

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

@@ -11,13 +11,13 @@ describe Portal do
     it "should return a new portal if the current user doesn't have one yet" do
       stub_api_get("/portal", "portal/my_non_existant.json")
       portal = Portal.my
-      portal.persisted?.should eq(false)
+      expect(portal.persisted?).to eq(false)
     end
 
     it "should get the current user's portal" do
       stub_api_get("/portal", "portal/my.json")
       portal = Portal.my
-      portal.persisted?.should eq(true)
+      expect(portal.persisted?).to eq(true)
     end
 
     it "should create a portal for the current user" do
@@ -35,7 +35,7 @@ describe Portal do
       s = stub_api_put("/portal/20100912153422758914000000", "portal/enable.json", "portal/post.json")
       portal = Portal.my
       portal.enable
-      s.should have_been_requested
+      expect(s).to have_been_requested
     end
 
     it "should disable the current user's portal" do
@@ -43,7 +43,7 @@ describe Portal do
       s = stub_api_put("/portal/20100912153422758914000000", "portal/disable.json", "portal/post.json")
       portal = Portal.my
       portal.disable
-      s.should have_been_requested
+      expect(s).to have_been_requested
     end
 
   end

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

@@ -3,7 +3,7 @@ require './spec/spec_helper'
 describe PropertyTypes do
 
   it "should respond to get" do
-    PropertyTypes.should respond_to(:get)
+    expect(PropertyTypes).to respond_to(:get)
   end
 
   describe "/propertytypes", :support do
@@ -15,8 +15,8 @@ describe PropertyTypes do
       stub_api_get("/propertytypes", "property_types/property_types.json")
 
       types = PropertyTypes.get
-      types.should be_an(Array)
-      types.count.should be(6)
+      expect(types).to be_an(Array)
+      expect(types.count).to be(6)
     end
   end
 
@@ -29,8 +29,8 @@ describe PropertyTypes do
       stub_api_get("/propertytypes/all", "property_types/property_types.json")
 
       types = PropertyTypes.all
-      types.should be_an(Array)
-      types.count.should be(6)
+      expect(types).to be_an(Array)
+      expect(types.count).to be(6)
     end
   end
 

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

@@ -10,21 +10,23 @@ describe RentalCalendar do
 
     on_get_it "should get an array of rental calendars" do
       p = RentalCalendar.find_by_listing_key('1234')
-      p.should be_an(Array)
-      p.length.should == 2
+      expect(p).to be_an(Array)
+      expect(p.length).to eq(2)
     end
 
   end
   
   describe "test include_date method" do
-    cal = RentalCalendar.new
-    cal.StartDate = Date.parse("2012-07-12")
-    cal.EndDate = Date.parse("2012-07-18")
-    cal.include_date?(Date.parse("2012-06-01")).should == false
-    cal.include_date?(Date.parse("2012-07-12")).should == true
-    cal.include_date?(Date.parse("2012-07-15")).should == true
-    cal.include_date?(Date.parse("2012-07-18")).should == true
-    cal.include_date?(Date.parse("2012-08-01")).should == false
+    it "knows about included dates" do
+      cal = RentalCalendar.new
+      cal.StartDate = Date.parse("2012-07-12")
+      cal.EndDate = Date.parse("2012-07-18")
+      expect(cal.include_date?(Date.parse("2012-06-01"))).to be false
+      expect(cal.include_date?(Date.parse("2012-07-12"))).to be true
+      expect(cal.include_date?(Date.parse("2012-07-15"))).to be true
+      expect(cal.include_date?(Date.parse("2012-07-18"))).to be true
+      expect(cal.include_date?(Date.parse("2012-08-01"))).to be false
+    end
   end
 
-end
+end

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

@@ -9,8 +9,8 @@ describe Rule do
       stub_api_get('/listings/rules/propertytypes/A','rules/get.json')
 
       rules = Rule.for_property_type('A')
-      rules.should be_an(Array)
-      rules.length.should == 2
+      expect(rules).to be_an(Array)
+      expect(rules.length).to eq(2)
     end
 
   end

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

@@ -13,19 +13,19 @@ describe SavedSearch do
     on_get_it "should get all SavedSearches" do
       stub_api_get("/#{subject.class.element_name}", 'saved_searches/get.json')
       resources = subject.class.get
-      resources.should be_an(Array)
-      resources.length.should eq(2)
-      resources.first.Id.should eq(id)
+      expect(resources).to be_an(Array)
+      expect(resources.length).to eq(2)
+      expect(resources.first.Id).to eq(id)
     end
 
     on_post_it "should create a saved search" do
       stub_api_post("/#{subject.class.element_name}", "saved_searches/new.json", "saved_searches/post.json")
       resource = SavedSearch.new({ :Name => "A new search name here" })
-      resource.should respond_to(:save)
+      expect(resource).to respond_to(:save)
       resource.save
-      resource.persisted?.should eq(true)
-      resource.attributes['Id'].should eq("20100815220615294367000000")
-      resource.attributes['ResourceUri'].should eq("/v1/savedsearches/20100815220615294367000000")
+      expect(resource.persisted?).to eq(true)
+      expect(resource.attributes['Id']).to eq("20100815220615294367000000")
+      expect(resource.attributes['ResourceUri']).to eq("/v1/savedsearches/20100815220615294367000000")
     end
 
   end
@@ -35,15 +35,15 @@ describe SavedSearch do
     on_get_it "should get a SavedSearch" do
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/get.json')
       resource = subject.class.find(id)
-      resource.Id.should eq(id)
-      resource.Name.should eq("Search name here")
+      expect(resource.Id).to eq(id)
+      expect(resource.Name).to eq("Search name here")
     end
 
     on_put_it "should update a SavedSearch" do
       stub_api_get("/#{subject.class.element_name}/#{id}", "saved_searches/get.json")
       stub_api_put("/#{subject.class.element_name}/#{id}", "saved_searches/update.json", "saved_searches/post.json")
       resource = subject.class.find(id)
-      resource.should respond_to(:save)
+      expect(resource).to respond_to(:save)
       resource.Name = "A new search name here"
       resource.save
     end
@@ -52,7 +52,7 @@ describe SavedSearch do
       stub_api_get("/#{subject.class.element_name}/#{id}", "saved_searches/get.json")
       stub_api_delete("/#{subject.class.element_name}/#{id}", "generic_delete.json")
       resource = subject.class.find(id)
-      resource.should respond_to(:delete)
+      expect(resource).to respond_to(:delete)
       resource.delete
     end
 
@@ -61,8 +61,8 @@ describe SavedSearch do
       stub_api_put("/#{subject.class.element_name}/#{id}/contacts/20101230223226074306000000", nil, "success.json")
       resource = subject.class.find(id)
       resource.attach("20101230223226074306000000")
-      resource.ContactIds.size.should eq(2)
-      resource.ContactIds.any? { |c| c == "20101230223226074306000000" }.should eq(true)
+      expect(resource.ContactIds.size).to eq(2)
+      expect(resource.ContactIds.any? { |c| c == "20101230223226074306000000" }).to eq(true)
     end
 
     it "should detach a contact by id" do
@@ -70,7 +70,7 @@ describe SavedSearch do
       stub_api_delete("/#{subject.class.element_name}/#{id}/contacts/20100815220615294367000000", "generic_delete.json")
       resource = subject.class.find(id)
       resource.detach("20100815220615294367000000")
-      resource.ContactIds.size.should eq(0)
+      expect(resource.ContactIds.size).to eq(0)
     end
 
     it "should attach a contact by Contact object" do
@@ -78,8 +78,8 @@ describe SavedSearch do
       stub_api_put("/#{subject.class.element_name}/#{id}/contacts/20101230223226074306000000", nil, "success.json")
       resource = subject.class.find(id)
       resource.attach(Contact.new({ :Id => "20101230223226074306000000" }))
-      resource.ContactIds.size.should eq(2)
-      resource.ContactIds.any? { |c| c == "20101230223226074306000000" }.should eq(true)
+      expect(resource.ContactIds.size).to eq(2)
+      expect(resource.ContactIds.any? { |c| c == "20101230223226074306000000" }).to eq(true)
     end
 
     it "should detach a contact by Contact object" do
@@ -87,7 +87,7 @@ describe SavedSearch do
       stub_api_delete("/#{subject.class.element_name}/#{id}/contacts/20100815220615294367000000", "generic_delete.json")
       resource = subject.class.find(id)
       resource.detach(Contact.new({:Id => "20100815220615294367000000" }))
-      resource.ContactIds.size.should eq(0)
+      expect(resource.ContactIds.size).to eq(0)
     end
     
     it "should initialize ContactIds as an array if nil" do
@@ -96,7 +96,7 @@ describe SavedSearch do
       resource = subject.class.find(id)
       resource.ContactIds = nil
       resource.detach(Contact.new({:Id => "20100815220615294367000000" }))
-      resource.ContactIds.size.should eq(0)
+      expect(resource.ContactIds.size).to eq(0)
     end
 
     describe "listings" do
@@ -106,8 +106,8 @@ describe SavedSearch do
         stub_api_get("/listings", 'listings/multiple.json', 
           {:_filter => "SavedSearch Eq '#{id}'"})
         listings = subject.class.find(id).listings
-        listings.should be_an(Array)
-        listings[0].should be_a(Listing)
+        expect(listings).to be_an(Array)
+        expect(listings[0]).to be_a(Listing)
       end
       
       it "should include the permissive parameter for provided searches" do
@@ -133,9 +133,9 @@ describe SavedSearch do
     on_get_it "should get provided SavedSearches" do
       stub_api_get("/provided/#{subject.class.element_name}", 'saved_searches/get.json')
       resources = subject.class.provided.get
-      resources.should be_an(Array)
-      resources.length.should eq(2)
-      resources.first.Id.should eq(id)
+      expect(resources).to be_an(Array)
+      expect(resources.length).to eq(2)
+      expect(resources.first.Id).to eq(id)
     end
   end
 
@@ -143,7 +143,7 @@ describe SavedSearch do
     on_get_it "should get tagged SavedSearches" do
       stub_api_get("/#{subject.class.element_name}/tags/Favorite", 'saved_searches/get.json')
       resources = subject.class.tagged("Favorite")
-      resources.should be_an(Array)
+      expect(resources).to be_an(Array)
     end
   end
 
@@ -155,24 +155,24 @@ describe SavedSearch do
 
       resource = subject.class.find(id)
       contacts = resource.contacts
-      contacts.should be_an(Array)
+      expect(contacts).to be_an(Array)
     end
 
     it "should return an empty array if model isn't persisted" do
       resource = SavedSearch.new
-      resource.contacts.should be_an(Array)
+      expect(resource.contacts).to be_an(Array)
     end
   end
 
   describe "favorite?" do
     it "should return true if the search has been tagged as a favorite" do
       search = SavedSearch.new(Tags: ["Favorites"])
-      search.should be_favorite
+      expect(search).to be_favorite
     end
 
     it "should return false if the search has not been tagged as a favorite" do
       search = SavedSearch.new
-      search.should_not be_favorite
+      expect(search).not_to be_favorite
     end
   end
 
@@ -182,7 +182,7 @@ describe SavedSearch do
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/with_newsfeed.json',
         { "_expand" => "NewsFeedSubscriptionSummary" } )
       resource = subject.class.find(id)
-      resource.has_active_newsfeed?.should == true
+      expect(resource.has_active_newsfeed?).to eq(true)
     end
 
     it "should return false if the search doesn't have a newsfeed" do
@@ -190,7 +190,7 @@ describe SavedSearch do
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/without_newsfeed.json',
         { "_expand" => "NewsFeedSubscriptionSummary" } )
       resource = subject.class.find(id)
-      resource.has_active_newsfeed?.should == false
+      expect(resource.has_active_newsfeed?).to eq(false)
     end
   end
 
@@ -200,7 +200,7 @@ describe SavedSearch do
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/with_inactive_newsfeed.json',
         { "_expand" => "NewsFeedSubscriptionSummary" } )
       resource = subject.class.find(id)
-      resource.has_inactive_newsfeed?.should == true
+      expect(resource.has_inactive_newsfeed?).to eq(true)
     end
 
     it "should return false if the search doesn't have a newsfeed" do
@@ -208,7 +208,7 @@ describe SavedSearch do
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/without_newsfeed.json',
         { "_expand" => "NewsFeedSubscriptionSummary, NewsFeeds" } )
       resource = subject.class.find(id)
-      resource.has_inactive_newsfeed?.should == false
+      expect(resource.has_inactive_newsfeed?).to eq(false)
     end
 
   end
@@ -219,7 +219,7 @@ describe SavedSearch do
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/with_newsfeed.json',
         { "_expand" => "NewsFeeds" } )      
       resource = subject.class.find(id)
-      resource.newsfeeds.should be_an(Array)
+      expect(resource.newsfeeds).to be_an(Array)
     end
   end