constantcontact 3.0.0 → 4.0.0

data/spec/constantcontact/sdk_spec.rb

@@ -11,7 +11,7 @@ describe ConstantContact::SDK do
   let(:dummy_class) { Class.new { include ConstantContact::SDK } }
   
   it "should respond to VERSION" do
-    expect((dummy_class.const_get("VERSION") rescue nil)).to be_true
+    expect((dummy_class.const_get("VERSION") rescue nil)).to be_truthy
   end
   
   it "should have a VERSION of type string" do

data/spec/constantcontact/services/account_service_spec.rb

@@ -17,7 +17,7 @@ describe ConstantContact::Services::AccountService do
       json_response = load_file('account_info_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       result = ConstantContact::Services::AccountService.new(@client).get_account_info()
@@ -33,7 +33,7 @@ describe ConstantContact::Services::AccountService do
       json_response = load_file('verified_email_addresses_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       params = {}

data/spec/constantcontact/services/activity_service_spec.rb

@@ -17,7 +17,7 @@ describe ConstantContact::Services::ActivityService do
       json_response = load_file('activities_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       activities = ConstantContact::Services::ActivityService.new(@client).get_activities()
@@ -31,7 +31,7 @@ describe ConstantContact::Services::ActivityService do
       json_response = load_file('activity_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       activity = ConstantContact::Services::ActivityService.new(@client).get_activity('a07e1ilbm7shdg6ikeo')
@@ -46,7 +46,7 @@ describe ConstantContact::Services::ActivityService do
       json_response = load_file('add_contacts_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
 
       contacts = []
@@ -137,7 +137,7 @@ describe ConstantContact::Services::ActivityService do
       lists = 'list1, list2'
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
 
       activity = ConstantContact::Services::ActivityService.new(@client).create_add_contacts_activity_from_file(
@@ -157,7 +157,7 @@ describe ConstantContact::Services::ActivityService do
 
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_clear_lists, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_clear_lists, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
 
       activity = ConstantContact::Services::ActivityService.new(@client).add_clear_lists_activity(lists)
@@ -172,7 +172,7 @@ describe ConstantContact::Services::ActivityService do
       lists = 'list1, list2'
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
       email_addresses = ["djellesma@constantcontact.com"]
 
@@ -190,7 +190,7 @@ describe ConstantContact::Services::ActivityService do
       lists = 'list1, list2'
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
 
       activity = ConstantContact::Services::ActivityService.new(@client).add_remove_contacts_from_lists_activity_from_file(
@@ -206,7 +206,7 @@ describe ConstantContact::Services::ActivityService do
       json_response = load_file('export_contacts_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
 
       export_contacts = ConstantContact::Components::ExportContacts.new(JSON.parse(json_request))
@@ -223,7 +223,7 @@ describe ConstantContact::Services::ActivityService do
       json_response = load_file('remove_contacts_from_lists_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
 
       request_object = JSON.parse(json_request)

data/spec/constantcontact/services/base_service_spec.rb

@@ -23,10 +23,10 @@ describe ConstantContact::Services::BaseService do
       expect(headers[:authorization]).to be_a String
       expect(headers[:authorization]).to eq("Bearer #{token}")
       expect(headers[:user_agent]).to be_a String
-      expect(headers[:user_agent].include?("Ruby SDK v#{ConstantContact::SDK::VERSION}")).to be_true
-      expect(headers[:user_agent].include?(RUBY_DESCRIPTION)).to be_true
+      expect(headers[:user_agent].include?("Ruby SDK v#{ConstantContact::SDK::VERSION}")).to be_truthy
+      expect(headers[:user_agent].include?(RUBY_DESCRIPTION)).to be_truthy
       expect(headers[:x_ctct_request_source]).to be_a String
-      expect(headers[:x_ctct_request_source].include?(ConstantContact::SDK::VERSION)).to be_true
+      expect(headers[:x_ctct_request_source].include?(ConstantContact::SDK::VERSION)).to be_truthy
     end
   end
 
@@ -35,8 +35,8 @@ describe ConstantContact::Services::BaseService do
       components = ConstantContact::Services::BaseService.new(@client).send(:build_url, "http://testing.com", :arg1 => 'abc', :arg2 => 123).split('&')
       expect(components[0]).to eq('http://testing.com?api_key=api+key')
       expect(components.length).to eq(3)
-      expect(components.include?('arg1=abc')).to be_true
-      expect(components.include?('arg2=123')).to be_true
+      expect(components.include?('arg1=abc')).to be_truthy
+      expect(components.include?('arg2=123')).to be_truthy
     end
 
     it "does not parse the next param when not in next_link format" do

data/spec/constantcontact/services/campaign_schedule_service_spec.rb

@@ -18,7 +18,7 @@ describe ConstantContact::Services::CampaignScheduleService do
       json = load_file('schedule_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
       new_schedule = ConstantContact::Components::Schedule.create(JSON.parse(json))
 
@@ -35,7 +35,7 @@ describe ConstantContact::Services::CampaignScheduleService do
       json = load_file('schedules_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       schedules = ConstantContact::Services::CampaignScheduleService.new(@client).get_schedules(
@@ -53,7 +53,7 @@ describe ConstantContact::Services::CampaignScheduleService do
       json = load_file('schedule_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       schedule = ConstantContact::Services::CampaignScheduleService.new(@client).get_schedule(
@@ -69,12 +69,12 @@ describe ConstantContact::Services::CampaignScheduleService do
       schedule_id = 1
       net_http_resp = Net::HTTPResponse.new(1.0, 204, 'No Content')
 
-      response = RestClient::Response.create('', net_http_resp, {}, @request)
+      response = RestClient::Response.create('', net_http_resp, @request)
       RestClient.stub(:delete).and_return(response)
 
       result = ConstantContact::Services::CampaignScheduleService.new(@client).delete_schedule(
         campaign_id, schedule_id)
-      result.should be_true
+      expect(result).to eq true
     end
   end
 
@@ -84,7 +84,7 @@ describe ConstantContact::Services::CampaignScheduleService do
       json = load_file('schedule_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:put).and_return(response)
       schedule = ConstantContact::Components::Schedule.create(JSON.parse(json))
 
@@ -102,7 +102,7 @@ describe ConstantContact::Services::CampaignScheduleService do
       json_response = load_file('test_send_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
       test_send = ConstantContact::Components::TestSend.create(JSON.parse(json_request))
 

data/spec/constantcontact/services/campaign_tracking_service_spec.rb

@@ -19,7 +19,7 @@ describe ConstantContact::Services::CampaignTrackingService do
       json = load_file('campaign_tracking_bounces_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::CampaignTrackingService.new(@client).get_bounces(campaign_id, params)
@@ -36,7 +36,7 @@ describe ConstantContact::Services::CampaignTrackingService do
       json = load_file('campaign_tracking_clicks_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::CampaignTrackingService.new(@client).get_clicks(campaign_id, params)
@@ -53,7 +53,7 @@ describe ConstantContact::Services::CampaignTrackingService do
       json = load_file('campaign_tracking_forwards_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::CampaignTrackingService.new(@client).get_forwards(campaign_id, params)
@@ -70,7 +70,7 @@ describe ConstantContact::Services::CampaignTrackingService do
       json = load_file('campaign_tracking_opens_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::CampaignTrackingService.new(@client).get_opens(campaign_id, params)
@@ -87,7 +87,7 @@ describe ConstantContact::Services::CampaignTrackingService do
       json = load_file('campaign_tracking_sends_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::CampaignTrackingService.new(@client).get_sends(campaign_id, params)
@@ -104,7 +104,7 @@ describe ConstantContact::Services::CampaignTrackingService do
       json = load_file('campaign_tracking_unsubscribes_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::CampaignTrackingService.new(@client).get_unsubscribes(campaign_id, params)
@@ -120,7 +120,7 @@ describe ConstantContact::Services::CampaignTrackingService do
       json = load_file('campaign_tracking_summary_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       summary = ConstantContact::Services::CampaignTrackingService.new(@client).get_summary(campaign_id)

data/spec/constantcontact/services/contact_service_spec.rb

@@ -17,7 +17,7 @@ describe ConstantContact::Services::ContactService do
       json = load_file('contacts_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
       contacts = ConstantContact::Services::ContactService.new(@client).get_contacts()
       contact = contacts.results[0]
@@ -32,7 +32,7 @@ describe ConstantContact::Services::ContactService do
       json = load_file('contact_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
       contact = ConstantContact::Services::ContactService.new(@client).get_contact(1)
 
@@ -45,7 +45,7 @@ describe ConstantContact::Services::ContactService do
       json = load_file('contact_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
       new_contact = ConstantContact::Components::Contact.create(JSON.parse(json))
       contact = ConstantContact::Services::ContactService.new(@client).add_contact(new_contact)
@@ -60,11 +60,11 @@ describe ConstantContact::Services::ContactService do
       contact_id = 196
       net_http_resp = Net::HTTPResponse.new(1.0, 204, 'No Content')
 
-      response = RestClient::Response.create('', net_http_resp, {}, @request)
+      response = RestClient::Response.create('', net_http_resp, @request)
       RestClient.stub(:delete).and_return(response)
 
       result = ConstantContact::Services::ContactService.new(@client).delete_contact(contact_id)
-      result.should be_true
+      expect(result).to eq true
     end
   end
 
@@ -73,11 +73,11 @@ describe ConstantContact::Services::ContactService do
       contact_id = 196
       net_http_resp = Net::HTTPResponse.new(1.0, 204, 'No Content')
 
-      response = RestClient::Response.create('', net_http_resp, {}, @request)
+      response = RestClient::Response.create('', net_http_resp, @request)
       RestClient.stub(:delete).and_return(response)
 
       result = ConstantContact::Services::ContactService.new(@client).delete_contact_from_lists(contact_id)
-      result.should be_true
+      expect(result).to eq true
     end
   end
 
@@ -87,11 +87,11 @@ describe ConstantContact::Services::ContactService do
       list_id = 1
       net_http_resp = Net::HTTPResponse.new(1.0, 204, 'No Content')
 
-      response = RestClient::Response.create('', net_http_resp, {}, @request)
+      response = RestClient::Response.create('', net_http_resp, @request)
       RestClient.stub(:delete).and_return(response)
 
       result = ConstantContact::Services::ContactService.new(@client).delete_contact_from_list(contact_id, list_id)
-      result.should be_true
+      expect(result).to eq true
     end
   end
 
@@ -100,7 +100,7 @@ describe ConstantContact::Services::ContactService do
       json = load_file('contact_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:put).and_return(response)
       contact = ConstantContact::Components::Contact.create(JSON.parse(json))
       result = ConstantContact::Services::ContactService.new(@client).update_contact(contact)

data/spec/constantcontact/services/contact_tracking_service_spec.rb

@@ -19,7 +19,7 @@ describe ConstantContact::Services::ContactTrackingService do
       json = load_file('contact_tracking_bounces_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::ContactTrackingService.new(@client).get_bounces(contact_id, params)
@@ -36,7 +36,7 @@ describe ConstantContact::Services::ContactTrackingService do
       json = load_file('contact_tracking_clicks_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::ContactTrackingService.new(@client).get_clicks(contact_id, params)
@@ -53,7 +53,7 @@ describe ConstantContact::Services::ContactTrackingService do
       json = load_file('contact_tracking_forwards_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::ContactTrackingService.new(@client).get_forwards(contact_id, params)
@@ -70,7 +70,7 @@ describe ConstantContact::Services::ContactTrackingService do
       json = load_file('contact_tracking_opens_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::ContactTrackingService.new(@client).get_opens(contact_id, params)
@@ -87,7 +87,7 @@ describe ConstantContact::Services::ContactTrackingService do
       json = load_file('contact_tracking_sends_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::ContactTrackingService.new(@client).get_sends(contact_id, params)
@@ -104,7 +104,7 @@ describe ConstantContact::Services::ContactTrackingService do
       json = load_file('contact_tracking_unsubscribes_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       set = ConstantContact::Services::ContactTrackingService.new(@client).get_unsubscribes(contact_id, params)
@@ -120,7 +120,7 @@ describe ConstantContact::Services::ContactTrackingService do
       json = load_file('contact_tracking_summary_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       summary = ConstantContact::Services::CampaignTrackingService.new(@client).get_summary(contact_id)

data/spec/constantcontact/services/email_marketing_spec.rb

@@ -17,7 +17,7 @@ describe ConstantContact::Services::EmailMarketingService do
       json_response = load_file('email_campaigns_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       campaigns = ConstantContact::Services::EmailMarketingService.new(@client).get_campaigns()
@@ -32,7 +32,7 @@ describe ConstantContact::Services::EmailMarketingService do
       json_response = load_file('email_campaign_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       campaign = ConstantContact::Services::EmailMarketingService.new(@client).get_campaign(1)
@@ -46,7 +46,7 @@ describe ConstantContact::Services::EmailMarketingService do
       json_response = load_file('email_campaign_preview_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       campaign_preview = ConstantContact::Services::EmailMarketingService.new(@client).get_campaign_preview(1)
@@ -60,7 +60,7 @@ describe ConstantContact::Services::EmailMarketingService do
       json = load_file('email_campaign_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
       new_campaign = ConstantContact::Components::Campaign.create(JSON.parse(json))
 
@@ -75,12 +75,12 @@ describe ConstantContact::Services::EmailMarketingService do
       json = load_file('email_campaign_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 204, 'No Content')
 
-      response = RestClient::Response.create('', net_http_resp, {}, @request)
+      response = RestClient::Response.create('', net_http_resp, @request)
       RestClient.stub(:delete).and_return(response)
       campaign = ConstantContact::Components::Campaign.create(JSON.parse(json))
 
       result = ConstantContact::Services::EmailMarketingService.new(@client).delete_campaign(campaign)
-      result.should be_true
+      expect(result).to eq true
     end
   end
 
@@ -89,7 +89,7 @@ describe ConstantContact::Services::EmailMarketingService do
       json = load_file('email_campaign_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:put).and_return(response)
       campaign = ConstantContact::Components::Campaign.create(JSON.parse(json))
 

data/spec/constantcontact/services/event_spot_spec.rb

@@ -17,7 +17,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('events.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
       events = ConstantContact::Services::EventSpotService.new(@client).get_events()
       events.should be_kind_of(ConstantContact::Components::ResultSet)
@@ -30,7 +30,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('event.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
       event = ConstantContact::Services::EventSpotService.new(@client).get_event(1)
 
@@ -43,7 +43,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('event.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
       event = ConstantContact::Components::Event.create(JSON.parse(json))
       added = ConstantContact::Services::EventSpotService.new(@client).add_event(event)
@@ -60,7 +60,7 @@ describe ConstantContact::Services::EventSpotService do
       hash["status"] = "ACTIVE"
 
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
-      response = RestClient::Response.create(hash.to_json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(hash.to_json, net_http_resp, @request)
       RestClient.stub(:patch).and_return(response)
       
       event = ConstantContact::Components::Event.create(JSON.parse(json))
@@ -78,7 +78,7 @@ describe ConstantContact::Services::EventSpotService do
       hash["status"] = "CANCELLED"
 
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
-      response = RestClient::Response.create(hash.to_json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(hash.to_json, net_http_resp, @request)
       RestClient.stub(:patch).and_return(response)
 
       event = ConstantContact::Components::Event.create(JSON.parse(json))
@@ -95,7 +95,7 @@ describe ConstantContact::Services::EventSpotService do
       fees_json = load_file('fees.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(fees_json, net_http_resp, {}, @request)
+      response =RestClient::Response.create(fees_json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
       event = ConstantContact::Components::Event.create(JSON.parse(event_json))
       fees = ConstantContact::Services::EventSpotService.new(@client).get_fees(event)
@@ -113,7 +113,7 @@ describe ConstantContact::Services::EventSpotService do
       fee_json = load_file('fees.json')
       
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
-      response = RestClient::Response.create(fee_json, net_http_resp, {}, @request)
+      response =RestClient::Response.create(fee_json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       event = ConstantContact::Components::Event.create(JSON.parse(event_json))
@@ -129,7 +129,7 @@ describe ConstantContact::Services::EventSpotService do
       fee_json = load_file('fee.json')
 
       net_http_resp = Net::HTTPResponse.new(1.0, 201, 'Created')
-      response = RestClient::Response.create(fee_json, net_http_resp, {}, @request)
+      response =RestClient::Response.create(fee_json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
 
       event = ConstantContact::Components::Event.create(JSON.parse(event_json))
@@ -148,7 +148,7 @@ describe ConstantContact::Services::EventSpotService do
       hash['fee'] += 1
 
       net_http_resp = Net::HTTPResponse.new(1.0, 201, 'Created')
-      response = RestClient::Response.create(hash.to_json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(hash.to_json, net_http_resp, @request)
       RestClient.stub(:put).and_return(response)
 
       event = ConstantContact::Components::Event.create(JSON.parse(event_json))
@@ -166,12 +166,12 @@ describe ConstantContact::Services::EventSpotService do
       fee_json = load_file('fees.json')
 
       net_http_resp = Net::HTTPResponse.new(1.0, 204, 'No Content')
-      response = RestClient::Response.create('', net_http_resp, {}, @request)
+      response = RestClient::Response.create('', net_http_resp, @request)
       RestClient.stub(:delete).and_return(response)
 
       event = ConstantContact::Components::Event.create(JSON.parse(event_json))
       fee   = ConstantContact::Components::EventFee.create(JSON.parse(fee_json))
-      ConstantContact::Services::EventSpotService.new(@client).delete_fee(event, fee).should be_true
+      expect(ConstantContact::Services::EventSpotService.new(@client).delete_fee(event, fee)).to eq true
     end
   end
 
@@ -181,7 +181,7 @@ describe ConstantContact::Services::EventSpotService do
       registrants_json = load_file('registrants.json')
 
       net_http_resp = Net::HTTPResponse.new(1.0, 201, 'Created')
-      response = RestClient::Response.create(registrants_json, net_http_resp, {}, @request)
+      response =RestClient::Response.create(registrants_json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       event = ConstantContact::Components::Event.create(JSON.parse(event_json))
@@ -197,7 +197,7 @@ describe ConstantContact::Services::EventSpotService do
       registrant_json = load_file('registrant.json')
 
       net_http_resp = Net::HTTPResponse.new(1.0, 201, 'Created')
-      response = RestClient::Response.create(registrant_json, net_http_resp, {}, @request)
+      response =RestClient::Response.create(registrant_json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       event = ConstantContact::Components::Event.create(JSON.parse(event_json))
@@ -213,7 +213,7 @@ describe ConstantContact::Services::EventSpotService do
       json_response = load_file('event_items_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       results = ConstantContact::Services::EventSpotService.new(@client).get_event_items(1)
@@ -228,7 +228,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('event_item_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       result = ConstantContact::Services::EventSpotService.new(@client).get_event_item(1, 1)
@@ -242,7 +242,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('event_item_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
       event_item = ConstantContact::Components::EventItem.create(JSON.parse(json))
 
@@ -256,11 +256,11 @@ describe ConstantContact::Services::EventSpotService do
     it "deletes an event item" do
       net_http_resp = Net::HTTPResponse.new(1.0, 204, 'No Content')
 
-      response = RestClient::Response.create('', net_http_resp, {}, @request)
+      response = RestClient::Response.create('', net_http_resp, @request)
       RestClient.stub(:delete).and_return(response)
 
       result = ConstantContact::Services::EventSpotService.new(@client).delete_event_item(1, 1)
-      result.should be_true
+      expect(result).to eq true
     end
   end
 
@@ -269,7 +269,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('event_item_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:put).and_return(response)
       event_item = ConstantContact::Components::EventItem.create(JSON.parse(json))
 
@@ -284,7 +284,7 @@ describe ConstantContact::Services::EventSpotService do
       json_response = load_file('event_item_attributes_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       results = ConstantContact::Services::EventSpotService.new(@client).get_event_item_attributes(1, 1)
@@ -299,7 +299,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('event_item_attribute_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       result = ConstantContact::Services::EventSpotService.new(@client).get_event_item_attribute(1, 1, 1)
@@ -313,7 +313,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('event_item_attribute_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
       event_item_attribute = ConstantContact::Components::EventItemAttribute.create(JSON.parse(json))
 
@@ -327,11 +327,11 @@ describe ConstantContact::Services::EventSpotService do
     it "deletes an event item attribute" do
       net_http_resp = Net::HTTPResponse.new(1.0, 204, 'No Content')
 
-      response = RestClient::Response.create('', net_http_resp, {}, @request)
+      response = RestClient::Response.create('', net_http_resp, @request)
       RestClient.stub(:delete).and_return(response)
 
       result = ConstantContact::Services::EventSpotService.new(@client).delete_event_item_attribute(1, 1, 1)
-      result.should be_true
+      expect(result).to eq true
     end
   end
 
@@ -340,7 +340,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('event_item_attribute_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:put).and_return(response)
       event_item_attribute = ConstantContact::Components::EventItemAttribute.create(JSON.parse(json))
 
@@ -355,7 +355,7 @@ describe ConstantContact::Services::EventSpotService do
       json_response = load_file('promocodes_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json_response, net_http_resp, {}, @request)
+      response =RestClient::Response.create(json_response, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       results = ConstantContact::Services::EventSpotService.new(@client).get_promocodes(1)
@@ -370,7 +370,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('promocode_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:get).and_return(response)
 
       result = ConstantContact::Services::EventSpotService.new(@client).get_promocode(1, 1)
@@ -384,7 +384,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('promocode_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:post).and_return(response)
       promocode = ConstantContact::Components::Promocode.create(JSON.parse(json))
 
@@ -398,11 +398,11 @@ describe ConstantContact::Services::EventSpotService do
     it "deletes a promocode" do
       net_http_resp = Net::HTTPResponse.new(1.0, 204, 'No Content')
 
-      response = RestClient::Response.create('', net_http_resp, {}, @request)
+      response = RestClient::Response.create('', net_http_resp, @request)
       RestClient.stub(:delete).and_return(response)
 
       result = ConstantContact::Services::EventSpotService.new(@client).delete_promocode(1, 1)
-      result.should be_true
+      expect(result).to eq true
     end
   end
 
@@ -411,7 +411,7 @@ describe ConstantContact::Services::EventSpotService do
       json = load_file('promocode_response.json')
       net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
 
-      response = RestClient::Response.create(json, net_http_resp, {}, @request)
+      response = RestClient::Response.create(json, net_http_resp, @request)
       RestClient.stub(:put).and_return(response)
       promocode = ConstantContact::Components::Promocode.create(JSON.parse(json))