Merge pull request #3160 from Budibase/smtp-timeout

Add timeout to node mailer, lower than jest default
This commit is contained in:
Rory Powell 2021-10-26 14:52:48 +01:00 committed by GitHub
commit 7c4e675292
3 changed files with 4 additions and 3 deletions

View File

@ -3,9 +3,6 @@ const { EmailTemplatePurpose } = require("../../../constants")
const nodemailer = require("nodemailer") const nodemailer = require("nodemailer")
const fetch = require("node-fetch") const fetch = require("node-fetch")
// need a longer timeout for getting these
jest.setTimeout(30000)
describe("/api/global/email", () => { describe("/api/global/email", () => {
let request = setup.getRequest() let request = setup.getRequest()
let config = setup.getConfig() let config = setup.getConfig()

View File

@ -234,6 +234,7 @@ class TestConfiguration {
user: "don.bahringer@ethereal.email", user: "don.bahringer@ethereal.email",
pass: "yCKSH8rWyUPbnhGYk9", pass: "yCKSH8rWyUPbnhGYk9",
}, },
connectionTimeout: 1000, // must be less than the jest default of 5000
}, },
}, },
null, null,

View File

@ -35,6 +35,9 @@ function createSMTPTransport(config) {
options.tls = { options.tls = {
rejectUnauthorized: false, rejectUnauthorized: false,
} }
if (config.connectionTimeout) {
options.connectionTimeout = config.connectionTimeout
}
} else { } else {
options = { options = {
port: 587, port: 587,