CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-02 10:34:40 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feature/app-quotas

Browse source
This commit is contained in:
Rory Powell 2022-09-28 12:33:39 +01:00
parent 59527b29f0 3c2dcb6e59
commit 79d53042d8
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend-core/src/db/utils.ts
View file

@ -68,7 +68,7 @@ export function getQueryIndex(viewName: ViewName) {
* Check if a given ID is that of a table.
* @returns {boolean}
*/
exports.isTableId = (id: string) => {
export const isTableId = (id: string) => {
// this includes datasource plus tables
return (
id &&
@ -81,7 +81,7 @@ exports.isTableId = (id: string) => {
* Check if a given ID is that of a datasource or datasource plus.
* @returns {boolean}
*/
exports.isDatasourceId = (id: string) => {
export const isDatasourceId = (id: string) => {
// this covers both datasources and datasource plus
return id && id.startsWith(`${DocumentType.DATASOURCE}${SEPARATOR}`)
}

36
packages/server/src/api/routes/tests/row.spec.js
View file

@ -55,26 +55,26 @@ describe("/rows", () => {
describe("save, load, update", () => {
it("returns a success message when the row is created", async () => {
// const rowUsage = await getRowUsage()
// const queryUsage = await getQueryUsage()
//
// const res = await request
// .post(`/api/${row.tableId}/rows`)
// .send(row)
// .set(config.defaultHeaders())
// .expect('Content-Type', /json/)
// .expect(200)
// expect(res.res.statusMessage).toEqual(`${table.name} saved successfully`)
// expect(res.body.name).toEqual("Test Contact")
// expect(res.body._rev).toBeDefined()
// await assertRowUsage(rowUsage + 1)
// await assertQueryUsage(queryUsage + 1)
const rowUsage = await getRowUsage()
const queryUsage = await getQueryUsage()
const res = await request
.post(`/api/${row.tableId}/rows`)
.send(row)
.set(config.defaultHeaders())
.expect('Content-Type', /json/)
.expect(200)
expect(res.res.statusMessage).toEqual(`${table.name} saved successfully`)
expect(res.body.name).toEqual("Test Contact")
expect(res.body._rev).toBeDefined()
await assertRowUsage(rowUsage + 1)
await assertQueryUsage(queryUsage + 1)
})
it("updates a row successfully", async () => {
const existing = await config.createRow()
// const rowUsage = await getRowUsage()
// const queryUsage = await getQueryUsage()
const rowUsage = await getRowUsage()
const queryUsage = await getQueryUsage()
const res = await request
.post(`/api/${table._id}/rows`)
@ -92,8 +92,8 @@ describe("/rows", () => {
`${table.name} updated successfully.`
)
expect(res.body.name).toEqual("Updated Name")
// await assertRowUsage(rowUsage)
// await assertQueryUsage(queryUsage + 1)
await assertRowUsage(rowUsage)
await assertQueryUsage(queryUsage + 1)
})
it("should load a row", async () => {