MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing worker test cases.

This commit is contained in:
mike12345567 2021-05-19 16:39:17 +01:00
parent 7d3169e5e1
commit 12bbe19ed0
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/worker/src/api/routes/tests/auth.spec.js
View File

@ -30,7 +30,7 @@ describe("/api/admin/auth", () => {
expect(sendMailMock).toHaveBeenCalled() expect(sendMailMock).toHaveBeenCalled()
const emailCall = sendMailMock.mock.calls[0][0] const emailCall = sendMailMock.mock.calls[0][0]
// after this URL there should be a code // 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] code = parts[1].split("\"")[0]
expect(code).toBeDefined() expect(code).toBeDefined()
}) })

2
packages/worker/src/api/routes/tests/configs.spec.js
View File

@ -13,7 +13,7 @@ describe("/api/admin/configs/checklist", () => {
let config = setup.getConfig() let config = setup.getConfig()
beforeAll(async () => { beforeAll(async () => {
await config.init() await config.init(false)
}) })
afterAll(setup.afterAll) afterAll(setup.afterAll)

2
packages/worker/src/api/routes/tests/users.spec.js
View File

@ -30,7 +30,7 @@ describe("/api/admin/users", () => {
expect(sendMailMock).toHaveBeenCalled() expect(sendMailMock).toHaveBeenCalled()
const emailCall = sendMailMock.mock.calls[0][0] const emailCall = sendMailMock.mock.calls[0][0]
// after this URL there should be a code // 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] code = parts[1].split("\"")[0]
expect(code).toBeDefined() expect(code).toBeDefined()
}) })

31
packages/worker/src/api/routes/tests/utilities/TestConfiguration.js
View File

@ -38,20 +38,25 @@ class TestConfiguration {
return request.body return request.body
} }
async init() { async init(createUser = true) {
// create a test user if (createUser) {
await this._req( // create a test user
{ await this._req(
email: "test@test.com", {
password: "test", email: "test@test.com",
_id: "us_uuid1", password: "test",
builder: { _id: "us_uuid1",
global: true, builder: {
global: true,
},
admin: {
global: true,
},
}, },
}, null,
null, controllers.users.save
controllers.users.save )
) }
} }
async end() { async end() {

4
packages/worker/src/utilities/email.js
View File

@ -155,10 +155,12 @@ exports.sendEmail = async (
const context = await getSettingsTemplateContext(purpose, code) const context = await getSettingsTemplateContext(purpose, code)
const message = { const message = {
from: from || config.from, from: from || config.from,
subject: await processString(subject || config.subject, context),
to: email, to: email,
html: await buildEmail(purpose, email, context, { user, contents }), 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) const response = await transport.sendMail(message)
if (TEST_MODE) { if (TEST_MODE) {
console.log("Test email URL: " + nodemailer.getTestMessageUrl(response)) console.log("Test email URL: " + nodemailer.getTestMessageUrl(response))