spark_api 1.4.34 → 1.5.0

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

@@ -10,9 +10,9 @@ describe Activity do
     it "gets a current user's activities" do
       s = stub_api_get("/activities", "activities/get.json")
       activities = Activity.get
-      activities.should be_an(Array)
-      activities.size.should eq(2)
-      s.should have_been_requested
+      expect(activities).to be_an(Array)
+      expect(activities.size).to eq(2)
+      expect(s).to have_been_requested
     end
   end
 
@@ -21,8 +21,8 @@ describe Activity do
     it "gets an individual activity" do
       s = stub_api_get("/activities/#{id}", "activities/get.json")
       activity = Activity.find(id)
-      activity.should be_an(Activity)
-      s.should have_been_requested
+      expect(activity).to be_an(Activity)
+      expect(s).to have_been_requested
     end
   end
 

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

@@ -22,31 +22,31 @@ describe MyExampleModel, "Example model" do
   end
 
   it "should be persisted" do
-    @model.persisted?.should eq(true)
+    expect(@model.persisted?).to eq(true)
   end
 
   it "should not be persisted" do
     @new_model = MyExampleModel.new()
-    @new_model.persisted?.should eq(false)
+    expect(@new_model.persisted?).to eq(false)
   end
 
   it "should parse and return ResourceUri without v1" do
-    @model.resource_uri.should eq("/some/place/20101230223226074201000000")
+    expect(@model.resource_uri).to eq("/some/place/20101230223226074201000000")
   end
 
   it "should parse and return the correct path for a persisted resource" do
-    @model.path.should eq("/some/place")
+    expect(@model.path).to eq("/some/place")
   end
 
   it "should parse and return the correct path" do
     @model = MyExampleModel.new
-    @model.path.should eq("/test/example")
+    expect(@model.path).to eq("/test/example")
   end
 
   it "should parse and return the correct path for resource with a parent" do
     @model = MyExampleModel.new
     @model.parent = Contact.new({ :Id => "20101230223226074201000000" })
-    @model.path.should eq("/contacts/20101230223226074201000000/test/example")
+    expect(@model.path).to eq("/contacts/20101230223226074201000000/test/example")
   end
 
 end
@@ -55,16 +55,16 @@ describe Base, "Base model" do
 
   describe "class methods" do
     it "should set the element name" do
-      MyExampleModel.element_name.should eq("example")
-      MyDefaultModel.element_name.should eq("resource")
+      expect(MyExampleModel.element_name).to eq("example")
+      expect(MyDefaultModel.element_name).to eq("resource")
     end
     it "should set the prefix" do
-      MyExampleModel.prefix.should eq("/test/")
-      MyDefaultModel.prefix.should eq("/")
+      expect(MyExampleModel.prefix).to eq("/test/")
+      expect(MyDefaultModel.prefix).to eq("/")
     end
     it "should set the path" do
-      MyExampleModel.path.should eq("/test/example")
-      MyDefaultModel.path.should eq("/resource")
+      expect(MyExampleModel.path).to eq("/test/example")
+      expect(MyDefaultModel.path).to eq("/resource")
     end
     describe "finders" do
       before(:each) do
@@ -72,11 +72,11 @@ describe Base, "Base model" do
         stub_api_get("/test/example", 'base.json')
       end
       it "should get all results" do
-        MyExampleModel.get.length.should == 2
+        expect(MyExampleModel.get.length).to eq(2)
       end
       it "should get first result" do
-        MyExampleModel.first.Id.should == 1
-        MyExampleModel.first.Id.should eq(MyExampleModel.first.id)
+        expect(MyExampleModel.first.Id).to eq(1)
+        expect(MyExampleModel.first.Id).to eq(MyExampleModel.first.id)
       end
     end
   end
@@ -89,71 +89,71 @@ describe Base, "Base model" do
     end
 
     it "should access existing attributes" do
-      @model.Name.should == 'My Example'
+      expect(@model.Name).to eq('My Example')
     end
 
     it "should raise errors on access to non-existant attributes" do
-      lambda { @model.Nonsense }.should raise_error(NoMethodError)
+      expect { @model.Nonsense }.to raise_error(NoMethodError)
     end
 
     it "should set existing attributes" do
       new_name = 'John Jacob Jingleheimerschmidt'
       @model.Name = new_name
-      @model.Name.should == new_name
+      expect(@model.Name).to eq(new_name)
     end
 
     it "should set non-existant attributes" do
       nonsense = 'nonsense'
       @model.Nonsense = nonsense
-      @model.Nonsense.should == nonsense
+      expect(@model.Nonsense).to eq(nonsense)
     end
 
     it "should return a boolean for a predicate for an existing attribute" do
-      @model.Name?.should satisfy { |p| [true, false].include?(p) }
+      expect(@model.Name?).to satisfy { |p| [true, false].include?(p) }
     end
 
     it "should return a boolean for whether or not a model is persisted through the api" do
-      @model.persisted?.should satisfy { |p| [true, false].include?(p) }
+      expect(@model.persisted?).to satisfy { |p| [true, false].include?(p) }
     end
 
     it "should raise an Error for a predicate for a non-existant attribute" do
-      lambda { @model.Nonsense? }.should raise_error(NoMethodError)
+      expect { @model.Nonsense? }.to raise_error(NoMethodError)
     end
 
     it "should repond_to existing attributes" do
-      @model.should respond_to(:Name)
+      expect(@model).to respond_to(:Name)
     end
 
     it "should not respond_to non-existant attributes" do
-      @model.should_not respond_to(:Nonsense)
+      expect(@model).not_to respond_to(:Nonsense)
     end
 
     it "should respond_to a setter for an existing attribute" do
-      @model.should respond_to(:Name=)
+      expect(@model).to respond_to(:Name=)
     end
 
     it "should respond_to a setter for a non-existant attribute" do
-      @model.should respond_to(:Nonsense=)
+      expect(@model).to respond_to(:Nonsense=)
     end
 
     it "should respond_to a predicate for an existing attribute" do
-      @model.should respond_to(:Name?)
+      expect(@model).to respond_to(:Name?)
     end
 
     it "should not respond_to a predicate for a non-existant attribute" do
-      @model.should_not respond_to(:Nonsense?)
+      expect(@model).not_to respond_to(:Nonsense?)
     end
 
     it "should respond_to methods inherited from parent classes" do
-      @model.should respond_to(:freeze)
+      expect(@model).to respond_to(:freeze)
     end
 
     it "should respond_to a will_change! method for an existing attribute" do
-      @model.should respond_to(:Name_will_change!)
+      expect(@model).to respond_to(:Name_will_change!)
     end
 
     it "should not respond_to a will_change! method for a non-existant attribute" do
-      @model.should_not respond_to(:Nonsense_will_change!)
+      expect(@model).not_to respond_to(:Nonsense_will_change!)
     end
 
   end
@@ -161,7 +161,7 @@ describe Base, "Base model" do
   describe "to_partial_path" do
     it "should return the partial path" do
       model = MyExampleModel.new()
-      model.to_partial_path.should eq("my_example_models/my_example_model")
+      expect(model.to_partial_path).to eq("my_example_models/my_example_model")
     end
   end
 

data/spec/unit/spark_api/models/concerns/destroyable_spec.rb

@@ -17,7 +17,7 @@ describe Concerns::Destroyable, "Destroyable Concern" do
   describe 'destroyed?' do
     
     it "should not be destroyed" do
-      @model.destroyed?.should eq(false)
+      expect(@model.destroyed?).to eq(false)
     end
   end
 
@@ -27,7 +27,7 @@ describe Concerns::Destroyable, "Destroyable Concern" do
       stub_api_delete("/some/place/20101230223226074201000000")
       @model = MyExampleModel.first
       @model.destroy
-      @model.destroyed?.should eq(true)
+      expect(@model.destroyed?).to eq(true)
     end
 
   end

data/spec/unit/spark_api/models/concerns/savable_spec.rb

@@ -31,9 +31,9 @@ describe Concerns::Savable, "Model" do
   it "should be creatable" do
     @model = MyExampleModel.new({ :Name => "my name" })
     s = stub_api_post("/test/example", { :MyExampleModels => [ @model.attributes ] }, "base.json")
-    @model.save.should eq(true)
-    @model.persisted?.should eq(true)
-    s.should have_been_requested
+    expect(@model.save).to eq(true)
+    expect(@model.persisted?).to eq(true)
+    expect(s).to have_been_requested
   end
 
   it "should be updatable" do
@@ -41,37 +41,37 @@ describe Concerns::Savable, "Model" do
     @model = MyExampleModel.first
     @model.Name = "new name"
     s = stub_api_put("/some/place/20101230223226074201000000", @model.dirty_attributes)
-    @model.save.should eq(true)
-    @model.persisted?.should eq(true)
-    s.should have_been_requested
+    expect(@model.save).to eq(true)
+    expect(@model.persisted?).to eq(true)
+    expect(s).to have_been_requested
   end
 
   it "should allow the pluralize method to be overriden" do
     @model = MyOtherExampleModel.new({ :Name => "my name" })
     s = stub_api_post("/test/example", { :MyOtherExampleModelThatIsPluralized => [ @model.attributes ] }, "base.json")
-    @model.save.should eq(true)
-    @model.persisted?.should eq(true)
-    s.should have_been_requested
+    expect(@model.save).to eq(true)
+    expect(@model.persisted?).to eq(true)
+    expect(s).to have_been_requested
   end
 
   it "should not pluralize the resource if it already is" do
     @model = MyPluralizedModels.new({ :Name => "my name" })
     s = stub_api_post("/test/example", { :MyPluralizedModels => [ @model.attributes ] }, "base.json")
-    @model.save.should eq(true)
-    @model.persisted?.should eq(true)
-    s.should have_been_requested
+    expect(@model.save).to eq(true)
+    expect(@model.persisted?).to eq(true)
+    expect(s).to have_been_requested
   end
 
   it "merges any attributes that come back in the response" do
     @model = MyExampleModel.new({ :Name => "my name" })
     s = stub_api_post("/test/example", { :MyExampleModels => [ @model.attributes ] }, "base.json")
-    @model.save.should eq(true)
-    @model.persisted?.should eq(true)
-    @model.Id.should eq(1)
-    @model.ResourceUri.should eq("/v1/some/place/20101230223226074201000000")
-    @model.Name.should eq("My Example")
-    @model.Test.should eq(true)
-    s.should have_been_requested
+    expect(@model.save).to eq(true)
+    expect(@model.persisted?).to eq(true)
+    expect(@model.Id).to eq(1)
+    expect(@model.ResourceUri).to eq("/v1/some/place/20101230223226074201000000")
+    expect(@model.Name).to eq("My Example")
+    expect(@model.Test).to eq(true)
+    expect(s).to have_been_requested
   end
 
   describe "update_attributes" do

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

@@ -3,7 +3,7 @@ require './spec/spec_helper'
 describe Connect do
 
   it "should respond to prefs" do
-    Connect.should respond_to(:prefs)
+    expect(Connect).to respond_to(:prefs)
   end
 
 end

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