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

Merge branch 'master' into clean-vm2

This commit is contained in:
Adria Navarro 2024-02-20 13:41:24 +01:00 committed by GitHub
parent a4e183cfa0 4555260244
commit 6dedf8cabf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosting/single/Dockerfile
View File

@ -38,7 +38,7 @@ COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
COPY packages/string-templates packages/string-templates COPY packages/string-templates packages/string-templates
FROM budibase/couchdb as runner FROM budibase/couchdb:v3.3.3 as runner
ARG TARGETARCH ARG TARGETARCH
ENV TARGETARCH $TARGETARCH ENV TARGETARCH $TARGETARCH
#TARGETBUILD can be set to single (for single docker image) or aas (for azure app service) #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service)

2
packages/pro

@ -1 +1 @@
Subproject commit 6f3a0b7f72d16f9604179af98ff7602ca0df2737 Subproject commit 60e47a8249fd6291a6bc20fe3fe6776b11938fa1

10
packages/server/src/api/routes/tests/table.spec.ts
View File

@ -368,10 +368,12 @@ describe("/tables", () => {
.set(config.defaultHeaders()) .set(config.defaultHeaders())
.expect("Content-Type", /json/) .expect("Content-Type", /json/)
.expect(200) .expect(200)
const fetchedTable = res.body[0]
expect(fetchedTable.name).toEqual(testTable.name) const table = res.body.find((t: Table) => t._id === testTable._id)
expect(fetchedTable.type).toEqual("table") expect(table).toBeDefined()
expect(fetchedTable.sourceType).toEqual("internal") expect(table.name).toEqual(testTable.name)
expect(table.type).toEqual("table")
expect(table.sourceType).toEqual("internal")
}) })
it("should apply authorization to endpoint", async () => { it("should apply authorization to endpoint", async () => {