eleith/emailjs
1
0
Fork 0
mirror of https://github.com/eleith/emailjs.git synced 2024-07-05 20:10:37 +00:00
Code Issues Projects Releases Wiki Activity

ensure timeout is set to default value (fixes #225)

Browse Source
This commit is contained in:
Zack Schuster 2018-07-02 15:32:20 -07:00
parent 59265f9d95
commit da4c83d090
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
smtp/smtp.js
View File

@ -51,6 +51,10 @@ class SMTP extends EventEmitter {
constructor(options = {}) {
super();
if (options.timeout == null) {
options.timeout = TIMEOUT;
}
const {
timeout,
user,
@ -63,7 +67,6 @@ class SMTP extends EventEmitter {
authentication,
} = Object.assign(
{
timeout: TIMEOUT,
domain: os.hostname(),
host: 'localhost',
ssl: false,
@ -640,3 +643,4 @@ class SMTP extends EventEmitter {
exports.SMTP = SMTP;
exports.state = SMTPState;
exports.authentication = AUTH_METHODS;
exports.DEFAULT_TIMEOUT = TIMEOUT;

19
test/server.js
View File

@ -28,4 +28,23 @@ describe('Connect to wrong email server', function() {
}
);
});
it('should have a default timeout', function(done) {
const connectionOptions = {
user: "username",
password: "password",
host: "127.0.0.1",
port: 1234,
};
assert.strictEqual(email.server.connect(connectionOptions).smtp.timeout, email.SMTP.DEFAULT_TIMEOUT);
connectionOptions.timeout = null;
assert.strictEqual(email.server.connect(connectionOptions).smtp.timeout, email.SMTP.DEFAULT_TIMEOUT);
connectionOptions.timeout = undefined;
assert.strictEqual(email.server.connect(connectionOptions).smtp.timeout, email.SMTP.DEFAULT_TIMEOUT);
done();
});
});