sendgrid4r 1.11.0 → 1.12.0

data/spec/rest/sm/global_unsubscribes_spec.rb

@@ -83,22 +83,18 @@ module SendGrid4r::REST::Sm
       end
 
       let(:recipient_emails) do
-        JSON.parse(
-          '{'\
-            '"recipient_emails": ['\
-              '"test1@example.com",'\
-              '"test2@example.com"'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"recipient_emails": ['\
+            '"test1@example.com",'\
+            '"test2@example.com"'\
+          ']'\
+        '}'
       end
 
       let(:recipient_email) do
-        JSON.parse(
-          '{'\
-            '"recipient_email": "test1@example.com"'\
-          '}'
-        )
+        '{'\
+          '"recipient_email": "test1@example.com"'\
+        '}'
       end
 
       it '#post_global_suppressed_emails' do

data/spec/rest/sm/groups_spec.rb

@@ -90,7 +90,18 @@ module SendGrid4r::REST::Sm
       end
 
       let(:group) do
-        JSON.parse(
+        '{'\
+          '"id": 100,'\
+          '"name": "Newsletters",'\
+          '"description": "Our monthly newsletter.",'\
+          '"last_email_sent_at": null,'\
+          '"is_default": true,'\
+          '"unsubscribes": 400'\
+        '}'
+      end
+
+      let(:groups) do
+        '['\
           '{'\
             '"id": 100,'\
             '"name": "Newsletters",'\
@@ -98,31 +109,16 @@ module SendGrid4r::REST::Sm
             '"last_email_sent_at": null,'\
             '"is_default": true,'\
             '"unsubscribes": 400'\
-          '}'
-        )
-      end
-
-      let(:groups) do
-        JSON.parse(
-          '['\
-            '{'\
-              '"id": 100,'\
-              '"name": "Newsletters",'\
-              '"description": "Our monthly newsletter.",'\
-              '"last_email_sent_at": null,'\
-              '"is_default": true,'\
-              '"unsubscribes": 400'\
-            '},'\
-            '{'\
-              '"id": 101,'\
-              '"name": "Alerts",'\
-              '"description": "Emails triggered by user-defined rules.",'\
-              '"last_email_sent_at": null,'\
-              '"is_default": false,'\
-              '"unsubscribes": 1'\
-            '}'\
-          ']'
-        )
+          '},'\
+          '{'\
+            '"id": 101,'\
+            '"name": "Alerts",'\
+            '"description": "Emails triggered by user-defined rules.",'\
+            '"last_email_sent_at": null,'\
+            '"is_default": false,'\
+            '"unsubscribes": 1'\
+          '}'\
+        ']'
       end
 
       it '#post_group' do
@@ -159,7 +155,7 @@ module SendGrid4r::REST::Sm
       end
 
       it 'creates group instance' do
-        actual = Groups.create_group(group)
+        actual = Groups.create_group(JSON.parse(group))
         expect(actual).to be_a(Groups::Group)
         expect(actual.id).to eq(100)
         expect(actual.name).to eq('Newsletters')
@@ -170,7 +166,7 @@ module SendGrid4r::REST::Sm
       end
 
       it 'creates groups instance' do
-        actual = Groups.create_groups(groups)
+        actual = Groups.create_groups(JSON.parse(groups))
         expect(actual).to be_a(Array)
         actual.each do |group|
           expect(group).to be_a(Groups::Group)

data/spec/rest/sm/sm_spec.rb

@@ -4,27 +4,25 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 module SendGrid4r::REST::Sm
   describe SendGrid4r::REST::Sm do
     let(:recipient_email) do
-      JSON.parse(
-        '{'\
-          '"recipient_email": "test1@example.com"'\
-        '}'
-      )
+      '{'\
+        '"recipient_email": "test1@example.com"'\
+      '}'
     end
 
     let(:recipient_emails) do
-      JSON.parse(
-        '{'\
-          '"recipient_emails": ['\
-            '"test1@example.com",'\
-            '"test2@example.com"'\
-          ']'\
-        '}'
-      )
+      '{'\
+        '"recipient_emails": ['\
+          '"test1@example.com",'\
+          '"test2@example.com"'\
+        ']'\
+      '}'
     end
 
     describe 'unit test', :ut do
       it 'creates recipient_emails instance' do
-        actual = SendGrid4r::REST::Sm.create_recipient_emails(recipient_emails)
+        actual = SendGrid4r::REST::Sm.create_recipient_emails(
+          JSON.parse(recipient_emails)
+        )
         expect(actual).to be_a(RecipientEmails)
         expect(actual.recipient_emails).to be_a(Array)
         expect(actual.recipient_emails).to include('test1@example.com')
@@ -32,7 +30,9 @@ module SendGrid4r::REST::Sm
       end
 
       it 'creates recipient_email instance' do
-        actual = SendGrid4r::REST::Sm.create_recipient_email(recipient_email)
+        actual = SendGrid4r::REST::Sm.create_recipient_email(
+          JSON.parse(recipient_email)
+        )
         expect(actual).to be_a(RecipientEmail)
         expect(actual.recipient_email).to eq('test1@example.com')
       end

data/spec/rest/sm/suppressions_spec.rb

@@ -80,60 +80,50 @@ module SendGrid4r::REST::Sm
       end
 
       let(:recipient_emails) do
-        JSON.parse(
-          '{'\
-            '"recipient_emails": ['\
-              '"test1@example.com",'\
-              '"test2@example.com"'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"recipient_emails": ['\
+            '"test1@example.com",'\
+            '"test2@example.com"'\
+          ']'\
+        '}'
       end
 
       let(:recipient_email) do
-        JSON.parse(
-          '{'\
-            '"recipient_email": "test1@example.com"'\
-          '}'
-        )
+        '{'\
+          '"recipient_email": "test1@example.com"'\
+        '}'
       end
 
       let(:emails) do
-        JSON.parse(
-          '["test1@example.com","test2@example.com"]'
-        )
+        '["test1@example.com","test2@example.com"]'
       end
 
       let(:suppression) do
-        JSON.parse(
-          '{'\
-            '"id": 4,'\
-            '"name": "Special Offers",'\
-            '"description": "Special offers and coupons",'\
-            '"suppressed": false'\
-          '}'
-        )
+        '{'\
+          '"id": 4,'\
+          '"name": "Special Offers",'\
+          '"description": "Special offers and coupons",'\
+          '"suppressed": false'\
+        '}'
       end
 
       let(:suppressions) do
-        JSON.parse(
-          '{'\
-            '"suppressions": ['\
-              '{'\
-                '"id": 1,'\
-                '"name": "Weekly Newsletter",'\
-                '"description": "The weekly newsletter",'\
-                '"suppressed": false'\
-              '},'\
-              '{'\
-                '"id": 4,'\
-                '"name": "Special Offers",'\
-                '"description": "Special offers and coupons",'\
-                '"suppressed": false'\
-              '}'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"suppressions": ['\
+            '{'\
+              '"id": 1,'\
+              '"name": "Weekly Newsletter",'\
+              '"description": "The weekly newsletter",'\
+              '"suppressed": false'\
+            '},'\
+            '{'\
+              '"id": 4,'\
+              '"name": "Special Offers",'\
+              '"description": "Special offers and coupons",'\
+              '"suppressed": false'\
+            '}'\
+          ']'\
+        '}'
       end
 
       it '#post_suppressed_emails' do
@@ -166,7 +156,7 @@ module SendGrid4r::REST::Sm
       end
 
       it 'creates suppression instance' do
-        actual = Suppressions.create_suppression(suppression)
+        actual = Suppressions.create_suppression(JSON.parse(suppression))
         expect(actual).to be_a(Suppressions::Suppression)
         expect(actual.id).to eq(4)
         expect(actual.name).to eq('Special Offers')
@@ -175,7 +165,7 @@ module SendGrid4r::REST::Sm
       end
 
       it 'creates suppressions instance' do
-        actual = Suppressions.create_suppressions(suppressions)
+        actual = Suppressions.create_suppressions(JSON.parse(suppressions))
         expect(actual).to be_a(Suppressions::Suppressions)
         expect(actual.suppressions).to be_a(Array)
         actual.suppressions.each do |suppression|

data/spec/rest/spam_reports_spec.rb

@@ -54,30 +54,26 @@ module SendGrid4r::REST
       end
 
       let(:spam_reports) do
-        JSON.parse(
-          '['\
-            '{'\
-              '"created": 1443651141,'\
-              '"email": "user1@example.com",'\
-              '"ip": "10.63.202.100"'\
-            '},'\
-            '{'\
-              '"created": 1443651154,'\
-              '"email": "user2@example.com",'\
-              '"ip": "10.63.202.100"'\
-            '}'\
-          ']'
-        )
+        '['\
+          '{'\
+            '"created": 1443651141,'\
+            '"email": "user1@example.com",'\
+            '"ip": "10.63.202.100"'\
+          '},'\
+          '{'\
+            '"created": 1443651154,'\
+            '"email": "user2@example.com",'\
+            '"ip": "10.63.202.100"'\
+          '}'\
+        ']'
       end
 
       let(:spam_report) do
-        JSON.parse(
-          '{'\
-            '"created": 1454433146,'\
-            '"email": "test1@example.com",'\
-            '"ip": "10.89.32.5"'\
-          '}'
-        )
+        '{'\
+          '"created": 1454433146,'\
+          '"email": "test1@example.com",'\
+          '"ip": "10.89.32.5"'\
+        '}'
       end
 
       it '#get_spam_reports' do
@@ -116,7 +112,7 @@ module SendGrid4r::REST
       end
 
       it 'creates spam_reports instance' do
-        actual = SpamReports.create_spam_reports(spam_reports)
+        actual = SpamReports.create_spam_reports(JSON.parse(spam_reports))
         expect(actual).to be_a(Array)
         actual.each do |subuser|
           expect(subuser).to be_a(SpamReports::SpamReport)
@@ -124,7 +120,7 @@ module SendGrid4r::REST
       end
 
       it 'creates spam_report instance' do
-        actual = SpamReports.create_spam_report(spam_report)
+        actual = SpamReports.create_spam_report(JSON.parse(spam_report))
         expect(actual).to be_a(SpamReports::SpamReport)
         expect(actual.created).to eq(Time.at(1454433146))
         expect(actual.email).to eq('test1@example.com')

data/spec/rest/stats/advanced_spec.rb

@@ -156,7 +156,7 @@ module SendGrid4r::REST::Stats
 
         it '#get_mailbox_providers_stats with mandatory params' do
           top_stats =
-            @client.get_mailbox_providers_stats(start_date: '2015-01-01')
+            @client.get_mailbox_providers_stats(start_date: '2015-01-23')
           expect(top_stats).to be_a(Array)
           top_stats.each do |top_stat|
             expect(top_stat).to be_a(TopStat)
@@ -175,7 +175,7 @@ module SendGrid4r::REST::Stats
               expect(stat.metrics.spam_reports.nil?).to be(false)
               expect(stat.metrics.unique_clicks.nil?).to be(false)
               expect(stat.metrics.unique_opens.nil?).to be(false)
-              expect(stat.name).to be_a(String)
+              expect(stat.name).to eq(nil)
               expect(stat.type).to eq('mailbox_provider')
             end
           end
@@ -184,9 +184,9 @@ module SendGrid4r::REST::Stats
         it '#get_mailbox_providers_stats with all params' do
           top_stats = @client.get_mailbox_providers_stats(
             start_date: '2015-01-01',
-            end_date: '2015-01-02',
+            end_date: '2015-01-31',
             aggregated_by: :week,
-            esps: :sss
+            mailbox_providers: :Other
           )
           expect(top_stats).to be_a(Array)
           top_stats.each do |top_stat|

data/spec/rest/stats/global_spec.rb

@@ -55,27 +55,6 @@ module SendGrid4r::REST::Stats
           end
         end
       end
-
-      context 'with block call' do
-        it '#get_global_stats with all params' do
-          @client.get_global_stats(
-            start_date: '2015-01-01',
-            end_date: '2015-01-01',
-            aggregated_by: :week
-          ) do |resp, req, res|
-            resp =
-              SendGrid4r::REST::Stats.create_top_stats(
-                JSON.parse(resp)
-              )
-            expect(resp).to be_a(Array)
-            resp.each do |stat|
-              expect(stat).to be_a(TopStat)
-            end
-            expect(req).to be_a(RestClient::Request)
-            expect(res).to be_a(Net::HTTPOK)
-          end
-        end
-      end
     end
   end
 end

data/spec/rest/subusers_spec.rb

@@ -55,9 +55,10 @@ module SendGrid4r::REST
         end
 
         it '#get_subuser_monitor' do
-          monitor = @client.get_subuser_monitor(
+          @client.post_subuser_monitor(
             username: @username3, email: @email1, frequency: 10
           )
+          monitor = @client.get_subuser_monitor(username: @username3)
           expect(monitor).to be_a(Subusers::Monitor)
         end
 
@@ -113,55 +114,47 @@ module SendGrid4r::REST
       end
 
       let(:subusers) do
-        JSON.parse(
-          '['\
-            '{'\
-              '"id": 1,'\
-              '"username": "Test@example.com",'\
-              '"email": "Test@example.com"'\
-            '},'\
-            '{'\
-              '"id": 2,'\
-              '"username": "John@example.com",'\
-              '"email": "John@example.com"'\
-            '}'\
-          ']'
-        )
+        '['\
+          '{'\
+            '"id": 1,'\
+            '"username": "Test@example.com",'\
+            '"email": "Test@example.com"'\
+          '},'\
+          '{'\
+            '"id": 2,'\
+            '"username": "John@example.com",'\
+            '"email": "John@example.com"'\
+          '}'\
+        ']'
       end
 
       let(:subuser) do
-        JSON.parse(
-          '{'\
-            '"username": "John@example.com",'\
-            '"email": "John@example.com",'\
-            '"password": "johns_password",'\
-            '"ips": ['\
-              '"1.1.1.1",'\
-              '"2.2.2.2"'\
-            '],'\
-            '"disabled": false'\
-          '}'
-        )
+        '{'\
+          '"username": "John@example.com",'\
+          '"email": "John@example.com",'\
+          '"password": "johns_password",'\
+          '"ips": ['\
+            '"1.1.1.1",'\
+            '"2.2.2.2"'\
+          '],'\
+          '"disabled": false'\
+        '}'
       end
 
       let(:ips) do
-        JSON.parse(
-          '{'\
-            '"ips": ['\
-              '"127.0.0.1",'\
-              '"127.0.0.2"'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"ips": ['\
+            '"127.0.0.1",'\
+            '"127.0.0.2"'\
+          ']'\
+        '}'
       end
 
       let(:monitor) do
-        JSON.parse(
-          '{'\
-            '"email": "test@example.com",'\
-            '"frequency": 500'\
-          '}'
-        )
+        '{'\
+          '"email": "test@example.com",'\
+          '"frequency": 500'\
+        '}'
       end
 
       it '#get_subusers' do
@@ -195,9 +188,7 @@ module SendGrid4r::REST
 
       it '#get_subuser_monitor' do
         allow(client).to receive(:execute).and_return(monitor)
-        actual = client.get_subuser_monitor(
-          username: '', email: '', frequency: 1
-        )
+        actual = client.get_subuser_monitor(username: '')
         expect(actual).to be_a(Subusers::Monitor)
       end
 
@@ -239,7 +230,7 @@ module SendGrid4r::REST
       end
 
       it 'creates subusers instance' do
-        actual = Subusers.create_subusers(subusers)
+        actual = Subusers.create_subusers(JSON.parse(subusers))
         expect(actual).to be_a(Array)
         actual.each do |subuser|
           expect(subuser).to be_a(Subusers::Subuser)
@@ -247,7 +238,7 @@ module SendGrid4r::REST
       end
 
       it 'creates subuser instance' do
-        actual = Subusers.create_subuser(subuser)
+        actual = Subusers.create_subuser(JSON.parse(subuser))
         expect(actual).to be_a(Subusers::Subuser)
         expect(actual.username).to eq('John@example.com')
         expect(actual.email).to eq('John@example.com')
@@ -259,7 +250,7 @@ module SendGrid4r::REST
       end
 
       it 'creates monitor instance' do
-        actual = Subusers.create_monitor(monitor)
+        actual = Subusers.create_monitor(JSON.parse(monitor))
         expect(actual).to be_a(Subusers::Monitor)
         expect(actual.email).to eq('test@example.com')
         expect(actual.frequency).to eq(500)