Swaps out the bits of code to be more node like and sends errors first, then response if success

1 files changed, 138 insertions, 85 deletions

diff --git a/test/integration/sendgrid.test.js b/test/integration/sendgrid.test.js
index 4432288..5bb8734 100644
--- a/test/integration/sendgrid.test.js
+++ b/test/integration/sendgrid.test.js
@@ -29,8 +29,8 @@ describe('SendGrid #skip', function () {
     });
 
     it('has a blank send payload', function(done) {
-      sendgrid.send({}, function(success, message) {
-        expect(success).to.be.false;
+      sendgrid.send({}, function(err, json) {
+        expect(err).to.equal("Missing destination email");
         
         done();
       });
@@ -49,8 +49,9 @@ describe('SendGrid #skip', function () {
     it('encodes unicode like ✔', function(done) {
       payload.subject += "encodes unicode like ✔";
 
-      sendgrid.send(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -61,8 +62,9 @@ describe('SendGrid #skip', function () {
       payload.toname    = "to name";
       payload.fromname  = "from name";
 
-      sendgrid.send(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -74,8 +76,9 @@ describe('SendGrid #skip', function () {
         {filename: 'secret.txt', content: new Buffer("File Content")}
       ];
 
-      sendgrid.send(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -86,8 +89,9 @@ describe('SendGrid #skip', function () {
       var email         = new Email(payload);
       email.addFile({filename: 'secret.txt', content: new Buffer("File Content")});
 
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -99,8 +103,9 @@ describe('SendGrid #skip', function () {
         {filename: 'icon.jpg', url: "http://i.imgur.com/2fDh8.jpg"}
       ];
 
-      sendgrid.send(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -111,8 +116,9 @@ describe('SendGrid #skip', function () {
       var email         = new Email(payload);
       email.addFile({filename: 'icon.jpg', url: "http://i.imgur.com/2fDh8.jpg"});
 
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -124,8 +130,9 @@ describe('SendGrid #skip', function () {
         {path: __dirname + '/../assets/logo.png'}
       ];
 
-      sendgrid.send(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -136,8 +143,9 @@ describe('SendGrid #skip', function () {
       var email         = new Email(payload);
       email.addFile({path: __dirname + '/../assets/logo.png'});
 
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -149,9 +157,9 @@ describe('SendGrid #skip', function () {
         {filename: 'empty-test'}
       ]
 
-      sendgrid.send(payload, function(success, message) {
-        console.log(message);
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -162,8 +170,9 @@ describe('SendGrid #skip', function () {
       var email         = new Email(payload);
       email.addFile({filename: 'empty-test'});
 
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -180,8 +189,9 @@ describe('SendGrid #skip', function () {
       ]
       payload.html      = "<img src='cid:photo1'/>";
 
-      sendgrid.send(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -197,8 +207,9 @@ describe('SendGrid #skip', function () {
       }); 
       email.html      = "<img src='cid:photo1'/>";
 
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -214,8 +225,9 @@ describe('SendGrid #skip', function () {
         }
       ]
  
-      sendgrid.send(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -230,35 +242,42 @@ describe('SendGrid #skip', function () {
         contentType:  ''
       });      
  
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
     });
 
     it('handles large files', function(done) {
+      this.timeout(30000);
+
       payload.subject   += "handles large files";
       payload.files     = [
         {filename: 'rails.zip', url: "https://github.com/rails/rails/archive/master.zip"}
       ];
 
-      sendgrid.send(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
     });
 
     it('handles multiple files', function(done) {
+      this.timeout(30000);
+
       payload.subject   += "handles multiple files";
       payload.files     = [
         {filename: 'rails.zip', url: "https://github.com/rails/rails/archive/master.zip"},
         {filename: 'icon.jpg', url: 'http://i.imgur.com/2fDh8.jpg'}
       ];
 
-      sendgrid.send(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -269,8 +288,9 @@ describe('SendGrid #skip', function () {
 
       var email         = new Email(payload);
       email.replyto     = 'noreply@sendgrid.com';
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         done();
       });
     });
@@ -281,8 +301,10 @@ describe('SendGrid #skip', function () {
       var email = new Email(payload);
       email.addFilterSetting('footer', 'enable', 1);
       email.addFilterSetting('footer', 'text/plain', 'This is mah footer!');
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
+
         done();
       });
     });
@@ -293,8 +315,10 @@ describe('SendGrid #skip', function () {
       var email = new Email(payload);
       email.addFilterSetting('footer', 'enable', 1);
       email.addFilterSetting('footer', 'text/plain', 'This is mah footer with a ✔ in it!');
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
+
         done();
       });
     });
@@ -305,8 +329,10 @@ describe('SendGrid #skip', function () {
       var email = new Email(payload);
       email.addSubVal('-name-',['Panda', 'Cow']);
       email.html = 'You are a <strong>-name-</strong>';
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
+
         done();
       });
     });
@@ -321,8 +347,10 @@ describe('SendGrid #skip', function () {
       email.addSection({'-kyleSection-': 'I heard you liked batman so I killed your parents'});
       email.addSection({'-davidSection-': 'Metal gear?!!?!!!!eleven'});
       email.html = "Yo -name-!<br /> Here's a meme for you:<br /> -meme-";
-      sendgrid.send(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.send(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
+
         done();
       });
     });
@@ -351,8 +379,9 @@ describe('SendGrid #skip', function () {
     it('sends successfully', function(done) {
       payload.subject += "sends successfully";
 
-      sendgrid.smtp(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -361,8 +390,9 @@ describe('SendGrid #skip', function () {
     it('encodes unicode like ✔', function(done) {
       payload.subject += "encodes unicode like ✔";
 
-      sendgrid.smtp(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -373,8 +403,9 @@ describe('SendGrid #skip', function () {
       payload.toname    = "to name";
       payload.fromname  = "from name";
 
-      sendgrid.smtp(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -386,8 +417,9 @@ describe('SendGrid #skip', function () {
         {filename: 'secret.txt', content: new Buffer("File Content")}
       ];
 
-      sendgrid.smtp(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -398,8 +430,9 @@ describe('SendGrid #skip', function () {
       var email         = new Email(payload);
       email.addFile({filename: 'secret.txt', content: new Buffer("File Content")});
 
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -411,8 +444,9 @@ describe('SendGrid #skip', function () {
         {filename: 'icon.jpg', url: "http://i.imgur.com/2fDh8.jpg"}
       ];
 
-      sendgrid.smtp(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -423,8 +457,9 @@ describe('SendGrid #skip', function () {
       var email         = new Email(payload);
       email.addFile({filename: 'icon.jpg', url: "http://i.imgur.com/2fDh8.jpg"});
 
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -436,8 +471,9 @@ describe('SendGrid #skip', function () {
         {path: __dirname + '/../assets/logo.png'}
       ];
 
-      sendgrid.smtp(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -448,8 +484,9 @@ describe('SendGrid #skip', function () {
       var email         = new Email(payload);
       email.addFile({path: __dirname + '/../assets/logo.png'});
 
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -461,8 +498,9 @@ describe('SendGrid #skip', function () {
         {filename: 'empty-test'}
       ]
 
-      sendgrid.smtp(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -473,8 +511,9 @@ describe('SendGrid #skip', function () {
       var email         = new Email(payload);
       email.addFile({filename: 'empty-test'});
 
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
         
         done();
       });
@@ -491,8 +530,9 @@ describe('SendGrid #skip', function () {
       ]
       payload.html      = "<img src='cid:photo1'/>";
 
-      sendgrid.smtp(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -508,8 +548,9 @@ describe('SendGrid #skip', function () {
       }); 
       email.html      = "<img src='cid:photo1'/>";
 
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -525,8 +566,9 @@ describe('SendGrid #skip', function () {
         }
       ]
  
-      sendgrid.smtp(payload, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(payload, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -541,8 +583,9 @@ describe('SendGrid #skip', function () {
         contentType:  ''
       });      
  
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
 
         done();
       });
@@ -553,8 +596,10 @@ describe('SendGrid #skip', function () {
 
       var email         = new Email(payload);
       email.replyto     = 'noreply@sendgrid.com';
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
+
         done();
       });
     });
@@ -565,8 +610,10 @@ describe('SendGrid #skip', function () {
       var email = new Email(payload);
       email.addFilterSetting('footer', 'enable', 1);
       email.addFilterSetting('footer', 'text/plain', 'This is mah footer!');
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
+
         done();
       });
     });
@@ -577,8 +624,10 @@ describe('SendGrid #skip', function () {
       var email = new Email(payload);
       email.addFilterSetting('footer', 'enable', 1);
       email.addFilterSetting('footer', 'text/plain', 'This is mah footer with a ✔ in it!');
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
+
         done();
       });
     });
@@ -589,8 +638,10 @@ describe('SendGrid #skip', function () {
       var email = new Email(payload);
       email.addSubVal('-name-',['Panda', 'Cow']);
       email.html = 'You are a <strong>-name-</strong>';
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
+
         done();
       });
     });
@@ -605,8 +656,10 @@ describe('SendGrid #skip', function () {
       email.addSection({'-kyleSection-': 'I heard you liked batman so I killed your parents'});
       email.addSection({'-davidSection-': 'Metal gear?!!?!!!!eleven'});
       email.html = "Yo -name-!<br /> Here's a meme for you:<br /> -meme-";
-      sendgrid.smtp(email, function(success, message) {
-        expect(success).to.be.true;
+      sendgrid.smtp(email, function(err, json) {
+        expect(err).to.be.null;
+        expect(json.message).to.equal('success');
+
         done();
       });
     });