spark_api 1.4.34 → 1.5.3

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

@@ -13,7 +13,7 @@ describe Constraint do
   end
   
   it "should print to string" do
-    subject.to_s.should eq("MaxValue: Field(ListPrice,1.0) Value(1000000.0,1000001.0)")
+    expect(subject.to_s).to eq("MaxValue: Field(ListPrice,1.0) Value(1000000.0,1000001.0)")
   end
 
 end

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

@@ -6,8 +6,8 @@ describe Contact do
   end
 
   it "should include the finders module" do
-    Contact.should respond_to(:find)
-    Contact.should respond_to(:my)
+    expect(Contact).to respond_to(:find)
+    expect(Contact).to respond_to(:my)
   end
 
   context "/contacts", :support do
@@ -15,9 +15,9 @@ describe Contact do
     on_get_it "should get all my contacts" do
       stub_api_get("/contacts", 'contacts/contacts.json')
       contacts = Contact.get
-      contacts.should be_an(Array)
-      contacts.length.should eq(3)
-      contacts.first.Id.should eq("20101230223226074201000000")
+      expect(contacts).to be_an(Array)
+      expect(contacts.length).to eq(3)
+      expect(contacts.first.Id).to eq("20101230223226074201000000")
     end
 
     on_post_it "should save a new contact" do
@@ -25,8 +25,8 @@ describe Contact do
       c=Contact.new
       c.DisplayName = "Contact Four"
       c.PrimaryEmail = "contact4@fbsdata.com"
-      c.save.should be(true)
-      c.Id.should eq('20101230223226074204000000')
+      expect(c.save).to be(true)
+      expect(c.Id).to eq('20101230223226074204000000')
     end
 
     on_post_it "should save a new contact and notify" do
@@ -35,9 +35,9 @@ describe Contact do
       c.notify = true
       c.attributes["DisplayName"] = "Contact Four"
       c.attributes["PrimaryEmail"] = "contact4@fbsdata.com"
-      c.save.should be(true)
-      c.Id.should eq('20101230223226074204000000')
-      c.ResourceUri.should eq('/v1/contacts/20101230223226074204000000')
+      expect(c.save).to be(true)
+      expect(c.Id).to eq('20101230223226074204000000')
+      expect(c.ResourceUri).to eq('/v1/contacts/20101230223226074204000000')
     end
 
     on_post_it "should fail saving" do
@@ -46,8 +46,8 @@ describe Contact do
       end
 
       c=Contact.new
-      c.save.should be(false)
-      expect{ c.save! }.to raise_error(SparkApi::ClientError){ |e| e.status.should == 400 }
+      expect(c.save).to be(false)
+      expect{ c.save! }.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to eq(400) }
     end
 
     on_post_it "should fail saving and set @errors" do
@@ -56,10 +56,10 @@ describe Contact do
       end
 
       c=Contact.new
-      c.errors.length.should eq(0)
-      c.save.should be_false
-      c.errors.length.should eq(1)
-      c.errors.first[:code].should eq(1055)
+      expect(c.errors.length).to eq(0)
+      expect(c.save).to be false
+      expect(c.errors.length).to eq(1)
+      expect(c.errors.first[:code]).to eq(1055)
     end
 
     context "on an epic fail" do
@@ -69,8 +69,8 @@ describe Contact do
         end
 
         c=Contact.new()
-        expect{ c.save! }.to raise_error(SparkApi::ClientError){ |e| e.status.should == 500 }
-        expect{ c.save }.to raise_error(SparkApi::ClientError){ |e| e.status.should == 500 }
+        expect{ c.save! }.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to eq(500) }
+        expect{ c.save }.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to eq(500) }
       end
     end
 
@@ -78,9 +78,9 @@ describe Contact do
       on_get_it "should get all my Tags" do
         stub_api_get("/contacts/tags", 'contacts/tags.json')
         tags = Contact.tags
-        tags.should be_an(Array)
-        tags.length.should eq(4)
-        tags.first["Tag"].should eq("Current Buyers")
+        expect(tags).to be_an(Array)
+        expect(tags.length).to eq(4)
+        expect(tags.first["Tag"]).to eq("Current Buyers")
       end
     end
 
@@ -88,30 +88,30 @@ describe Contact do
       on_get_it "should get all contacts with Tag <tag_name>" do
         stub_api_get("/contacts/tags/IDX%20Lead", 'contacts/contacts.json')
         contacts = Contact.by_tag("IDX Lead")
-        contacts.should be_an(Array)
-        contacts.length.should eq(3)
-        contacts.first.Id.should eq("20101230223226074201000000")
-        contacts.first.Tags[0].should eq("IDX Lead")
+        expect(contacts).to be_an(Array)
+        expect(contacts.length).to eq(3)
+        expect(contacts.first.Id).to eq("20101230223226074201000000")
+        expect(contacts.first.Tags[0]).to eq("IDX Lead")
       end
     end
 
     context "/export", :support do
       on_get_it "should get all contacts belonging to the current user" do
         stub_api_get("/contacts/export", 'contacts/contacts.json')
-        Contact.should respond_to(:export)
+        expect(Contact).to respond_to(:export)
         contacts = Contact.export
-        contacts.should be_an(Array)
-        contacts.length.should eq(3)
+        expect(contacts).to be_an(Array)
+        expect(contacts.length).to eq(3)
       end
     end
 
     context "/export/all", :support do
       on_get_it "should get all contacts belonging to the current user" do
         stub_api_get("/contacts/export/all", 'contacts/contacts.json')
-        Contact.should respond_to(:export_all)
+        expect(Contact).to respond_to(:export_all)
         contacts = Contact.export_all
-        contacts.should be_an(Array)
-        contacts.length.should eq(3)
+        expect(contacts).to be_an(Array)
+        expect(contacts.length).to eq(3)
       end
     end
 
@@ -131,8 +131,8 @@ describe Contact do
       on_get_it "should get all the saved searches belonging to the customer" do
         stub_api_get("/contacts/#{contact.Id}/savedsearches", 'saved_searches/get.json')
         saved_searches = contact.saved_searches
-        saved_searches.should be_an(Array)
-        saved_searches.length.should eq(2)
+        expect(saved_searches).to be_an(Array)
+        expect(saved_searches.length).to eq(2)
       end
 
       it "should pass any arguments as parameters" do
@@ -152,8 +152,8 @@ describe Contact do
       on_get_it "should get all the provided searches belonging to the customer" do
         stub_api_get("/contacts/#{contact.Id}/provided/savedsearches", 'saved_searches/get.json')
         saved_searches = contact.provided_searches
-        saved_searches.should be_an(Array)
-        saved_searches.length.should eq(2)
+        expect(saved_searches).to be_an(Array)
+        expect(saved_searches.length).to eq(2)
       end
 
       it "should pass any arguments as parameters" do
@@ -173,8 +173,8 @@ describe Contact do
       on_get_it "should get all the listing carts belonging to the customer" do
         stub_api_get("/contacts/#{contact.Id}/listingcarts", 'listing_carts/listing_cart.json')
         listing_carts = contact.listing_carts
-        listing_carts.should be_an(Array)
-        listing_carts.length.should eq(2)
+        expect(listing_carts).to be_an(Array)
+        expect(listing_carts.length).to eq(2)
       end
 
       it "should pass any arguments as parameters" do
@@ -189,7 +189,7 @@ describe Contact do
         contact = Contact.my
         stub_api_get("/contacts/#{contact.Id}/portal", 'contacts/vow_accounts/get.json')
         vow_account = contact.vow_account
-        vow_account.persisted?.should be_true
+        expect(vow_account.persisted?).to be true
       end
     end
 
@@ -198,17 +198,17 @@ describe Contact do
       it "should get all of a contact's comments" do
         s = stub_api_get("/contacts/#{contact_id}/comments", "comments/get.json")
         comments = Contact.new(:Id => contact_id).comments
-        comments.size.should eq(2)
-        s.should have_been_requested
+        expect(comments.size).to eq(2)
+        expect(s).to have_been_requested
       end
 
       it "should create a new contact comment" do
         s = stub_api_post("/contacts/#{contact_id}/comments", "comments/new.json", "comments/post.json")
         comment = Comment.new(:Comment => "This is a comment.")
         comment.parent = Contact.new(:Id => contact_id)
-        comment.save.should be(true)
-        comment.Id.should eq("20121114100201798092000005")
-        s.should have_been_requested
+        expect(comment.save).to be(true)
+        expect(comment.Id).to eq("20121114100201798092000005")
+        expect(s).to have_been_requested
       end
 
       it "should create a new contact comment using helper method" do
@@ -216,8 +216,8 @@ describe Contact do
         s = stub_api_post("/contacts/#{contact_id}/comments", "comments/new.json", "comments/post.json")
         contact = Contact.my
         comment = contact.comment "This is a comment."
-        comment.should be_a(Comment)
-        s.should have_been_requested
+        expect(comment).to be_a(Comment)
+        expect(s).to have_been_requested
       end
 
     end
@@ -230,8 +230,8 @@ describe Contact do
         stub_api_get("/contacts/#{contact_id}/comments", "comments/get.json")
         s = stub_api_delete("/activities/20121128132106172132000004/comments/#{id}", "success.json")
         comment = Contact.new(:Id => contact_id).comments.first
-        comment.destroy.should eq(true)
-        s.should have_been_requested
+        expect(comment.destroy).to eq(true)
+        expect(s).to have_been_requested
       end
 
     end
@@ -242,9 +242,9 @@ describe Contact do
     on_get_it "should get a single contact when using #my" do
       stub_api_get("/my/contact", 'contacts/my.json')
       contact = Contact.my
-      contact.should be_a(Contact)
-      contact.Id.should == '20090928182824338901000000'
-      contact.DisplayName.should == 'BH FOO'
+      expect(contact).to be_a(Contact)
+      expect(contact.Id).to eq('20090928182824338901000000')
+      expect(contact.DisplayName).to eq('BH FOO')
     end
   end
 

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