Browse Source

Merge pull request #3160 from Budibase/smtp-timeout

Add timeout to node mailer, lower than jest default
pull/3156/head
Rory Powell 5 years ago
committed by GitHub
parent
commit
62b7787097
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      packages/worker/src/api/routes/tests/realEmail.spec.js
  2. 1
      packages/worker/src/api/routes/tests/utilities/TestConfiguration.js
  3. 3
      packages/worker/src/utilities/email.js

3
packages/worker/src/api/routes/tests/realEmail.spec.js

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

1
packages/worker/src/api/routes/tests/utilities/TestConfiguration.js

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

3
packages/worker/src/utilities/email.js

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

Loading…
Cancel
Save