Merge pull request #90 from sendgrid/pr/89

From pr/89. Fixes error.data to error.message thanks to @timhaines
sendgrid · Sep 18, 2013 · 9f8fe87 · 9f8fe87
2 parents 77c5637 + 0ffc6ad
commit 9f8fe87
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/sendgrid.js b/lib/sendgrid.js
@@ -142,7 +142,7 @@ var Sendgrid = function(api_user, api_key, options) {
 
     smtpTransport.sendMail(smtpParams, function(error, response) {
       smtpTransport.close();
-      if(error) { return callback(new Error(error.data), null);}
+      if(error) { return callback(new Error(error.message), null);}
 
       return callback(null, {'message': 'success'});
     });

diff --git a/test/integration/sendgrid.test.js b/test/integration/sendgrid.test.js
@@ -390,7 +390,18 @@ describe('SendGrid #skip', function () {
 
     it('has a blank send payload', function(done) {
       sendgrid.send({}, function(err, json) {
-        expect(err.message).to.equal("501 Syntax error");
+        expect(err.message).to.equal("Mail from command failed - 501 Syntax error");
+
+        done();
+      });
+    });
+
+    it('has a blank TO', function(done) {
+      payload.subject += "has a blank TO";
+      payload.to = "";
+
+      sendgrid.send(payload, function(err, json) {
+        expect(err.message).to.equal("Can't send mail - no recipients defined");
 
         done();
       });