sendgrid4r 1.11.0 → 1.12.0

data/spec/rest/settings/enforced_tls_spec.rb

@@ -34,12 +34,10 @@ module SendGrid4r::REST::Settings
       end
 
       let(:enforced_tls) do
-        JSON.parse(
-          '{'\
-            '"require_tls": true,'\
-            '"require_valid_cert": false'\
-          '}'
-        )
+        '{'\
+          '"require_tls": true,'\
+          '"require_valid_cert": false'\
+        '}'
       end
 
       it '#get_enforced_tls' do
@@ -55,7 +53,7 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates enforced_tls instance' do
-        actual = EnforcedTls.create_enforced_tls(enforced_tls)
+        actual = EnforcedTls.create_enforced_tls(JSON.parse(enforced_tls))
         expect(actual.require_tls).to eq(true)
         expect(actual.require_valid_cert).to eq(false)
       end

data/spec/rest/settings/mail_spec.rb

@@ -116,6 +116,24 @@ module SendGrid4r::REST::Settings
           expect(edit.email).to eq(ENV['MAIL'])
         end
 
+        it '#get_settings_spam_check' do
+          actual = @client.get_settings_spam_check
+          expect(actual).to be_a(Mail::SpamCheck)
+        end
+
+        it '#patch_settings_spam_check' do
+          # get original settings
+          actual = @client.get_settings_spam_check
+          # patch the value
+          actual.enabled = false
+          actual.url = 'http://test.test.test'
+          actual.max_score = 4
+          edit = @client.patch_settings_spam_check(params: actual)
+          expect(edit.enabled).to eq(false)
+          expect(edit.url).to eq('http://test.test.test')
+          expect(edit.max_score).to eq(4)
+        end
+
         it '#get_settings_template' do
           actual = @client.get_settings_template
           expect(actual).to be_a(Mail::Template)
@@ -154,15 +172,13 @@ module SendGrid4r::REST::Settings
       end
 
       let(:address_whitelist) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"list": ['\
-              '"email1@example.com",'\
-              '"example.com"'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"list": ['\
+            '"email1@example.com",'\
+            '"example.com"'\
+          ']'\
+        '}'
       end
 
       it '#get_settings_address_whitelist' do
@@ -178,19 +194,17 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates address_whitelist instance' do
-        actual = Mail.create_address_whitelist(address_whitelist)
+        actual = Mail.create_address_whitelist(JSON.parse(address_whitelist))
         expect(actual.enabled).to eq(true)
         expect(actual.list).to be_a(Array)
         actual.list.each { |address| expect(address).to be_a(String) }
       end
 
       let(:bcc) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"email": "email@example.com"'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"email": "email@example.com"'\
+        '}'
       end
 
       it '#get_settings_bcc' do
@@ -206,19 +220,17 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates bcc instance' do
-        actual = Mail.create_bcc(bcc)
+        actual = Mail.create_bcc(JSON.parse(bcc))
         expect(actual.enabled).to eq(true)
         expect(actual.email).to eq('email@example.com')
       end
 
       let(:bounce_purge) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"hard_bounces": 1,'\
-            '"soft_bounces": 1'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"hard_bounces": 1,'\
+          '"soft_bounces": 1'\
+        '}'
       end
 
       it '#get_settings_bounce_purge' do
@@ -234,20 +246,18 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates bounce_purge instance' do
-        actual = Mail.create_bounce_purge(bounce_purge)
+        actual = Mail.create_bounce_purge(JSON.parse(bounce_purge))
         expect(actual.enabled).to eq(true)
         expect(actual.hard_bounces).to eq(1)
         expect(actual.soft_bounces).to eq(1)
       end
 
       let(:footer) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"html_content": "abc...",'\
-            '"plain_content": "xyz..."'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"html_content": "abc...",'\
+          '"plain_content": "xyz..."'\
+        '}'
       end
 
       it '#get_settings_footer' do
@@ -263,19 +273,17 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates footer instance' do
-        actual = Mail.create_footer(footer)
+        actual = Mail.create_footer(JSON.parse(footer))
         expect(actual.enabled).to eq(true)
         expect(actual.html_content).to eq('abc...')
         expect(actual.plain_content).to eq('xyz...')
       end
 
       let(:forward_bounce) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"email": "email address"'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"email": "email address"'\
+        '}'
       end
 
       it '#get_settings_forward_bounce' do
@@ -291,18 +299,16 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates forward_bounce instance' do
-        actual = Mail.create_forward_bounce(forward_bounce)
+        actual = Mail.create_forward_bounce(JSON.parse(forward_bounce))
         expect(actual.enabled).to eq(true)
         expect(actual.email).to eq('email address')
       end
 
       let(:forward_spam) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"email": "email address"'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"email": "email address"'\
+        '}'
       end
 
       it '#get_settings_forward_spam' do
@@ -318,18 +324,43 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates forward_spam instance' do
-        actual = Mail.create_forward_spam(forward_spam)
+        actual = Mail.create_forward_spam(JSON.parse(forward_spam))
         expect(actual.enabled).to eq(true)
         expect(actual.email).to eq('email address')
       end
 
+      let(:spam_check) do
+        '{'\
+          '"enabled": true,'\
+          '"url": "url",'\
+          '"max_score": 5'\
+        '}'
+      end
+
+      it '#get_settings_spam_check' do
+        allow(client).to receive(:execute).and_return(spam_check)
+        actual = client.get_settings_spam_check
+        expect(actual).to be_a(Mail::SpamCheck)
+      end
+
+      it '#patch_settings_spam_check' do
+        allow(client).to receive(:execute).and_return(spam_check)
+        actual = client.patch_settings_spam_check(params: nil)
+        expect(actual).to be_a(Mail::SpamCheck)
+      end
+
+      it 'creates spam_check instance' do
+        actual = Mail.create_spam_check(JSON.parse(spam_check))
+        expect(actual.enabled).to eq(true)
+        expect(actual.url).to eq('url')
+        expect(actual.max_score).to eq(5)
+      end
+
       let(:template) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"html_content": "..."'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"html_content": "..."'\
+        '}'
       end
 
       it '#get_settings_template' do
@@ -345,17 +376,15 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates template instance' do
-        actual = Mail.create_template(template)
+        actual = Mail.create_template(JSON.parse(template))
         expect(actual.enabled).to eq(true)
         expect(actual.html_content).to eq('...')
       end
 
       let(:plain_content) do
-        JSON.parse(
-          '{'\
-            '"enabled": true'\
-          '}'
-        )
+        '{'\
+          '"enabled": true'\
+        '}'
       end
 
       it '#get_settings_plain_content' do
@@ -371,7 +400,7 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates plain_content instance' do
-        actual = Mail.create_plain_content(plain_content)
+        actual = Mail.create_plain_content(JSON.parse(plain_content))
         expect(actual.enabled).to eq(true)
       end
     end

data/spec/rest/settings/partner_spec.rb

@@ -39,12 +39,10 @@ module SendGrid4r::REST::Settings
       end
 
       let(:partner) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"license_key": "key"'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"license_key": "key"'\
+        '}'
       end
 
       it '#get_settings_new_relic' do
@@ -60,7 +58,7 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates partner instance' do
-        actual = Partner.create_partner(partner)
+        actual = Partner.create_partner(JSON.parse(partner))
         expect(actual.enabled).to eq(true)
         expect(actual.license_key).to eq('key')
       end

data/spec/rest/settings/settings_spec.rb

@@ -9,33 +9,29 @@ module SendGrid4r::REST::Settings
       end
 
       let(:results) do
-        JSON.parse(
-          '{'\
-            '"result": ['\
-              '{'\
-                '"name": "bcc",'\
-                '"title": "BCC",'\
-                '"description": "lorem ipsum... .",'\
-                '"enabled": true'\
-              '}'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"result": ['\
+            '{'\
+              '"name": "bcc",'\
+              '"title": "BCC",'\
+              '"description": "lorem ipsum... .",'\
+              '"enabled": true'\
+            '}'\
+          ']'\
+        '}'
       end
 
       let(:result) do
-        JSON.parse(
-          '{'\
-            '"name": "bcc",'\
-            '"title": "BCC",'\
-            '"description": "lorem ipsum... .",'\
-            '"enabled": true'\
-          '}'
-        )
+        '{'\
+          '"name": "bcc",'\
+          '"title": "BCC",'\
+          '"description": "lorem ipsum... .",'\
+          '"enabled": true'\
+        '}'
       end
 
       it 'creates results instance' do
-        actual = SendGrid4r::REST::Settings.create_results(results)
+        actual = SendGrid4r::REST::Settings.create_results(JSON.parse(results))
         expect(actual.result).to be_a(Array)
         actual.result.each do |result|
           expect(result).to be_a(Result)
@@ -43,7 +39,7 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates result instance' do
-        actual = SendGrid4r::REST::Settings.create_result(result)
+        actual = SendGrid4r::REST::Settings.create_result(JSON.parse(result))
         expect(actual).to be_a(Result)
         expect(actual.name).to eq('bcc')
         expect(actual.title).to eq('BCC')

data/spec/rest/settings/tracking_spec.rb

@@ -91,11 +91,9 @@ module SendGrid4r::REST::Settings
       end
 
       let(:click) do
-        JSON.parse(
-          '{'\
-            '"enabled": true'\
-          '}'
-        )
+        '{'\
+          '"enabled": true'\
+        '}'
       end
 
       it '#get_settings_click' do
@@ -111,21 +109,19 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates click instance' do
-        actual = Tracking.create_click(click)
+        actual = Tracking.create_click(JSON.parse(click))
         expect(actual.enabled).to eq(true)
       end
 
       let(:google_analytics) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"utm_source": "sendgrid.com",'\
-            '"utm_medium": "email",'\
-            '"utm_term": "",'\
-            '"utm_content": "",'\
-            '"utm_campaign": "website"'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"utm_source": "sendgrid.com",'\
+          '"utm_medium": "email",'\
+          '"utm_term": "",'\
+          '"utm_content": "",'\
+          '"utm_campaign": "website"'\
+        '}'
       end
 
       it '#get_settings_google_analytics' do
@@ -141,7 +137,7 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates google_analytics instance' do
-        actual = Tracking.create_google_analytics(google_analytics)
+        actual = Tracking.create_google_analytics(JSON.parse(google_analytics))
         expect(actual.enabled).to eq(true)
         expect(actual.utm_source).to eq('sendgrid.com')
         expect(actual.utm_medium).to eq('email')
@@ -151,11 +147,9 @@ module SendGrid4r::REST::Settings
       end
 
       let(:open) do
-        JSON.parse(
-          '{'\
-            '"enabled": true'\
-          '}'
-        )
+        '{'\
+          '"enabled": true'\
+        '}'
       end
 
       it '#get_settings_open' do
@@ -171,21 +165,19 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates open instance' do
-        actual = Tracking.create_open(open)
+        actual = Tracking.create_open(JSON.parse(open))
         expect(actual.enabled).to eq(true)
       end
 
       let(:subscription) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"landing": "landing page html",'\
-            '"url": "url",'\
-            '"replace": "replacement tag",'\
-            '"html_content": "html content",'\
-            '"plain_content": "text content"'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"landing": "landing page html",'\
+          '"url": "url",'\
+          '"replace": "replacement tag",'\
+          '"html_content": "html content",'\
+          '"plain_content": "text content"'\
+        '}'
       end
 
       it '#get_settings_subscription' do
@@ -201,7 +193,7 @@ module SendGrid4r::REST::Settings
       end
 
       it 'creates subscription instance' do
-        actual = Tracking.create_subscription(subscription)
+        actual = Tracking.create_subscription(JSON.parse(subscription))
         expect(actual.enabled).to eq(true)
         expect(actual.landing).to eq('landing page html')
         expect(actual.url).to eq('url')