spec/unit/mailgun_spec.rb in mailgun-ruby-1.0.3 vs spec/unit/mailgun_spec.rb in mailgun-ruby-1.1.0

@@ -16,35 +16,37 @@
 
   it 'accepts only specific data types' do
     @mb_obj = Mailgun::MessageBuilder.new()
     @mh_obj = {}
 
-    expect {@mg_obj.send_message("test.com", "incorrect data")}.to raise_error
+    expect {@mg_obj.send_message("test.com", "incorrect data")}.to raise_error Mailgun::ParameterError
     expect {@mg_obj.send_message("test.com", @mb_obj)}.not_to raise_error
     expect {@mg_obj.send_message("test.com", @mh_obj)}.not_to raise_error
   end
 
   it 'sends a message' do
-    data = {'from' => '[e-mail]',
+    data = { 'from' => '[e-mail]',
                     'to' => '[e-mail]',
                     'subject' => 'Test',
                     'text' => 'Test Data'}
     result = @mg_obj.send_message("testdomain.com", data)
 
     result.to_h!
-    result.body.should include("message")
-    result.body.should include("id")
+
+    expect(result.body).to include("message")
+    expect(result.body).to include("id")
   end
 
   it 'opens the message MIME and sends the MIME message.' do
     data = {'to' => '[e-mail]',
                     'message' => 'Sample Data/mime.txt'}
     result = @mg_obj.send_message("testdomain.com", data)
 
     result.to_h!
-    result.body.should include("message")
-    result.body.should include("id")
+    
+    expect(result.body).to include("message")
+    expect(result.body).to include("id")
   end
 end
 
 describe 'The method post()' do
   before(:each) do
@@ -57,12 +59,13 @@
                     'subject' => 'Test',
                     'text' => 'Test Data'}
     result = @mg_obj.post("#{@domain}/messages", data)
 
     result.to_h!
-    result.body.should include("message")
-    result.body.should include("id")
+    
+    expect(result.body).to include("message")
+    expect(result.body).to include("id")
   end
 end
 
 describe 'The method put()' do
   before(:each) do
@@ -76,17 +79,18 @@
     data = {'subscribed' => false,
                     'name' => 'Foo Bar'}
     result = @mg_obj.put("lists/#{@list_address}/members#{@member_address}", data)
 
     result.to_h!
-    result.body.should include("member")
-    result.body["member"].should include("vars")
-    result.body["member"]["vars"].should include("age")
-    result.body["member"].should include("name")
-    result.body["member"].should include("subscribed")
-    result.body["member"].should include("address")
-    result.body.should include("message")
+    
+    expect(result.body).to include("member")
+    expect(result.body["member"]).to include("vars")
+    expect(result.body["member"]["vars"]).to include("age")
+    expect(result.body["member"]).to include("name")
+    expect(result.body["member"]).to include("subscribed")
+    expect(result.body["member"]).to include("address")
+    expect(result.body).to include("message")
   end
 
 end
 
 describe 'The method get()' do
@@ -98,12 +102,13 @@
     query_string = {'skip' => '10',
                     'limit' => '5'}
     result = @mg_obj.get("#{@domain}/bounces", query_string)
 
     result.to_h!
-    result.body.should include("total_count")
-    result.body.should include("items")
+    
+    expect(result.body).to include("total_count")
+    expect(result.body).to include("items")
   end
 end
 
 describe 'The method delete()' do
   before(:each) do
@@ -113,9 +118,10 @@
 
   it 'issues a generic delete request.' do
     result = @mg_obj.delete("#{@domain}/campaigns/ABC123")
 
     result.to_h!
-    result.body.should include("message")
-    result.body.should include("id")
+    
+    expect(result.body).to include("message")
+    expect(result.body).to include("id")
   end
 end