mrkt 1.0.1 → 1.2.1

data/spec/concerns/crud_activities_spec.rb

@@ -1,7 +1,9 @@
 describe Mrkt::CrudActivities do
-  include_context 'initialized client'
+  include_context 'with an initialized client'
 
   describe '#get_activity_types' do
+    subject { client.get_activity_types }
+
     let(:response_stub) do
       {
         requestId: 'c245#14cd6830ae2',
@@ -29,7 +31,6 @@ describe Mrkt::CrudActivities do
         success: true
       }
     end
-    subject { client.get_activity_types }
 
     before do
       stub_request(:get, "https://#{host}/rest/v1/activities/types.json")
@@ -40,6 +41,8 @@ describe Mrkt::CrudActivities do
   end
 
   describe '#get_paging_token' do
+    subject { client.get_paging_token(since_datetime) }
+
     let(:since_datetime) { Time.utc(2017, 1, 1, 4, 30) }
     let(:response_stub) do
       {
@@ -48,7 +51,6 @@ describe Mrkt::CrudActivities do
         nextPageToken: '4GAX7YNCIJKO2VAED5LH5PQIYPUM7WCVKTQWEDMP2L24AXZT54LA===='
       }
     end
-    subject { client.get_paging_token(since_datetime) }
 
     before do
       stub_request(:get, "https://#{host}/rest/v1/activities/pagingtoken.json")
@@ -60,6 +62,8 @@ describe Mrkt::CrudActivities do
   end
 
   describe '#get_activities' do
+    subject { client.get_activities(token) }
+
     let(:activity_type_ids) { [1, 2] }
     let(:lead_ids) { [100, 102] }
     let(:token) { '4GAX7YNCIJKO2VAED5LH5PQIYPUM7WCVKTQWEDMP2L24AXZT54LA====' }
@@ -106,7 +110,6 @@ describe Mrkt::CrudActivities do
         moreResult: false
       }
     end
-    subject { client.get_activities(token) }
 
     before do
       stub_request(:get, "https://#{host}/rest/v1/activities.json")
@@ -116,7 +119,9 @@ describe Mrkt::CrudActivities do
 
     it { is_expected.to eq(response_stub) }
 
-    context 'specifying activity type ids' do
+    context 'when specifying activity type ids' do
+      subject { client.get_activities(token, activity_type_ids: activity_type_ids) }
+
       let(:response_stub) do
         {
           data: {
@@ -147,7 +152,6 @@ describe Mrkt::CrudActivities do
           moreResult: false
         }
       end
-      subject { client.get_activities(token, activity_type_ids: activity_type_ids) }
 
       before do
         stub_request(:get, "https://#{host}/rest/v1/activities.json")
@@ -161,7 +165,9 @@ describe Mrkt::CrudActivities do
       it { is_expected.to eq(response_stub) }
     end
 
-    context 'specifying lead ids' do
+    context 'when specifying lead ids' do
+      subject { client.get_activities(token, lead_ids: lead_ids) }
+
       let(:response_stub) do
         {
           data: {
@@ -192,7 +198,6 @@ describe Mrkt::CrudActivities do
           moreResult: false
         }
       end
-      subject { client.get_activities(token, lead_ids: lead_ids) }
 
       before do
         stub_request(:get, "https://#{host}/rest/v1/activities.json")
@@ -203,13 +208,14 @@ describe Mrkt::CrudActivities do
       it { is_expected.to eq(response_stub) }
     end
 
-    context 'specifying arrays values as empty strings' do
-      let(:activity_type_ids) { '' }
-      let(:lead_ids) { '' }
+    context 'when specifying arrays values as empty strings' do
       subject do
         client.get_activities(token, activity_type_ids: activity_type_ids, lead_ids: lead_ids)
       end
 
+      let(:activity_type_ids) { '' }
+      let(:lead_ids) { '' }
+
       before do
         stub_request(:get, "https://#{host}/rest/v1/activities.json")
           .with(query: { nextPageToken: token })
@@ -219,7 +225,7 @@ describe Mrkt::CrudActivities do
       it { is_expected.to eq(response_stub) }
     end
 
-    context 'specifying all options' do
+    context 'when specifying all options' do
       subject do
         client.get_activities(token, activity_type_ids: activity_type_ids, lead_ids: lead_ids)
       end
@@ -239,6 +245,8 @@ describe Mrkt::CrudActivities do
   end
 
   describe '#get_deleted_leads' do
+    subject { client.get_deleted_leads(token) }
+
     let(:token) { '4GAX7YNCIJKO2VAED5LH5PQIYPUM7WCVKTQWEDMP2L24AXZT54LA====' }
     let(:response_stub) do
       {
@@ -266,7 +274,6 @@ describe Mrkt::CrudActivities do
         moreResult: false
       }
     end
-    subject { client.get_deleted_leads(token) }
 
     before do
       stub_request(:get, "https://#{host}/rest/v1/activities/deletedleads.json")

data/spec/concerns/crud_asset_folders_spec.rb

@@ -1,5 +1,5 @@
 describe Mrkt::CrudAssetFolders do
-  include_context 'initialized client'
+  include_context 'with an initialized client'
 
   let(:response_folder_result) do
     {
@@ -65,7 +65,7 @@ describe Mrkt::CrudAssetFolders do
   end
 
   describe '#get_folder_by_id' do
-    subject { client.get_folder_by_id(id, type: type) }
+    subject(:action) { client.get_folder_by_id(id, type: type) }
 
     let(:id) { 77 }
 
@@ -123,14 +123,14 @@ describe Mrkt::CrudAssetFolders do
         }
       end
 
-      it 'should raise an Error' do
-        expect { subject }.to raise_error(Mrkt::Errors::TypeMismatch)
+      it 'raises an Error' do
+        expect { action }.to raise_error(Mrkt::Errors::TypeMismatch)
       end
     end
   end
 
   describe '#get_folder_by_name' do
-    subject { client.get_folder_by_name(name, type: type, root: root, work_space: work_space) }
+    subject(:action) { client.get_folder_by_name(name, type: type, root: root, work_space: work_space) }
 
     let(:name) { 'Test Folder Name' }
     let(:type) { 'Folder' }
@@ -196,8 +196,8 @@ describe Mrkt::CrudAssetFolders do
         }
       end
 
-      it 'should raise an Error' do
-        expect { subject }.to raise_error(Mrkt::Errors::System)
+      it 'raises an Error' do
+        expect { action }.to raise_error(Mrkt::Errors::System)
       end
     end
 
@@ -216,14 +216,14 @@ describe Mrkt::CrudAssetFolders do
         }
       end
 
-      it 'should raise an Error' do
-        expect { subject }.to raise_error(Mrkt::Errors::UnspecifiedAction)
+      it 'raises an Error' do
+        expect { action }.to raise_error(Mrkt::Errors::UnspecifiedAction)
       end
     end
   end
 
   describe '#delete_folder' do
-    subject { client.delete_folder(id) }
+    subject(:action) { client.delete_folder(id) }
 
     let(:id) { 75 }
 
@@ -265,8 +265,8 @@ describe Mrkt::CrudAssetFolders do
         }
       end
 
-      it 'should raise an Error' do
-        expect { subject }.to raise_error(Mrkt::Errors::RecordNotFound)
+      it 'raises an Error' do
+        expect { action }.to raise_error(Mrkt::Errors::RecordNotFound)
       end
     end
   end

data/spec/concerns/crud_asset_static_lists_spec.rb

@@ -1,5 +1,5 @@
 describe Mrkt::CrudAssetStaticLists do
-  include_context 'initialized client'
+  include_context 'with an initialized client'
 
   let(:response_static_list_result) do
     {
@@ -55,7 +55,7 @@ describe Mrkt::CrudAssetStaticLists do
   end
 
   describe '#get_static_list_by_id' do
-    subject { client.get_static_list_by_id(id) }
+    subject(:action) { client.get_static_list_by_id(id) }
 
     let(:id) { response_static_list_result[:id] }
     let(:response_stub) do
@@ -106,8 +106,8 @@ describe Mrkt::CrudAssetStaticLists do
         }
       end
 
-      it 'should raise an Error' do
-        expect { subject }.to raise_error(Mrkt::Errors::RecordNotFound)
+      it 'raises an Error' do
+        expect { action }.to raise_error(Mrkt::Errors::RecordNotFound)
       end
     end
   end

data/spec/concerns/crud_campaigns_spec.rb

@@ -1,7 +1,9 @@
 describe Mrkt::CrudCampaigns do
-  include_context 'initialized client'
+  include_context 'with an initialized client'
 
   describe '#request_campaign' do
+    subject(:action) { client.request_campaign(id, lead_ids, tokens) }
+
     let(:id) { 42 }
     let(:lead_ids) { [1234, 5678] }
     let(:tokens) do
@@ -13,7 +15,6 @@ describe Mrkt::CrudCampaigns do
          value: 'Value for other token'
        }]
     end
-    subject { client.request_campaign(id, lead_ids, tokens) }
 
     before do
       stub_request(:post, "https://#{host}/rest/v1/campaigns/#{id}/trigger.json")
@@ -25,16 +26,16 @@ describe Mrkt::CrudCampaigns do
       let(:response_stub) do
         {
           requestId: 'a9b#14eb6771358',
-          success:   false,
-          errors:    [{
-                        code:    '1013',
-                        message: 'Campaign not found'
-                      }]
+          success: false,
+          errors: [{
+            code:    '1013',
+            message: 'Campaign not found'
+          }]
         }
       end
 
-      it 'should raise an Error' do
-        expect { subject }.to raise_error(Mrkt::Errors::ObjectNotFound)
+      it 'raises an Error' do
+        expect { action }.to raise_error(Mrkt::Errors::ObjectNotFound)
       end
     end
 
@@ -43,20 +44,20 @@ describe Mrkt::CrudCampaigns do
         let(:response_stub) do
           {
             requestId: '7cdc#14eb6ae8a86',
-            success:   false,
-            errors:    [{
-                          code:    '1004',
-                          message: 'Lead [1234] not found'
-                        }]
+            success: false,
+            errors: [{
+              code:    '1004',
+              message: 'Lead [1234] not found'
+            }]
           }
         end
 
-        it 'should raise an Error' do
-          expect { subject }.to raise_error(Mrkt::Errors::LeadNotFound)
+        it 'raises an Error' do
+          expect { action }.to raise_error(Mrkt::Errors::LeadNotFound)
         end
       end
 
-      context 'for valid lead ids' do
+      context 'with valid lead ids' do
         let(:response_stub) do
           {
             requestId: 'e42b#14272d07d78',

data/spec/concerns/crud_custom_activities_spec.rb

@@ -1,5 +1,5 @@
 describe Mrkt::CrudCustomObjects do
-  include_context 'initialized client'
+  include_context 'with an initialized client'
 
   describe '#get_list_of_custom_activity_types' do
     let(:response_stub) do
@@ -49,14 +49,14 @@ describe Mrkt::CrudCustomObjects do
       }
     end
 
-    context 'all activities' do
+    context 'with all activities' do
+      subject { client.get_list_of_custom_activity_types }
+
       before do
         stub_request(:get, "https://#{host}/rest/v1/activities/types.json")
           .to_return(json_stub(response_stub))
       end
 
-      subject { client.get_list_of_custom_activity_types }
-
       it { is_expected.to eq(response_stub) }
     end
   end
@@ -104,6 +104,8 @@ describe Mrkt::CrudCustomObjects do
     end
 
     context 'with no additional attributes' do
+      subject { client.create_custom_activity(lead_id, activity_type_id, primary_attribute_value, date: date) }
+
       let(:request_body) do
         {
           input: [{
@@ -122,12 +124,14 @@ describe Mrkt::CrudCustomObjects do
           .to_return(json_stub(response_stub))
       end
 
-      subject { client.create_custom_activity(lead_id, activity_type_id, primary_attribute_value, date: date) }
-
       it { is_expected.to eq(response_stub) }
     end
 
     context 'with additional attributes' do
+      subject do
+        client.create_custom_activity(lead_id, activity_type_id, primary_attribute_value, attributes: attributes, date: date)
+      end
+
       let(:request_body) do
         {
           input: [{
@@ -148,13 +152,6 @@ describe Mrkt::CrudCustomObjects do
           }]
         }
       end
-
-      before do
-        stub_request(:post, "https://#{host}/rest/v1/activities/external.json")
-          .with(json_stub(request_body))
-          .to_return(json_stub(response_stub))
-      end
-
       let(:attributes) do
         {
           percent: '0.20',
@@ -162,8 +159,10 @@ describe Mrkt::CrudCustomObjects do
         }
       end
 
-      subject do
-        client.create_custom_activity(lead_id, activity_type_id, primary_attribute_value, attributes: attributes, date: date)
+      before do
+        stub_request(:post, "https://#{host}/rest/v1/activities/external.json")
+          .with(json_stub(request_body))
+          .to_return(json_stub(response_stub))
       end
 
       it { is_expected.to eq(response_stub) }

data/spec/concerns/crud_custom_objects_spec.rb

@@ -1,5 +1,5 @@
 describe Mrkt::CrudCustomObjects do
-  include_context 'initialized client'
+  include_context 'with an initialized client'
 
   describe '#get_list_of_custom_objects' do
     let(:response_stub) do
@@ -44,17 +44,19 @@ describe Mrkt::CrudCustomObjects do
     end
 
     context 'with no object names' do
+      subject { client.get_list_of_custom_objects }
+
       before do
         stub_request(:get, "https://#{host}/rest/v1/customobjects.json")
           .to_return(json_stub(response_stub))
       end
 
-      subject { client.get_list_of_custom_objects }
-
       it { is_expected.to eq(response_stub) }
     end
 
     context 'with object names' do
+      subject { client.get_list_of_custom_objects(object_names) }
+
       let(:object_names) { %w[device_c manufacturer_c] }
 
       before do
@@ -63,13 +65,13 @@ describe Mrkt::CrudCustomObjects do
           .to_return(json_stub(response_stub))
       end
 
-      subject { client.get_list_of_custom_objects(object_names) }
-
       it { is_expected.to eq(response_stub) }
     end
   end
 
   describe '#describe_custom_object' do
+    subject(:action) { client.describe_custom_object(object_name) }
+
     let(:response_stub) do
       {
         requestId: 'eeef#152858b17d2',
@@ -129,8 +131,6 @@ describe Mrkt::CrudCustomObjects do
         .to_return(json_stub(response_stub))
     end
 
-    subject { client.describe_custom_object(object_name) }
-
     context 'when the object name is valid' do
       let(:object_name) { :device_c }
 
@@ -140,13 +140,15 @@ describe Mrkt::CrudCustomObjects do
     context 'when the object name is invalid' do
       let(:object_name) { nil }
 
-      it 'should raise an Error' do
-        expect { subject }.to raise_error(Mrkt::Errors::Unknown)
+      it 'raises an Error' do
+        expect { action }.to raise_error(Mrkt::Errors::Unknown)
       end
     end
   end
 
   describe '#createupdate_custom_objects' do
+    subject { client.createupdate_custom_objects(object_name, devices) }
+
     let(:object_name) { 'device' }
 
     let(:devices) do
@@ -178,8 +180,6 @@ describe Mrkt::CrudCustomObjects do
       }
     end
 
-    subject { client.createupdate_custom_objects(object_name, devices) }
-
     before do
       stub_request(:post, "https://#{host}/rest/v1/customobjects/#{object_name}.json")
         .with(json_stub(request_body))
@@ -190,6 +190,8 @@ describe Mrkt::CrudCustomObjects do
   end
 
   describe '#delete_custom_objects' do
+    subject { client.delete_custom_objects(object_name, search_fields) }
+
     let(:object_name) { 'device' }
 
     let(:search_fields) do
@@ -215,8 +217,6 @@ describe Mrkt::CrudCustomObjects do
       }
     end
 
-    subject { client.delete_custom_objects(object_name, search_fields) }
-
     before do
       stub_request(:post, "https://#{host}/rest/v1/customobjects/#{object_name}/delete.json")
         .with(json_stub(request_body))
@@ -227,6 +227,8 @@ describe Mrkt::CrudCustomObjects do
   end
 
   describe '#get_custom_objects' do
+    subject { client.get_custom_objects(object_name, filter_values) }
+
     let(:object_name) { 'device' }
 
     let(:filter_values) do
@@ -256,8 +258,6 @@ describe Mrkt::CrudCustomObjects do
       }
     end
 
-    subject { client.get_custom_objects(object_name, filter_values) }
-
     before do
       stub_request(:post, "https://#{host}/rest/v1/customobjects/#{object_name}.json?_method=GET")
         .with(json_stub(request_body))

data/spec/concerns/crud_leads_spec.rb

@@ -1,5 +1,5 @@
 describe Mrkt::CrudLeads do
-  include_context 'initialized client'
+  include_context 'with an initialized client'
 
   describe 'get_lead_by_id' do
     subject { client.get_lead_by_id(id, fields: fields) }
@@ -56,6 +56,8 @@ describe Mrkt::CrudLeads do
   end
 
   describe '#get_leads' do
+    subject { client.get_leads(filter_type, filter_values) }
+
     let(:filter_type) { 'email' }
     let(:filter_values) { %w[user@example.com] }
     let(:response_stub) do
@@ -74,7 +76,6 @@ describe Mrkt::CrudLeads do
         success: true
       }
     end
-    subject { client.get_leads(filter_type, filter_values) }
 
     before do
       stub_request(:get, "https://#{host}/rest/v1/leads.json")
@@ -86,6 +87,8 @@ describe Mrkt::CrudLeads do
   end
 
   describe '#createupdate_leads' do
+    subject { client.createupdate_leads(leads, lookup_field: :email) }
+
     let(:leads) do
       [
         firstName: 'John',
@@ -118,7 +121,6 @@ describe Mrkt::CrudLeads do
         ]
       }
     end
-    subject { client.createupdate_leads(leads, lookup_field: :email) }
 
     before do
       stub_request(:post, "https://#{host}/rest/v1/leads.json")
@@ -130,6 +132,8 @@ describe Mrkt::CrudLeads do
   end
 
   describe '#delete_leads' do
+    subject { client.delete_leads(leads) }
+
     let(:leads) { [1] }
     let(:request_body) do
       {
@@ -147,7 +151,6 @@ describe Mrkt::CrudLeads do
         success: true
       }
     end
-    subject { client.delete_leads(leads) }
 
     before do
       stub_request(:delete, "https://#{host}/rest/v1/leads.json")
@@ -159,12 +162,12 @@ describe Mrkt::CrudLeads do
   end
 
   describe '#associate_lead' do
+    subject(:action) { client.associate_lead(id, cookie) }
+
     let(:id) { 1 }
     let(:cookie) { 'id:561-HYG-937&token:_mch-marketo.com-1427205775289-40768' }
     let(:request_stub) { {} }
 
-    subject { client.associate_lead(id, cookie) }
-
     before do
       stub_request(:post, "https://#{host}/rest/v1/leads/#{id}/associate.json?#{URI.encode_www_form(cookie: cookie)}")
         .with(json_stub(request_stub))
@@ -197,19 +200,19 @@ describe Mrkt::CrudLeads do
         }
       end
 
-      it 'should raise an Error' do
-        expect { subject }.to raise_error(Mrkt::Errors::LeadNotFound)
+      it 'raises an Error' do
+        expect { action }.to raise_error(Mrkt::Errors::LeadNotFound)
       end
     end
   end
 
   describe '#merge_leads' do
+    subject(:action) { client.merge_leads(id, losing_lead_ids) }
+
     let(:id) { 1 }
     let(:losing_lead_ids) { [2, 3, 4] }
     let(:request_stub) { {} }
 
-    subject { client.merge_leads(id, losing_lead_ids) }
-
     before do
       params = ::Faraday::Utils::ParamsHash.new
       params[:mergeInCRM] = false
@@ -245,13 +248,15 @@ describe Mrkt::CrudLeads do
         }
       end
 
-      it 'should raise an Error' do
-        expect { subject }.to raise_error(Mrkt::Errors::LeadNotFound)
+      it 'raises an Error' do
+        expect { action }.to raise_error(Mrkt::Errors::LeadNotFound)
       end
     end
   end
 
   describe '#describe_lead' do
+    subject { client.describe_lead }
+
     let(:response_stub) do
       {
         requestId: '5c9e#169a68fa806',
@@ -289,8 +294,6 @@ describe Mrkt::CrudLeads do
       }
     end
 
-    subject { client.describe_lead }
-
     before do
       stub_request(:get, "https://#{host}/rest/v1/leads/describe.json")
         .to_return(json_stub(response_stub))

data/spec/concerns/crud_lists_spec.rb

@@ -1,7 +1,9 @@
 describe Mrkt::CrudLists do
-  include_context 'initialized client'
+  include_context 'with an initialized client'
 
   describe '#get_leads_by_list' do
+    subject { client.get_leads_by_list(list_id) }
+
     let(:list_id) { '1001' }
     let(:response_stub) do
       {
@@ -20,8 +22,6 @@ describe Mrkt::CrudLists do
       }
     end
 
-    subject { client.get_leads_by_list(list_id) }
-
     before do
       stub_request(:get, "https://#{host}/rest/v1/list/#{list_id}/leads.json")
         .with(query: {})
@@ -32,6 +32,8 @@ describe Mrkt::CrudLists do
   end
 
   describe '#add_leads_to_list' do
+    subject { client.add_leads_to_list(list_id, lead_ids) }
+
     let(:list_id) { '1001' }
     let(:lead_ids) { ['1'] }
     let(:request_body) do
@@ -53,7 +55,6 @@ describe Mrkt::CrudLists do
         success: true
       }
     end
-    subject { client.add_leads_to_list(list_id, lead_ids) }
 
     before do
       stub_request(:post, "https://#{host}/rest/v1/lists/#{list_id}/leads.json")
@@ -65,6 +66,8 @@ describe Mrkt::CrudLists do
   end
 
   describe '#remove_leads_from_list' do
+    subject { client.remove_leads_from_list(list_id, lead_ids) }
+
     let(:list_id) { '1001' }
     let(:lead_ids) { ['1'] }
     let(:request_body) do
@@ -86,7 +89,6 @@ describe Mrkt::CrudLists do
         success: true
       }
     end
-    subject { client.remove_leads_from_list(list_id, lead_ids) }
 
     before do
       stub_request(:delete, "https://#{host}/rest/v1/lists/#{list_id}/leads.json")