diff --git a/test/authplain.ts b/test/authplain.ts index 425089d..b66c52f 100644 --- a/test/authplain.ts +++ b/test/authplain.ts @@ -1,6 +1,6 @@ import test from 'ava'; -import { simpleParser } from 'mailparser'; -import { SMTPServer } from 'smtp-server'; +import mailparser from 'mailparser'; +import smtp from 'smtp-server'; import { client as c, message as m } from '../email'; @@ -13,20 +13,22 @@ const client = new c.Client({ password: 'honey', ssl: true, }); -const smtp = new SMTPServer({ secure: true, authMethods: ['LOGIN'] }); +const server = new smtp.SMTPServer({ secure: true, authMethods: ['LOGIN'] }); const send = ( message: m.Message, - verify: (mail: UnPromisify>) => void + verify: ( + mail: UnPromisify> + ) => void ) => { process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // prevent CERT_HAS_EXPIRED errors - smtp.onData = ( + server.onData = ( stream: import('stream').Readable, _session, callback: () => void ) => { - simpleParser(stream).then(verify); + mailparser.simpleParser(stream).then(verify); stream.on('end', callback); }; client.send(message, (err) => { @@ -37,8 +39,8 @@ const send = ( }; test.before(() => { - smtp.listen(port, function () { - smtp.onAuth = function (auth, _session, callback) { + server.listen(port, function () { + server.onAuth = function (auth, _session, callback) { if (auth.username == 'pooh' && auth.password == 'honey') { callback(null, { user: 'pooh' }); } else { @@ -48,7 +50,7 @@ test.before(() => { }); }); -test.after(() => smtp.close()); +test.after(() => server.close()); test.cb('authorize plain', (t) => { const msg = { diff --git a/test/authssl.ts b/test/authssl.ts index 4b8ba64..cd5ae9c 100644 --- a/test/authssl.ts +++ b/test/authssl.ts @@ -1,6 +1,6 @@ import test from 'ava'; -import { simpleParser } from 'mailparser'; -import { SMTPServer } from 'smtp-server'; +import mailparser from 'mailparser'; +import smtp from 'smtp-server'; import { client as c, message as m } from '../email'; @@ -12,19 +12,21 @@ const client = new c.Client({ password: 'honey', ssl: true, }); -const smtp = new SMTPServer({ secure: true, authMethods: ['LOGIN'] }); +const server = new smtp.SMTPServer({ secure: true, authMethods: ['LOGIN'] }); type UnPromisify = T extends Promise ? U : T; const send = ( message: m.Message, - verify: (mail: UnPromisify>) => void + verify: ( + mail: UnPromisify> + ) => void ) => { - smtp.onData = ( + server.onData = ( stream: import('stream').Readable, _session, callback: () => void ) => { - simpleParser(stream).then(verify); + mailparser.simpleParser(stream).then(verify); stream.on('end', callback); }; client.send(message, (err) => { @@ -37,8 +39,8 @@ const send = ( test.before(() => { process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // prevent CERT_HAS_EXPIRED errors - smtp.listen(port, function () { - smtp.onAuth = function (auth, _session, callback) { + server.listen(port, function () { + server.onAuth = function (auth, _session, callback) { if (auth.username == 'pooh' && auth.password == 'honey') { callback(null, { user: 'pooh' }); } else { @@ -48,7 +50,7 @@ test.before(() => { }); }); -test.after(() => smtp.close()); +test.after(() => server.close()); test.cb('authorize ssl', (t) => { const msg = { diff --git a/test/message.ts b/test/message.ts index 4673364..0afb695 100644 --- a/test/message.ts +++ b/test/message.ts @@ -2,8 +2,8 @@ import { readFileSync, createReadStream } from 'fs'; import { join } from 'path'; import test from 'ava'; -import { simpleParser } from 'mailparser'; -import { SMTPServer } from 'smtp-server'; +import mailparser from 'mailparser'; +import smtp from 'smtp-server'; import { client as c, message as m } from '../email'; @@ -14,21 +14,23 @@ const client = new c.Client({ password: 'honey', ssl: true, }); -const smtp = new SMTPServer({ secure: true, authMethods: ['LOGIN'] }); +const server = new smtp.SMTPServer({ secure: true, authMethods: ['LOGIN'] }); type UnPromisify = T extends Promise ? U : T; const send = ( message: m.Message, - verify: (mail: UnPromisify>) => void + verify: ( + mail: UnPromisify> + ) => void ) => { process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // prevent CERT_HAS_EXPIRED errors - smtp.onData = ( + server.onData = ( stream: import('stream').Readable, _session, callback: () => void ) => { - simpleParser(stream).then(verify); + mailparser.simpleParser(stream).then(verify); stream.on('end', callback); }; client.send(message, (err) => { @@ -40,8 +42,8 @@ const send = ( test.before(() => { process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // prevent CERT_HAS_EXPIRED errors - smtp.listen(port, function () { - smtp.onAuth = function (auth, _session, callback) { + server.listen(port, function () { + server.onAuth = function (auth, _session, callback) { if (auth.username == 'pooh' && auth.password == 'honey') { callback(null, { user: 'pooh' }); } else { @@ -51,7 +53,7 @@ test.before(() => { }); }); -test.after(() => smtp.close()); +test.after(() => server.close()); test.cb('simple text message', (t) => { const msg = {