sendgrid4r 0.5.0 → 1.0.0

data/spec/rest/contacts/lists_spec.rb

@@ -7,9 +7,7 @@ describe SendGrid4r::REST::Contacts::Lists do
       begin
         pending 'waiting sendgrid documentation update'
         Dotenv.load
-        @client = SendGrid4r::Client.new(
-          username: ENV['SENDGRID_USERNAME'],
-          password: ENV['SENDGRID_PASSWORD'])
+        @client = SendGrid4r::Client.new(api_key: ENV['API_KEY'])
         @list_name1 = 'test_list1'
         @edit_name1 = 'test_list1_edit'
         @list_name2 = 'test_list2'
@@ -25,34 +23,42 @@ describe SendGrid4r::REST::Contacts::Lists do
         # celan up test env(lists)
         lists = @client.get_lists
         lists.lists.each do |list|
-          @client.delete_list(list.id) if list.name == @list_name1
-          @client.delete_list(list.id) if list.name == @edit_name1
-          @client.delete_list(list.id) if list.name == @list_name2
+          @client.delete_list(list_id: list.id) if list.name == @list_name1
+          @client.delete_list(list_id: list.id) if list.name == @edit_name1
+          @client.delete_list(list_id: list.id) if list.name == @list_name2
         end
         # celan up test env(recipients)
         recipients = @client.get_recipients
         recipients.recipients.each do |recipient|
-          @client.delete_recipient(recipient.id) if recipient.email == @email1
-          @client.delete_recipient(recipient.id) if recipient.email == @email2
+          @client.delete_recipient(
+            recipient_id: recipient.id
+          ) if recipient.email == @email1
+          @client.delete_recipient(
+            recipient_id: recipient.id
+          ) if recipient.email == @email2
         end
         # post a first list
-        @list1 = @client.post_list(@list_name1)
+        @list1 = @client.post_list(name: @list_name1)
         # add multiple recipients
         recipient1 = {}
         recipient1['email'] = @email1
         recipient1['last_name'] = @last_name1
         recipient1[@custom_field_name] = @pet1
-        recipient1 = @client.post_recipient(recipient1)
-        @client.post_recipient_to_list(@list1.id, recipient1.id)
+        recipient1 = @client.post_recipient(params: recipient1)
+        @client.post_recipient_to_list(
+          list_id: @list1.id, recipient_id: recipient1.id
+        )
         recipient2 = {}
         recipient2['email'] = @email2
         recipient2['last_name'] = @last_name2
         recipient2[@custom_field_name] = @pet2
-        recipient2 = @client.post_recipient(recipient2)
-        @client.post_recipient_to_list(@list1.id, recipient2.id)
+        recipient2 = @client.post_recipient(params: recipient2)
+        @client.post_recipient_to_list(
+          list_id: @list1.id, recipient_id: recipient2.id
+        )
         # # Add multiple recipients to a single list
         # @client.post_recipients_to_list(@list1.id, @recipients)
-      rescue => e
+      rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
         raise e
       end
@@ -61,12 +67,12 @@ describe SendGrid4r::REST::Contacts::Lists do
     context 'without block call' do
       it '#post_list' do
         begin
-          list2 = @client.post_list(@list_name2)
+          list2 = @client.post_list(name: @list_name2)
           expect(list2.id).to be_a(Fixnum)
           expect(list2.name).to eq(@list_name2)
           expect(list2.recipient_count).to eq(0)
-          @client.delete_list(list2.id)
-        rescue => e
+          @client.delete_list(list_id: list2.id)
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -75,9 +81,9 @@ describe SendGrid4r::REST::Contacts::Lists do
       it '#post_list for same key' do
         begin
           expect do
-            @client.post_list(@list_name1)
+            @client.post_list(name: @list_name1)
           end.to raise_error(RestClient::BadRequest)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -93,7 +99,7 @@ describe SendGrid4r::REST::Contacts::Lists do
             expect(list.name).to eq(@list1.name)
             expect(list.recipient_count).to be_a(Fixnum)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -101,11 +107,11 @@ describe SendGrid4r::REST::Contacts::Lists do
 
       it '#get_list' do
         begin
-          actual_list = @client.get_list(@list1.id)
+          actual_list = @client.get_list(list_id: @list1.id)
           expect(actual_list.id).to eq(@list1.id)
           expect(actual_list.name).to eq(@list1.name)
           expect(actual_list.recipient_count).to be_a(Fixnum)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -113,10 +119,10 @@ describe SendGrid4r::REST::Contacts::Lists do
 
       it '#patch_list' do
         begin
-          edit_list = @client.patch_list(@list1.id, @edit_name1)
+          edit_list = @client.patch_list(list_id: @list1.id, name: @edit_name1)
           expect(edit_list.id).to eq(@list1.id)
           expect(edit_list.name).to eq(@edit_name1)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -124,13 +130,13 @@ describe SendGrid4r::REST::Contacts::Lists do
 
       it '#get_recipients_from_list' do
         begin
-          recipients = @client.get_recipients_from_list(@list1.id)
+          recipients = @client.get_recipients_from_list(list_id: @list1.id)
           recipients.recipients.each do |recipient|
             expect(
               recipient
             ).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipient)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -138,13 +144,15 @@ describe SendGrid4r::REST::Contacts::Lists do
 
       it '#get_recipients_from_list with offset & limit' do
         begin
-          recipients = @client.get_recipients_from_list(@list1.id, 10, 0)
+          recipients = @client.get_recipients_from_list(
+            list_id: @list1.id, limit: 10, offset: 0
+          )
           recipients.recipients.each do |recipient|
             expect(
               recipient
             ).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipient)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -152,8 +160,10 @@ describe SendGrid4r::REST::Contacts::Lists do
 
       it '#delete_recipient_from_list' do
         begin
-          @client.delete_recipient_from_list(@list1.id, @email1)
-        rescue => e
+          @client.delete_recipient_from_list(
+            list_id: @list1.id, recipient_id: @email1
+          )
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -161,11 +171,11 @@ describe SendGrid4r::REST::Contacts::Lists do
 
       it '#delete_list' do
         begin
-          @client.delete_list(@list1.id)
+          @client.delete_list(list_id: @list1.id)
           expect do
-            @client.get_list(@list1.id)
+            @client.get_list(list_id: @list1.id)
           end.to raise_error(RestClient::ResourceNotFound)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -173,9 +183,9 @@ describe SendGrid4r::REST::Contacts::Lists do
 
       it '#delete_lists' do
         begin
-          list2 = @client.post_list(@list_name2)
-          @client.delete_lists([@list1.id, list2.id])
-        rescue => e
+          list2 = @client.post_list(name: @list_name2)
+          @client.delete_lists(list_ids: [@list1.id, list2.id])
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -183,8 +193,10 @@ describe SendGrid4r::REST::Contacts::Lists do
 
       it '#post_recipients_to_list' do
         begin
-          @client.post_recipients_to_list(@list1.id, @recipients)
-        rescue => e
+          @client.post_recipients_to_list(
+            list_id: @list1.id, recipients: @recipients
+          )
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -196,151 +208,16 @@ describe SendGrid4r::REST::Contacts::Lists do
           recipient1['email'] = @email1
           recipient1['last_name'] = @last_name1
           recipient1[@custom_field_name] = @pet1
-          recipient1 = @client.post_recipient(recipient1)
-          @client.post_recipient_to_list(@list1.id, recipient1.id)
-        rescue => e
+          recipient1 = @client.post_recipient(params: recipient1)
+          @client.post_recipient_to_list(
+            list_id: @list1.id, recipient_id: recipient1.id
+          )
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
     end
-
-    context 'with block call' do
-      it '#post_list' do
-        @client.post_list(@list_name2) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Lists.create_list(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Contacts::Lists::List)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPCreated)
-        end
-      end
-
-      it '#post_list for same key' do
-        @client.post_list(@list_name1) do |_resp, req, res|
-          # TODO: _resp
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPBadRequest)
-        end
-      end
-
-      it '#get_lists' do
-        @client.get_lists do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Lists.create_lists(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Contacts::Lists::Lists)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_list' do
-        @client.get_list(@list1.id) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Lists.create_list(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Contacts::Lists::List)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#patch_list' do
-        @client.patch_list(@list1.id, @edit_name1) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Lists.create_list(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Contacts::Lists::List)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_recipients_from_list' do
-        @client.get_recipients_from_list(@list1.id) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Recipients.create_recipients(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Contacts::Recipients::Recipients
-          )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_recipients_from_list with offset & limit' do
-        @client.get_recipients_from_list(@list1.id, 10, 0) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Recipients.create_recipients(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Contacts::Recipients::Recipients
-          )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#delete_recipient_from_list' do
-        @client.delete_recipient_from_list(
-          @list1.id, @email1
-        ) do |resp, req, res|
-          expect(resp).to eq('')
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPNoContent)
-        end
-      end
-
-      it '#delete_list' do
-        @client.delete_list(@list1.id) do |resp, req, res|
-          expect(resp).to eq('')
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPNoContent)
-        end
-      end
-
-      it '#delete_lists' do
-        @client.delete_lists([@list1.id]) do |resp, req, res|
-          expect(resp).to eq('')
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPNoContent)
-        end
-      end
-
-      it '#post_recipients_to_list' do
-        @client.post_recipients_to_list(
-          @list1.id, @recipients
-        ) do |resp, req, res|
-          expect(resp).to eq('')
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPCreated)
-        end
-      end
-
-      it '#post_recipient_to_list' do
-        recipient1 = {}
-        recipient1['email'] = @email1
-        recipient1['last_name'] = @last_name1
-        recipient1[@custom_field_name] = @pet1
-        recipient1 = @client.post_recipient(recipient1)
-        @client.post_recipient_to_list(
-          @list1.id, recipient1.id
-        ) do |resp, req, res|
-          expect(resp).to eq('')
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPCreated)
-        end
-      end
-    end
   end
 
   describe 'unit test', :ut do
@@ -426,7 +303,7 @@ describe SendGrid4r::REST::Contacts::Lists do
 
     it '#post_list' do
       allow(client).to receive(:execute).and_return(list)
-      actual = client.post_list('')
+      actual = client.post_list(name: '')
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Lists::List)
     end
 
@@ -438,49 +315,49 @@ describe SendGrid4r::REST::Contacts::Lists do
 
     it '#get_list' do
       allow(client).to receive(:execute).and_return(list)
-      actual = client.get_list(0)
+      actual = client.get_list(list_id: 0)
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Lists::List)
     end
 
     it '#patch_list' do
       allow(client).to receive(:execute).and_return(list)
-      actual = client.patch_list(0, '')
+      actual = client.patch_list(list_id: 0, name: '')
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Lists::List)
     end
 
     it '#get_recipients_from_list' do
       allow(client).to receive(:execute).and_return(recipients)
-      actual = client.get_recipients_from_list(0)
+      actual = client.get_recipients_from_list(list_id: 0)
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipients)
     end
 
     it '#delete_recipient_from_list' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.delete_recipient_from_list(0, '')
+      actual = client.delete_recipient_from_list(list_id: 0, recipient_id: '')
       expect(actual).to eq('')
     end
 
     it '#delete_list' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.delete_list(0)
+      actual = client.delete_list(list_id: 0)
       expect(actual).to eq('')
     end
 
     it '#delete_lists' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.delete_lists([0, 1])
+      actual = client.delete_lists(list_ids: [0, 1])
       expect(actual).to eq('')
     end
 
     it '#post_recipients_to_list' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.post_recipients_to_list(0, ['', ''])
+      actual = client.post_recipients_to_list(list_id: 0, recipients: ['', ''])
       expect(actual).to eq('')
     end
 
     it '#post_recipient_to_list' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.post_recipient_to_list(0, 0)
+      actual = client.post_recipient_to_list(list_id: 0, recipient_id: 0)
       expect(actual).to eq('')
     end