spark_api 1.4.28 → 1.5.0

data/spec/unit/spark_api/faraday_middleware_spec.rb

@@ -64,13 +64,13 @@ describe SparkApi do
     end
     
     it "should raised exception when token is expired" do
-      expect { @connection.get('/expired')}.to raise_error(SparkApi::PermissionDenied){ |e| e.code.should == SparkApi::ResponseCodes::SESSION_TOKEN_EXPIRED }
+      expect { @connection.get('/expired')}.to raise_error(SparkApi::PermissionDenied){ |e| expect(e.code).to eq(SparkApi::ResponseCodes::SESSION_TOKEN_EXPIRED) }
     end
 
     it "should raised exception on error" do
-      expect { @connection.get('/methodnotallowed')}.to raise_error(SparkApi::NotAllowed){ |e| e.message.should == "Method Not Allowed" }
-      expect { @connection.get('/epicfail')}.to raise_error(SparkApi::ClientError){ |e| e.status.should be(500) }
-      expect { @connection.get('/unknownerror')}.to raise_error(SparkApi::ClientError){ |e| e.status.should be(499) }
+      expect { @connection.get('/methodnotallowed')}.to raise_error(SparkApi::NotAllowed){ |e| expect(e.message).to eq("Method Not Allowed") }
+      expect { @connection.get('/epicfail')}.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to be(500) }
+      expect { @connection.get('/unknownerror')}.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to be(499) }
     end
 
     it "should raised exception on invalid responses" do
@@ -81,20 +81,20 @@ describe SparkApi do
 
     it "should give me a session response" do
       response = @connection.post('/session').body
-      response.success.should eq(true)
+      expect(response.success).to eq(true)
       session = SparkApi::Authentication::Session.new(response.results[0])
-      session.auth_token.should eq("xxxxx")
+      expect(session.auth_token).to eq("xxxxx")
     end
     
     it "should give me an api response" do
       response = @connection.get('/system').body
-      response.success.should eq(true)
-      response.results.length.should be > 0 
+      expect(response.success).to eq(true)
+      expect(response.results.length).to be > 0 
     end
 
     it "should include the errors in the response" do
       expect { @connection.get('/badresourcerequest')}.to raise_error(SparkApi::BadResourceRequest){ |e| 
-        e.errors.should == "Some errors and stuff."
+        expect(e.errors).to eq("Some errors and stuff.")
       }
     end
 
@@ -111,7 +111,7 @@ describe SparkApi do
         :response_headers => {}
       }
 
-      middleware.decompress_body(env).should eq("UNCOMPRESSED")
+      expect(middleware.decompress_body(env)).to eq("UNCOMPRESSED")
     end
 
     it "should unzip gzipped data" do
@@ -129,7 +129,7 @@ describe SparkApi do
         }
       }
 
-      middleware.decompress_body(env).should eq(bod)
+      expect(middleware.decompress_body(env)).to eq(bod)
     end
 
     it "should inflate deflated data" do
@@ -143,7 +143,7 @@ describe SparkApi do
         }
       }
 
-      middleware.decompress_body(env).should eq(bod)
+      expect(middleware.decompress_body(env)).to eq(bod)
     end
   end
   

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

@@ -2,6 +2,8 @@ require './spec/spec_helper'
 
 describe AccountReport do
 
+  it_behaves_like(:account, AccountReport)
+
   let(:account_report) { 
     AccountReport.new({
       "Id" => "12345",
@@ -51,27 +53,5 @@ describe AccountReport do
     end
     
   end
-
-  describe 'logo' do
-
-    it 'returns the logo' do
-      logo = SparkApi::Models::Base.new( {"Type" => "Logo"} )
-      not_logo = SparkApi::Models::Base.new( {"Type" => "Nope" } )
-      account_report.images = [logo, not_logo]
-      expect(account_report.logo).to be logo
-    end
-
-    it 'returns nil if there is no logo' do
-      not_logo = SparkApi::Models::Base.new( {"Type" => "Nope" } )
-      account_report.images = [not_logo]
-      expect(account_report.logo).to be nil
-    end
-
-    it 'returns nil if there are no images' do
-      expect(account_report.images).to be nil
-      expect(account_report.logo).to be nil
-    end
-    
-  end
   
 end

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

@@ -1,6 +1,9 @@
 require './spec/spec_helper'
 
 describe Account do
+
+  it_behaves_like(:account, Account)
+
   describe "units" do
     before(:each) do
       @account = Account.new({
@@ -98,20 +101,20 @@ describe Account do
 
     it "should respond to attributes" do
       ['Name','Id','Mls','MlsId','Office'].each do |k|
-        (@account.send k.to_sym).should be_a(String)
+        expect(@account.send k.to_sym).to be_a(String)
       end
     end
 
     it "should have primary subresources" do
-      @account.emails.primary.Address.should eq("work@test.com")
-      @account.phones.primary.Number.should eq("701-555-1212")
-      @account.addresses.primary.Address.should eq("101 Main Ave, Phoenix, AZ 12345")
-      @account.websites.primary.Uri.should eq("http://iamthebestagent.com")
+      expect(@account.emails.primary.Address).to eq("work@test.com")
+      expect(@account.phones.primary.Number).to eq("701-555-1212")
+      expect(@account.addresses.primary.Address).to eq("101 Main Ave, Phoenix, AZ 12345")
+      expect(@account.websites.primary.Uri).to eq("http://iamthebestagent.com")
     end
 
     it "should be able to provide a primary image" do
-      @account.primary_img("Photo").Name.should == 'My Photo 1'
-      @account.primary_img("Logo").Name.should == '1 My Logo'
+      expect(@account.primary_img("Photo").Name).to eq('My Photo 1')
+      expect(@account.primary_img("Logo").Name).to eq('1 My Logo')
     end
 
     after(:each) do
@@ -128,19 +131,19 @@ describe Account do
       on_get_it "should get my account" do
         stub_api_get("/my/account", 'accounts/my.json')
         account = Account.my
-        account.Id.should eq("20000426173054342350000000")
-        account.websites.first.Name.should == 'My Work Website'
+        expect(account.Id).to eq("20000426173054342350000000")
+        expect(account.websites.first.Name).to eq('My Work Website')
       end
 
       on_put_it "should save my portal account" do
         stub_api_get("/my/account", 'accounts/my_portal.json')
         stub_api_put("/my/account", 'accounts/my_save.json', 'accounts/my_put.json')
         account = Account.my
-        account.Id.should eq("20110426173054342350000000")
-        account.GetEmailUpdates.should eq(false)
+        expect(account.Id).to eq("20110426173054342350000000")
+        expect(account.GetEmailUpdates).to eq(false)
         account.GetEmailUpdates = true
         account.save!
-        account.GetEmailUpdates.should eq(true)
+        expect(account.GetEmailUpdates).to eq(true)
       end
     end
 
@@ -148,10 +151,10 @@ describe Account do
       on_get_it "should get all accounts" do
         stub_api_get("/accounts", 'accounts/all.json')
         accounts = Account.get
-        accounts.should be_an(Array)
-        accounts.length.should eq(3)
-        accounts.first.Id.should eq("20000426173054342350000000")
-        accounts.last.Id.should eq("20110126173054382350000000")
+        expect(accounts).to be_an(Array)
+        expect(accounts.length).to eq(3)
+        expect(accounts.first.Id).to eq("20000426173054342350000000")
+        expect(accounts.last.Id).to eq("20110126173054382350000000")
       end
       on_put_it "should save password" do
         stub_api_get("/my/account", 'accounts/my.json')
@@ -159,7 +162,7 @@ describe Account do
         stub_api_put("/accounts/#{account.Id}", 'accounts/password_save.json', 'accounts/my.json')
         account.Password = "1"
         account.PasswordValidation = "1"
-        account.save.should be(true)
+        expect(account.save).to be(true)
       end   
     end
 
@@ -167,15 +170,15 @@ describe Account do
       on_get_it "should all office accounts" do
         stub_api_get("/accounts/by/office/20030426173014239760000000", 'accounts/office.json')
         accounts = Account.by_office("20030426173014239760000000")
-        accounts.should be_an(Array)
-        accounts.length.should eq(2)
+        expect(accounts).to be_an(Array)
+        expect(accounts.length).to eq(2)
         accounts.each do |account|
-          accounts.first.OfficeId.should eq("20030426173014239760000000")
+          expect(accounts.first.OfficeId).to eq("20030426173014239760000000")
         end
       end
     end
 
   end
-
+  
 end
 

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