createsend 5.1.1 → 6.1.0

data/test/client_test.rb

@@ -4,166 +4,189 @@ class ClientTest < Test::Unit::TestCase
   multiple_contexts "authenticated_using_oauth_context", "authenticated_using_api_key_context" do
     setup do
       @client = CreateSend::Client.new(@auth, '321iuhiuhi1u23hi2u3')
-      @client.client_id.should == '321iuhiuhi1u23hi2u3'
+      @client.client_id.should be == '321iuhiuhi1u23hi2u3'
     end
 
     should "create a client" do
       stub_post(@auth, "clients.json", "create_client.json")
       client_id = CreateSend::Client.create @auth, "Client Company Name", "(GMT+10:00) Canberra, Melbourne, Sydney", "Australia"
-      client_id.parsed_response.should == "32a381c49a2df99f1d0c6f3c112352b9"
+      client_id.parsed_response.should be == "32a381c49a2df99f1d0c6f3c112352b9"
     end
 
     should "get details of a client" do
       stub_get(@auth, "clients/#{@client.client_id}.json", "client_details.json")
       cl = @client.details
-      cl.ApiKey.should == "639d8cc27198202f5fe6037a8b17a29a59984b86d3289bc9"
-      cl.BasicDetails.ClientID.should == "4a397ccaaa55eb4e6aa1221e1e2d7122"
-      cl.BasicDetails.ContactName.should == "Client One (contact)"
-      cl.AccessDetails.Username.should == "clientone"
-      cl.AccessDetails.AccessLevel.should == 23
-      cl.BillingDetails.MonthlyScheme.should == "Basic"
-      cl.BillingDetails.Credits.should == 500
+      cl.ApiKey.should be == "639d8cc27198202f5fe6037a8b17a29a59984b86d3289bc9"
+      cl.BasicDetails.ClientID.should be == "4a397ccaaa55eb4e6aa1221e1e2d7122"
+      cl.BasicDetails.ContactName.should be == "Client One (contact)"
+      cl.AccessDetails.Username.should be == "clientone"
+      cl.AccessDetails.AccessLevel.should be == 23
+      cl.BillingDetails.MonthlyScheme.should be == "Basic"
+      cl.BillingDetails.Credits.should be == 500
     end
 
     should "get all campaigns" do
-      stub_get(@auth, "clients/#{@client.client_id}/campaigns.json", "campaigns.json")
+      stub_get(@auth, "clients/#{@client.client_id}/campaigns.json?page=1&pagesize=1000&orderdirection=desc&sentfromdate=&senttodate=&tags=", "campaigns.json")
       campaigns = @client.campaigns
-      campaigns.size.should == 2
-      campaigns.first.CampaignID.should == 'fc0ce7105baeaf97f47c99be31d02a91'
-      campaigns.first.WebVersionURL.should == 'http://createsend.com/t/r-765E86829575EE2C'
-      campaigns.first.WebVersionTextURL.should == 'http://createsend.com/t/r-765E86829575EE2C/t'
-      campaigns.first.Subject.should == 'Campaign One'
-      campaigns.first.Name.should == 'Campaign One'
-      campaigns.first.SentDate.should == '2010-10-12 12:58:00'
-      campaigns.first.TotalRecipients.should == 2245
-      campaigns.first.FromName.should == 'My Name'
-      campaigns.first.FromEmail.should == 'myemail@example.com'
-      campaigns.first.ReplyTo.should == 'myemail@example.com'
+      campaigns.Results.size.should be == 2
+      campaigns.ResultsOrderedBy be == 'sentdate'
+      campaigns.OrderDirection be == 'desc'
+      campaigns.PageNumber be == 1
+      campaigns.PageSize be == 1000
+      campaigns.RecordsOnThisPage be == 2
+      campaigns.TotalNumberOfRecords be == 2
+      campaigns.NumberOfPages be == 1
+
+      campaign = campaigns.Results.first
+      campaign.CampaignID.should be == 'fc0ce7105baeaf97f47c99be31d02a91'
+      campaign.WebVersionURL.should be == 'http://createsend.com/t/r-765E86829575EE2C'
+      campaign.WebVersionTextURL.should be == 'http://createsend.com/t/r-765E86829575EE2C/t'
+      campaign.Subject.should be == 'Campaign One'
+      campaign.Name.should be == 'Campaign One'
+      campaign.SentDate.should be == '2010-10-12 12:58:00'
+      campaign.TotalRecipients.should be == 2245
+      campaign.FromName.should be == 'My Name'
+      campaign.FromEmail.should be == 'myemail@example.com'
+      campaign.ReplyTo.should be == 'myemail@example.com'
+      campaign.Tags.should be == []
     end
 
     should "get scheduled campaigns" do
       stub_get(@auth, "clients/#{@client.client_id}/scheduled.json", "scheduled_campaigns.json")
       campaigns = @client.scheduled
-      campaigns.size.should == 2
-      campaigns.first.DateScheduled.should == "2011-05-25 10:40:00"
-      campaigns.first.ScheduledTimeZone.should == "(GMT+10:00) Canberra, Melbourne, Sydney"
-      campaigns.first.CampaignID.should == "827dbbd2161ea9989fa11ad562c66937"
-      campaigns.first.Name.should == "Magic Issue One"
-      campaigns.first.Subject.should == "Magic Issue One"
-      campaigns.first.DateCreated.should == "2011-05-24 10:37:00"
-      campaigns.first.PreviewURL.should == "http://createsend.com/t/r-DD543521A87C9B8B"
-      campaigns.first.PreviewTextURL.should == "http://createsend.com/t/r-DD543521A87C9B8B/t"
-      campaigns.first.FromName.should == 'My Name'
-      campaigns.first.FromEmail.should == 'myemail@example.com'
-      campaigns.first.ReplyTo.should == 'myemail@example.com'
+      campaigns.size.should be == 2
+      campaign = campaigns.first
+      campaign.DateScheduled.should be == "2011-05-25 10:40:00"
+      campaign.ScheduledTimeZone.should be == "(GMT+10:00) Canberra, Melbourne, Sydney"
+      campaign.CampaignID.should be == "827dbbd2161ea9989fa11ad562c66937"
+      campaign.Name.should be == "Magic Issue One"
+      campaign.Subject.should be == "Magic Issue One"
+      campaign.DateCreated.should be == "2011-05-24 10:37:00"
+      campaign.PreviewURL.should be == "http://createsend.com/t/r-DD543521A87C9B8B"
+      campaign.PreviewTextURL.should be == "http://createsend.com/t/r-DD543521A87C9B8B/t"
+      campaign.FromName.should be == 'My Name'
+      campaign.FromEmail.should be == 'myemail@example.com'
+      campaign.ReplyTo.should be == 'myemail@example.com'
+      campaign.Tags.should be == ['tagexample']
     end
 
     should "get all drafts" do
       stub_get(@auth, "clients/#{@client.client_id}/drafts.json", "drafts.json")
       drafts = @client.drafts
-      drafts.size.should == 2
-      drafts.first.CampaignID.should == '7c7424792065d92627139208c8c01db1'
-      drafts.first.Name.should == 'Draft One'
-      drafts.first.Subject.should == 'Draft One'
-      drafts.first.DateCreated.should == '2010-08-19 16:08:00'
-      drafts.first.PreviewURL.should == 'http://createsend.com/t/r-E97A7BB2E6983DA1'
-      drafts.first.PreviewTextURL.should == 'http://createsend.com/t/r-E97A7BB2E6983DA1/t'
-      drafts.first.FromName.should == 'My Name'
-      drafts.first.FromEmail.should == 'myemail@example.com'
-      drafts.first.ReplyTo.should == 'myemail@example.com'
+      drafts.size.should be == 2
+      draft = drafts.first
+      draft.CampaignID.should be == '7c7424792065d92627139208c8c01db1'
+      draft.Name.should be == 'Draft One'
+      draft.Subject.should be == 'Draft One'
+      draft.DateCreated.should be == '2010-08-19 16:08:00'
+      draft.PreviewURL.should be == 'http://createsend.com/t/r-E97A7BB2E6983DA1'
+      draft.PreviewTextURL.should be == 'http://createsend.com/t/r-E97A7BB2E6983DA1/t'
+      draft.FromName.should be == 'My Name'
+      draft.FromEmail.should be == 'myemail@example.com'
+      draft.ReplyTo.should be == 'myemail@example.com'
+      draft.Tags.should be == ['tagexample']
+    end
+
+    should "get all client tags" do
+      stub_get(@auth, "clients/#{@client.client_id}/tags.json", "tags.json")
+      tags = @client.tags
+      tags.size.should be == 2
+      tag = tags.first
+      tag.Name.should be == 'Tag One'
+      tag.NumberOfCampaigns.should be == '120'
     end
 
     should "get all lists" do
       stub_get(@auth, "clients/#{@client.client_id}/lists.json", "lists.json")
       lists = @client.lists
-      lists.size.should == 2
-      lists.first.ListID.should == 'a58ee1d3039b8bec838e6d1482a8a965'
-      lists.first.Name.should == 'List One'
+      lists.size.should be == 2
+      lists.first.ListID.should be == 'a58ee1d3039b8bec838e6d1482a8a965'
+      lists.first.Name.should be == 'List One'
     end
 
     should "get all lists to which a subscriber with a particular email address belongs" do
       email = "valid@example.com"
       stub_get(@auth, "clients/#{@client.client_id}/listsforemail.json?email=#{ERB::Util.url_encode(email)}", "listsforemail.json")
       lists = @client.lists_for_email(email)
-      lists.size.should == 2
-      lists.first.ListID.should == 'ab4a2b57c7c8f1ba62f898a1af1a575b'
-      lists.first.ListName.should == 'List Number One'
-      lists.first.SubscriberState.should == 'Active'
-      lists.first.DateSubscriberAdded.should == '2012-08-20 22:32:00'
+      lists.size.should be == 2
+      lists.first.ListID.should be == 'ab4a2b57c7c8f1ba62f898a1af1a575b'
+      lists.first.ListName.should be == 'List Number One'
+      lists.first.SubscriberState.should be == 'Active'
+      lists.first.DateSubscriberAdded.should be == '2012-08-20 22:32:00'
     end
 
     should "get all segments for a client" do
       stub_get(@auth, "clients/#{@client.client_id}/segments.json", "segments.json")
       segments = @client.segments
-      segments.size.should == 2
-      segments.first.ListID.should == 'a58ee1d3039b8bec838e6d1482a8a965'
-      segments.first.SegmentID.should == '46aa5e01fd43381863d4e42cf277d3a9'
-      segments.first.Title.should == 'Segment One'
+      segments.size.should be == 2
+      segments.first.ListID.should be == 'a58ee1d3039b8bec838e6d1482a8a965'
+      segments.first.SegmentID.should be == '46aa5e01fd43381863d4e42cf277d3a9'
+      segments.first.Title.should be == 'Segment One'
     end
 
     should "get suppression list" do
       stub_get(@auth, "clients/#{@client.client_id}/suppressionlist.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc", "suppressionlist.json")
       res = @client.suppressionlist
-      res.ResultsOrderedBy.should == "email"
-      res.OrderDirection.should == "asc"
-      res.PageNumber.should == 1
-      res.PageSize.should == 1000
-      res.RecordsOnThisPage.should == 5
-      res.TotalNumberOfRecords.should == 5
-      res.NumberOfPages.should == 1
-      res.Results.size.should == 5
-      res.Results.first.SuppressionReason.should == "Unsubscribed"
-      res.Results.first.EmailAddress.should == "example+1@example.com"
-      res.Results.first.Date.should == "2010-10-26 10:55:31"
-      res.Results.first.State.should == "Suppressed"
+      res.ResultsOrderedBy.should be == "email"
+      res.OrderDirection.should be == "asc"
+      res.PageNumber.should be == 1
+      res.PageSize.should be == 1000
+      res.RecordsOnThisPage.should be == 5
+      res.TotalNumberOfRecords.should be == 5
+      res.NumberOfPages.should be == 1
+      res.Results.size.should be == 5
+      res.Results.first.SuppressionReason.should be == "Unsubscribed"
+      res.Results.first.EmailAddress.should be == "example+1@example.com"
+      res.Results.first.Date.should be == "2010-10-26 10:55:31"
+      res.Results.first.State.should be == "Suppressed"
     end
 
     should "suppress a single email address" do
       email = "example@example.com"
       stub_post(@auth, "clients/#{@client.client_id}/suppress.json", nil)
-      result = @client.suppress email
+      @client.suppress email
     end
 
     should "suppress multiple email address" do
       stub_post(@auth, "clients/#{@client.client_id}/suppress.json", nil)
-      result = @client.suppress [ "one@example.com", "two@example.com" ]
+      @client.suppress [ "one@example.com", "two@example.com" ]
     end
 
     should "unsuppress an email address" do
       email = "example@example.com"
       stub_put(@auth, "clients/#{@client.client_id}/unsuppress.json?email=#{ERB::Util.url_encode(email)}", nil)
-      result = @client.unsuppress email
+      @client.unsuppress email
     end
 
     should "get all people" do
       stub_get(@auth, "clients/#{@client.client_id}/people.json", "people.json")
       people = @client.people
-      people.size.should == 2
-      people.first.EmailAddress.should == "person1@blackhole.com"
-      people.first.Name.should == "Person One"
-      people.first.Status.should == "Active"
-      people.first.AccessLevel.should == 31
+      people.size.should be == 2
+      people.first.EmailAddress.should be == "person1@blackhole.com"
+      people.first.Name.should be == "Person One"
+      people.first.Status.should be == "Active"
+      people.first.AccessLevel.should be == 31
     end
 
     should "get all templates" do
       stub_get(@auth, "clients/#{@client.client_id}/templates.json", "templates.json")
       templates = @client.templates
-      templates.size.should == 2
-      templates.first.TemplateID.should == '5cac213cf061dd4e008de5a82b7a3621'
-      templates.first.Name.should == 'Template One'
+      templates.size.should be == 2
+      templates.first.TemplateID.should be == '5cac213cf061dd4e008de5a82b7a3621'
+      templates.first.Name.should be == 'Template One'
     end
 
     should "set primary contact" do
       email = 'person@blackhole.com'
       stub_put(@auth, "clients/#{@client.client_id}/primarycontact.json?email=#{ERB::Util.url_encode(email)}", 'client_set_primary_contact.json')
       result = @client.set_primary_contact email
-      result.EmailAddress.should == email
+      result.EmailAddress.should be == email
     end
 
     should "get primary contact" do
       stub_get(@auth, "clients/#{@client.client_id}/primarycontact.json", 'client_get_primary_contact.json')
       result = @client.get_primary_contact
-      result.EmailAddress.should == 'person@blackhole.com'
+      result.EmailAddress.should be == 'person@blackhole.com'
     end
 
     should "set basics" do
@@ -180,37 +203,37 @@ class ClientTest < Test::Unit::TestCase
       stub_put(@auth, "clients/#{@client.client_id}/setmonthlybilling.json", nil)
       @client.set_monthly_billing "CAD", true, 150 
       request = FakeWeb.last_request.body
-      request.include?("\"Currency\":\"CAD\"").should == true
-      request.include?("\"ClientPays\":true").should == true
-      request.include?("\"MarkupPercentage\":150").should == true
-      request.include?("\"MonthlyScheme\":null").should == true
+      request.include?("\"Currency\":\"CAD\"").should be == true
+      request.include?("\"ClientPays\":true").should be == true
+      request.include?("\"MarkupPercentage\":150").should be == true
+      request.include?("\"MonthlyScheme\":null").should be == true
     end
 
     should "set monthly billing (basic)" do
       stub_put(@auth, "clients/#{@client.client_id}/setmonthlybilling.json", nil)
       @client.set_monthly_billing "CAD", true, 150, "Basic"
       request = FakeWeb.last_request.body
-      request.include?("\"Currency\":\"CAD\"").should == true
-      request.include?("\"ClientPays\":true").should == true
-      request.include?("\"MarkupPercentage\":150").should == true
-      request.include?("\"MonthlyScheme\":\"Basic\"").should == true
+      request.include?("\"Currency\":\"CAD\"").should be == true
+      request.include?("\"ClientPays\":true").should be == true
+      request.include?("\"MarkupPercentage\":150").should be == true
+      request.include?("\"MonthlyScheme\":\"Basic\"").should be == true
     end
        
     should "set monthly billing (unlimited)" do
       stub_put(@auth, "clients/#{@client.client_id}/setmonthlybilling.json", nil)
       @client.set_monthly_billing "CAD", false, 120, "Unlimited"
       request = FakeWeb.last_request.body
-      request.include?("\"Currency\":\"CAD\"").should == true
-      request.include?("\"ClientPays\":false").should == true
-      request.include?("\"MarkupPercentage\":120").should == true
-      request.include?("\"MonthlyScheme\":\"Unlimited\"").should == true
+      request.include?("\"Currency\":\"CAD\"").should be == true
+      request.include?("\"ClientPays\":false").should be == true
+      request.include?("\"MarkupPercentage\":120").should be == true
+      request.include?("\"MonthlyScheme\":\"Unlimited\"").should be == true
     end
 
     should "transfer credits to a client" do
       stub_post(@auth, "clients/#{@client.client_id}/credits.json", "transfer_credits.json")
       result = @client.transfer_credits 200, false
-      result.AccountCredits.should == 800
-      result.ClientCredits.should == 200
+      result.AccountCredits.should be == 800
+      result.ClientCredits.should be == 200
     end
 
     should "delete a client" do
@@ -221,10 +244,10 @@ class ClientTest < Test::Unit::TestCase
     should "get all journeys" do
       stub_get(@auth, "clients/#{@client.client_id}/journeys.json", "journeys.json")
       lists = @client.journeys
-      lists.size.should == 3
-      lists.first.ListID.should == 'a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a'
-      lists.first.Name.should == 'Journey One'
-      lists.first.Status.should == 'Not started'
+      lists.size.should be == 3
+      lists.first.ListID.should be == 'a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a'
+      lists.first.Name.should be == 'Journey One'
+      lists.first.Status.should be == 'Not started'
     end
   end
 end

data/test/createsend_test.rb

@@ -15,13 +15,13 @@ class CreateSendTest < Test::Unit::TestCase
         :refresh_token => @refresh_token
       }
       cs = CreateSend::CreateSend.new auth
-      cs.auth_details.should == auth
+      cs.auth_details.should be == auth
     end
 
     should "authenticate using an api key" do
       auth = {:api_key => @api_key}
       cs = CreateSend::CreateSend.new auth
-      cs.auth_details.should == auth
+      cs.auth_details.should be == auth
     end
 
     should "get the authorization url without state included" do
@@ -29,7 +29,7 @@ class CreateSendTest < Test::Unit::TestCase
       redirect_uri = 'http://example.com/auth'
       scope = 'ViewReports,CreateCampaigns,SendCampaigns'
       url = CreateSend::CreateSend.authorize_url(client_id, redirect_uri, scope)
-      url.should == "https://api.createsend.com/oauth?client_id=8998879&redirect_uri=http%3A%2F%2Fexample.com%2Fauth&scope=ViewReports%2CCreateCampaigns%2CSendCampaigns"
+      url.should be == "https://api.createsend.com/oauth?client_id=8998879&redirect_uri=http%3A%2F%2Fexample.com%2Fauth&scope=ViewReports%2CCreateCampaigns%2CSendCampaigns"
     end
 
     should "get the authorization url with state included" do
@@ -38,7 +38,7 @@ class CreateSendTest < Test::Unit::TestCase
       scope = 'ViewReports,CreateCampaigns,SendCampaigns'
       state = 89879287
       url = CreateSend::CreateSend.authorize_url(client_id, redirect_uri, scope, state)
-      url.should == "https://api.createsend.com/oauth?client_id=8998879&redirect_uri=http%3A%2F%2Fexample.com%2Fauth&scope=ViewReports%2CCreateCampaigns%2CSendCampaigns&state=89879287"
+      url.should be == "https://api.createsend.com/oauth?client_id=8998879&redirect_uri=http%3A%2F%2Fexample.com%2Fauth&scope=ViewReports%2CCreateCampaigns%2CSendCampaigns&state=89879287"
     end
 
     should "exchange an OAuth token for an access token, 'expires in' value, and refresh token" do
@@ -53,10 +53,10 @@ class CreateSendTest < Test::Unit::TestCase
       access_token, expires_in, refresh_token = CreateSend::CreateSend.exchange_token(
         client_id, client_secret, redirect_uri, code)
 
-      FakeWeb.last_request.body.should == "grant_type=authorization_code&client_id=8998879&client_secret=iou0q9wud0q9wd0q9wid0q9iwd0q9wid0q9wdqwd&redirect_uri=http%3A%2F%2Fexample.com%2Fauth&code=jdiwouo8uowi9o9o"
-      access_token.should == "SlAV32hkKG"
-      expires_in.should == 1209600
-      refresh_token.should == "tGzv3JOkF0XG5Qx2TlKWIA"
+      FakeWeb.last_request.body.should be == "grant_type=authorization_code&client_id=8998879&client_secret=iou0q9wud0q9wd0q9wid0q9iwd0q9wid0q9wdqwd&redirect_uri=http%3A%2F%2Fexample.com%2Fauth&code=jdiwouo8uowi9o9o"
+      access_token.should be == "SlAV32hkKG"
+      expires_in.should be == 1209600
+      refresh_token.should be == "tGzv3JOkF0XG5Qx2TlKWIA"
     end
 
     should "raise an error when an attempt to exchange an OAuth token for an access token fails" do
@@ -68,10 +68,10 @@ class CreateSendTest < Test::Unit::TestCase
         :body => fixture_file("oauth_exchange_token_error.json"),
         :content_type => "application/json; charset=utf-8" }
       FakeWeb.register_uri(:post, "https://api.createsend.com/oauth/token", options)
-      lambda { access_token, expires_in, refresh_token = CreateSend::CreateSend.exchange_token(
+      lambda { CreateSend::CreateSend.exchange_token(
         client_id, client_secret, redirect_uri, code) }.should raise_error(
           Exception, 'Error exchanging code for access token: invalid_grant - Specified code was invalid or expired')
-      FakeWeb.last_request.body.should == "grant_type=authorization_code&client_id=8998879&client_secret=iou0q9wud0q9wd0q9wid0q9iwd0q9wid0q9wdqwd&redirect_uri=http%3A%2F%2Fexample.com%2Fauth&code=invalidcode"
+      FakeWeb.last_request.body.should be == "grant_type=authorization_code&client_id=8998879&client_secret=iou0q9wud0q9wd0q9wid0q9iwd0q9wid0q9wdqwd&redirect_uri=http%3A%2F%2Fexample.com%2Fauth&code=invalidcode"
     end
 
     should "refresh an access token given a refresh token" do
@@ -82,10 +82,10 @@ class CreateSendTest < Test::Unit::TestCase
       FakeWeb.register_uri(:post, "https://api.createsend.com/oauth/token", options)
       new_access_token, new_expires_in, new_refresh_token = CreateSend::CreateSend.refresh_access_token refresh_token
 
-      FakeWeb.last_request.body.should == "grant_type=refresh_token&refresh_token=#{ERB::Util.url_encode(refresh_token)}"
-      new_access_token.should == "SlAV32hkKG2e12e"
-      new_expires_in.should == 1209600
-      new_refresh_token.should == "tGzv3JOkF0XG5Qx2TlKWIA"
+      FakeWeb.last_request.body.should be == "grant_type=refresh_token&refresh_token=#{ERB::Util.url_encode(refresh_token)}"
+      new_access_token.should be == "SlAV32hkKG2e12e"
+      new_expires_in.should be == 1209600
+      new_refresh_token.should be == "tGzv3JOkF0XG5Qx2TlKWIA"
     end
 
     should "raise an error when an attempt to refresh an access token fails" do
@@ -94,10 +94,10 @@ class CreateSendTest < Test::Unit::TestCase
         :body => fixture_file("oauth_refresh_token_error.json"),
         :content_type => "application/json; charset=utf-8" }
       FakeWeb.register_uri(:post, "https://api.createsend.com/oauth/token", options)
-      lambda { access_token, expires_in, refresh_token = CreateSend::CreateSend.refresh_access_token(
+      lambda { CreateSend::CreateSend.refresh_access_token(
         refresh_token) }.should raise_error(
           Exception, 'Error refreshing access token: invalid_grant - Specified refresh_token was invalid or expired')
-      FakeWeb.last_request.body.should == "grant_type=refresh_token&refresh_token=#{ERB::Util.url_encode(refresh_token)}"
+      FakeWeb.last_request.body.should be == "grant_type=refresh_token&refresh_token=#{ERB::Util.url_encode(refresh_token)}"
     end
 
   end
@@ -120,11 +120,11 @@ class CreateSendTest < Test::Unit::TestCase
       cs = CreateSend::CreateSend.new @auth
       new_access_token, new_expires_in, new_refresh_token = cs.refresh_token
 
-      FakeWeb.last_request.body.should == "grant_type=refresh_token&refresh_token=#{ERB::Util.url_encode(@auth[:refresh_token])}"
-      new_access_token.should == "SlAV32hkKG2e12e"
-      new_expires_in.should == 1209600
-      new_refresh_token.should == "tGzv3JOkF0XG5Qx2TlKWIA"
-      cs.auth_details.should == {
+      FakeWeb.last_request.body.should be == "grant_type=refresh_token&refresh_token=#{ERB::Util.url_encode(@auth[:refresh_token])}"
+      new_access_token.should be == "SlAV32hkKG2e12e"
+      new_expires_in.should be == 1209600
+      new_refresh_token.should be == "tGzv3JOkF0XG5Qx2TlKWIA"
+      cs.auth_details.should be == {
         :access_token => new_access_token,
         :refresh_token => new_refresh_token
       }
@@ -132,19 +132,19 @@ class CreateSendTest < Test::Unit::TestCase
 
     should "raise an error when an attempt to refresh the access token is made but refresh token is nil" do
       cs = CreateSend::CreateSend.new :access_token => 'any token', :refresh_token => nil
-      lambda { new_access_token, new_refresh_token = cs.refresh_token }.should raise_error(
+      lambda { cs.refresh_token }.should raise_error(
         Exception, '@auth_details[:refresh_token] does not contain a refresh token.')
     end
 
     should "raise an error when an attempt to refresh the access token is made but no there was no refresh token passed in" do
       cs = CreateSend::CreateSend.new :access_token => 'any token'
-      lambda { new_access_token, new_refresh_token = cs.refresh_token }.should raise_error(
+      lambda { cs.refresh_token }.should raise_error(
         Exception, '@auth_details[:refresh_token] does not contain a refresh token.')
     end
 
     should "raise an error when an attempt to refresh the access token is made but no there was no auth hash passed in" do
       cs = CreateSend::CreateSend.new
-      lambda { new_access_token, new_refresh_token = cs.refresh_token }.should raise_error(
+      lambda { cs.refresh_token }.should raise_error(
         Exception, '@auth_details[:refresh_token] does not contain a refresh token.')
     end
 
@@ -155,26 +155,26 @@ class CreateSendTest < Test::Unit::TestCase
         :body => fixture_file("oauth_refresh_token_error.json"),
         :content_type => "application/json; charset=utf-8" }
       FakeWeb.register_uri(:post, "https://api.createsend.com/oauth/token", options)
-      lambda { access_token, expires_in, refresh_token = cs.refresh_token }.should raise_error(
+      lambda { refresh_token = cs.refresh_token }.should raise_error(
           Exception, 'Error refreshing access token: invalid_grant - Specified refresh_token was invalid or expired')
     end
 
     should "raise a CreateSend::InvalidOAuthToken error when an access token is invalid" do
       cs = CreateSend::CreateSend.new @auth
       stub_get(@auth, "countries.json", "invalid_oauth_token_api_error.json", ["401", "Unauthorized"])
-      lambda { c = cs.countries }.should raise_error(CreateSend::InvalidOAuthToken)
+      lambda { cs.countries }.should raise_error(CreateSend::InvalidOAuthToken)
     end
 
     should "raise a CreateSend::ExpiredOAuthToken error when an access token is expired" do
       cs = CreateSend::CreateSend.new @auth
       stub_get(@auth, "countries.json", "expired_oauth_token_api_error.json", ["401", "Unauthorized"])
-      lambda { c = cs.countries }.should raise_error(CreateSend::ExpiredOAuthToken)
+      lambda { cs.countries }.should raise_error(CreateSend::ExpiredOAuthToken)
     end
 
     should "raise a CreateSend::RevokedOAuthToken error when an access token is revoked" do
       cs = CreateSend::CreateSend.new @auth
       stub_get(@auth, "countries.json", "revoked_oauth_token_api_error.json", ["401", "Unauthorized"])
-      lambda { c = cs.countries }.should raise_error(CreateSend::RevokedOAuthToken)
+      lambda { cs.countries }.should raise_error(CreateSend::RevokedOAuthToken)
     end
 
   end
@@ -185,76 +185,76 @@ class CreateSendTest < Test::Unit::TestCase
     end
 
     should "include the correct user agent string when making a call" do
-      CreateSend::CreateSend.headers["User-Agent"].should ==
+      CreateSend::CreateSend.headers["User-Agent"].should be ==
         "createsend-ruby-#{CreateSend::VERSION}-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}-#{RUBY_PLATFORM}"
       stub_get(@auth, "clients.json", "clients.json")
       clients = @cs.clients
-      clients.size.should == 2
+      clients.size.should be == 2
     end
 
     should "allow a custom user agent string to be set when making a call" do
       CreateSend::CreateSend.user_agent "custom user agent"
-      CreateSend::CreateSend.headers["User-Agent"].should == "custom user agent"
+      CreateSend::CreateSend.headers["User-Agent"].should be == "custom user agent"
       stub_get(@auth, "clients.json", "clients.json")
       clients = @cs.clients
-      clients.size.should == 2
+      clients.size.should be == 2
       CreateSend::CreateSend.user_agent nil
     end
 
     should "get all clients" do
       stub_get(@auth, "clients.json", "clients.json")
       clients = @cs.clients
-      clients.size.should == 2
-      clients.first.ClientID.should == '4a397ccaaa55eb4e6aa1221e1e2d7122'
-      clients.first.Name.should == 'Client One'
+      clients.size.should be == 2
+      clients.first.ClientID.should be == '4a397ccaaa55eb4e6aa1221e1e2d7122'
+      clients.first.Name.should be == 'Client One'
     end
 
     should "get billing details" do
       stub_get(@auth, "billingdetails.json", "billingdetails.json")
       bd = @cs.billing_details
-      bd.Credits.should == 3021
+      bd.Credits.should be == 3021
     end
 
     should "get all countries" do
       stub_get(@auth, "countries.json", "countries.json")
       countries = @cs.countries
-      countries.size.should == 245
+      countries.size.should be == 245
       assert countries.include? "Australia"
     end
     
     should "get system date" do
       stub_get(@auth, "systemdate.json", "systemdate.json")
       systemdate = @cs.systemdate.SystemDate
-      systemdate.should == "2010-10-15 09:27:00"
+      systemdate.should be == "2010-10-15 09:27:00"
     end
 
     should "get all timezones" do
       stub_get(@auth, "timezones.json", "timezones.json")
       timezones = @cs.timezones
-      timezones.size.should == 97
+      timezones.size.should be == 97
       assert timezones.include? "(GMT+12:00) Fiji"
     end
     
     should "get all administrators" do
       stub_get(@auth, "admins.json", "administrators.json")
       administrators = @cs.administrators
-      administrators.size.should == 2
-      administrators.first.EmailAddress.should == "admin1@blackhole.com"
-      administrators.first.Name.should == 'Admin One'
-      administrators.first.Status.should == 'Active'
+      administrators.size.should be == 2
+      administrators.first.EmailAddress.should be == "admin1@blackhole.com"
+      administrators.first.Name.should be == 'Admin One'
+      administrators.first.Status.should be == 'Active'
     end
 
     should "set primary contact" do
       email = 'admin@blackhole.com'
       stub_put(@auth, "primarycontact.json?email=#{ERB::Util.url_encode(email)}", 'admin_set_primary_contact.json')
       result = @cs.set_primary_contact email
-      result.EmailAddress.should == email
+      result.EmailAddress.should be == email
     end
 
     should "get primary contact" do
       stub_get(@auth, "primarycontact.json", 'admin_get_primary_contact.json')
       result = @cs.get_primary_contact
-      result.EmailAddress.should == 'admin@blackhole.com'
+      result.EmailAddress.should be == 'admin@blackhole.com'
     end
 
     should "get an external session url" do
@@ -265,7 +265,7 @@ class CreateSendTest < Test::Unit::TestCase
       client_id = "9q8uw9d8u9wud"
       stub_put(@auth, "externalsession.json", "external_session.json")
       result = @cs.external_session_url email, chrome, url, integrator_id, client_id
-      result.SessionUrl.should == "https://external1.createsend.com/cd/create/ABCDEF12/DEADBEEF?url=FEEDDAD1"
+      result.SessionUrl.should be == "https://external1.createsend.com/cd/create/ABCDEF12/DEADBEEF?url=FEEDDAD1"
     end
 
   end
@@ -287,7 +287,7 @@ class CreateSendTest < Test::Unit::TestCase
         context "#{status.first}, a get" do
           should "raise a #{exception.name} error" do
             stub_get(@auth, "countries.json", (status.first == '400' or status.first == '401') ? 'custom_api_error.json' : nil, status)
-            lambda { c = @cs.countries }.should raise_error(exception)
+            lambda { @cs.countries }.should raise_error(exception)
           end
         end