Fixed nodemailer#70

andris9 · Feb 20, 2012 · 14579d7 · 14579d7
1 parent cc9fb6f
commit 14579d7
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 1 deletion.
diff --git a/lib/transport.js b/lib/transport.js
@@ -68,6 +68,8 @@ Transport.prototype.close = function(callback){
     if(typeof this.transport.close == "function"){
         this.transport.close(callback);
     }else{
-        callback(null);
+        if(typeof callback == "function"){
+            callback(null);
+        }
     }
 };
diff --git a/test/nodemailer.js b/test/nodemailer.js
@@ -8,4 +8,55 @@ exports["General tests"] = {
         var mail = new nodemailer.Nodemailer();
         test.done();
     }
+}
+
+exports["Transport close"] = {
+    "SMTP - Callback in transport.close": function(test){
+        var transport = nodemailer.createTransport("SMTP", {});
+        transport.close(function(){
+            test.ok(true);
+            test.done();
+        });
+    },
+
+    "SMTP - No callback in transport.close": function(test){
+        var transport = nodemailer.createTransport("SMTP", {});
+        transport.close();
+        process.nextTick(function(){
+            test.ok(true);
+            test.done();
+        });
+    },
+    "Sendmail - Callback in transport.close": function(test){
+        var transport = nodemailer.createTransport("Sendmail", {});
+        transport.close(function(){
+            test.ok(true);
+            test.done();
+        });
+    },
+
+    "Sendmail - No callback in transport.close": function(test){
+        var transport = nodemailer.createTransport("Sendmail", {});
+        transport.close();
+        process.nextTick(function(){
+            test.ok(true);
+            test.done();
+        });
+    },
+    "SES - Callback in transport.close": function(test){
+        var transport = nodemailer.createTransport("SES", {});
+        transport.close(function(){
+            test.ok(true);
+            test.done();
+        });
+    },
+
+    "SES - No callback in transport.close": function(test){
+        var transport = nodemailer.createTransport("SES", {});
+        transport.close();
+        process.nextTick(function(){
+            test.ok(true);
+            test.done();
+        });
+    }
 }