Fixing worker test cases.
This commit is contained in:
parent
7d3169e5e1
commit
12bbe19ed0
|
@ -30,7 +30,7 @@ describe("/api/admin/auth", () => {
|
|||
expect(sendMailMock).toHaveBeenCalled()
|
||||
const emailCall = sendMailMock.mock.calls[0][0]
|
||||
// after this URL there should be a code
|
||||
const parts = emailCall.html.split("http://localhost:10000/reset?code=")
|
||||
const parts = emailCall.html.split("http://localhost:10000/builder/auth/reset?code=")
|
||||
code = parts[1].split("\"")[0]
|
||||
expect(code).toBeDefined()
|
||||
})
|
||||
|
|
|
@ -13,7 +13,7 @@ describe("/api/admin/configs/checklist", () => {
|
|||
let config = setup.getConfig()
|
||||
|
||||
beforeAll(async () => {
|
||||
await config.init()
|
||||
await config.init(false)
|
||||
})
|
||||
|
||||
afterAll(setup.afterAll)
|
||||
|
|
|
@ -30,7 +30,7 @@ describe("/api/admin/users", () => {
|
|||
expect(sendMailMock).toHaveBeenCalled()
|
||||
const emailCall = sendMailMock.mock.calls[0][0]
|
||||
// after this URL there should be a code
|
||||
const parts = emailCall.html.split("http://localhost:10000/invite?code=")
|
||||
const parts = emailCall.html.split("http://localhost:10000/builder/invite?code=")
|
||||
code = parts[1].split("\"")[0]
|
||||
expect(code).toBeDefined()
|
||||
})
|
||||
|
|
|
@ -38,7 +38,8 @@ class TestConfiguration {
|
|||
return request.body
|
||||
}
|
||||
|
||||
async init() {
|
||||
async init(createUser = true) {
|
||||
if (createUser) {
|
||||
// create a test user
|
||||
await this._req(
|
||||
{
|
||||
|
@ -48,11 +49,15 @@ class TestConfiguration {
|
|||
builder: {
|
||||
global: true,
|
||||
},
|
||||
admin: {
|
||||
global: true,
|
||||
},
|
||||
},
|
||||
null,
|
||||
controllers.users.save
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
async end() {
|
||||
if (this.server) {
|
||||
|
|
|
@ -155,10 +155,12 @@ exports.sendEmail = async (
|
|||
const context = await getSettingsTemplateContext(purpose, code)
|
||||
const message = {
|
||||
from: from || config.from,
|
||||
subject: await processString(subject || config.subject, context),
|
||||
to: email,
|
||||
html: await buildEmail(purpose, email, context, { user, contents }),
|
||||
}
|
||||
if (subject || config.subject) {
|
||||
message.subject = await processString(subject || config.subject, context)
|
||||
}
|
||||
const response = await transport.sendMail(message)
|
||||
if (TEST_MODE) {
|
||||
console.log("Test email URL: " + nodemailer.getTestMessageUrl(response))
|
||||
|
|
Loading…
Reference in New Issue