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

Fix merge conflicts

This commit is contained in:
Adria Navarro 2025-03-21 09:13:40 +01:00
parent f904646519
commit e9a8dad2e2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/server/src/sdk/app/oauth2/tests/utils.spec.ts
View File

@ -132,7 +132,9 @@ describe("oauth2 utils", () => {
}) })
) )
await config.doInContext(config.appId, () => getToken(oauthConfig.id)) await config.doInContext(config.appId, () =>
getToken(oauthConfig._id)
)
await testUtils.queue.processMessages( await testUtils.queue.processMessages(
cache.docWritethrough.DocWritethroughProcessor.queue cache.docWritethrough.DocWritethroughProcessor.queue
) )
@ -140,7 +142,7 @@ describe("oauth2 utils", () => {
const usageLog = await config.doInContext(config.appId, () => const usageLog = await config.doInContext(config.appId, () =>
context context
.getAppDB() .getAppDB()
.tryGet(docIds.generateOAuth2LogID(oauthConfig.id)) .tryGet(docIds.generateOAuth2LogID(oauthConfig._id))
) )
expect(usageLog).toEqual( expect(usageLog).toEqual(
@ -162,7 +164,7 @@ describe("oauth2 utils", () => {
) )
await expect( await expect(
config.doInContext(config.appId, () => getToken(oauthConfig.id)) config.doInContext(config.appId, () => getToken(oauthConfig._id))
).rejects.toThrow() ).rejects.toThrow()
await testUtils.queue.processMessages( await testUtils.queue.processMessages(
cache.docWritethrough.DocWritethroughProcessor.queue cache.docWritethrough.DocWritethroughProcessor.queue
@ -171,7 +173,7 @@ describe("oauth2 utils", () => {
const usageLog = await config.doInContext(config.appId, () => const usageLog = await config.doInContext(config.appId, () =>
context context
.getAppDB() .getAppDB()
.tryGet(docIds.generateOAuth2LogID(oauthConfig.id)) .tryGet(docIds.generateOAuth2LogID(oauthConfig._id))
) )
expect(usageLog).toBeUndefined() expect(usageLog).toBeUndefined()