Fixing some issues with test cases.

This commit is contained in:
mike12345567 2023-03-21 17:27:31 +00:00
parent 1c73b92595
commit 82286d519f
10 changed files with 121 additions and 79 deletions

View File

@ -4,3 +4,4 @@ process.env.NODE_ENV = "jest"
process.env.MOCK_REDIS = "1"
process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
process.env.ENABLE_4XX_HTTP_LOGGING = "0"
process.env.REDIS_PASSWORD = "budibase"

View File

@ -4,6 +4,7 @@ module FetchMock {
// @ts-ignore
const fetch = jest.requireActual("node-fetch")
let failCount = 0
let mockSearch = false
const func = async (url: any, opts: any) => {
function json(body: any, status = 200) {
@ -69,7 +70,7 @@ module FetchMock {
},
404
)
} else if (url.includes("_search")) {
} else if (mockSearch && url.includes("_search")) {
const body = opts.body
const parts = body.split("tableId:")
let tableId
@ -192,5 +193,9 @@ module FetchMock {
func.Headers = fetch.Headers
func.mockSearch = () => {
mockSearch = true
}
module.exports = func
}

View File

@ -62,10 +62,11 @@ export async function validate({
}
const errors: any = {}
for (let fieldName of Object.keys(fetchedTable.schema)) {
const constraints = cloneDeep(fetchedTable.schema[fieldName].constraints)
const type = fetchedTable.schema[fieldName].type
const column = fetchedTable.schema[fieldName]
const constraints = cloneDeep(column.constraints)
const type = column.type
// formulas shouldn't validated, data will be deleted anyway
if (type === FieldTypes.FORMULA) {
if (type === FieldTypes.FORMULA || column.autocolumn) {
continue
}
// special case for options, need to always allow unselected (null)

View File

@ -0,0 +1,31 @@
import * as setup from "./utilities"
import { roles, db as dbCore } from "@budibase/backend-core"
describe("/api/applications/:appId/sync", () => {
let request = setup.getRequest()
let config = setup.getConfig()
let app
afterAll(setup.afterAll)
beforeAll(async () => {
app = await config.init()
// create some users which we will use throughout the tests
await config.createUser({
email: "sync1@test.com",
roles: {
[app._id!]: roles.BUILTIN_ROLE_IDS.BASIC,
},
})
})
async function getUserMetadata() {
const { rows } = await config.searchRows(dbCore.InternalTable.USER_METADATA)
return rows
}
it("make sure its empty initially", async () => {
const rows = await getUserMetadata()
expect(rows.length).toBe(1)
})
})

View File

@ -1,6 +1,7 @@
const fetch = require("node-fetch")
fetch.mockSearch()
const search = require("../../controllers/row/internalSearch")
// this will be mocked out for _search endpoint
const fetch = require("node-fetch")
const PARAMS = {
tableId: "ta_12345679abcdef",
version: "1",
@ -20,7 +21,7 @@ function checkLucene(resp, expected, params = PARAMS) {
expect(json.bookmark).toBe(PARAMS.bookmark)
}
expect(json.include_docs).toBe(true)
expect(json.q).toBe(`(${expected}) AND tableId:"${params.tableId}"`)
expect(json.q).toBe(`${expected} AND tableId:"${params.tableId}"`)
expect(json.limit).toBe(params.limit || 50)
}
@ -59,7 +60,7 @@ describe("internal search", () => {
"column": "1",
}
}, PARAMS)
checkLucene(response, `column:"2" OR !column:"1"`)
checkLucene(response, `(column:"2" OR !column:"1")`)
})
it("test AND query", async () => {
@ -71,7 +72,7 @@ describe("internal search", () => {
"column": "1",
}
}, PARAMS)
checkLucene(response, `*:* AND column:"2" AND !column:"1"`)
checkLucene(response, `(*:* AND column:"2" AND !column:"1")`)
})
it("test pagination query", async () => {
@ -132,7 +133,7 @@ describe("internal search", () => {
"colArr": [1, 2, 3],
},
}, PARAMS)
checkLucene(response, `*:* AND column:a AND colArr:(1 AND 2 AND 3)`, PARAMS)
checkLucene(response, `(*:* AND column:a AND colArr:(1 AND 2 AND 3))`, PARAMS)
})
it("test multiple of same column", async () => {
@ -144,7 +145,7 @@ describe("internal search", () => {
"3:column": "c",
},
}, PARAMS)
checkLucene(response, `column:"a" OR column:"b" OR column:"c"`, PARAMS)
checkLucene(response, `(column:"a" OR column:"b" OR column:"c")`, PARAMS)
})
it("check a weird case for lucene building", async () => {
@ -191,6 +192,6 @@ describe("internal search", () => {
expect(json.bookmark).toBe(PARAMS.bookmark)
}
expect(json.include_docs).toBe(true)
expect(json.q).toBe(`(*:* AND column:"1") AND tableId:${PARAMS.tableId}`)
expect(json.q).toBe(`*:* AND column:"1" AND tableId:${PARAMS.tableId}`)
})
})

View File

@ -1,3 +1,6 @@
import fetch from "node-fetch"
// @ts-ignore
fetch.mockSearch()
import {
generateMakeRequest,
MakeRequestResponse,
@ -16,6 +19,7 @@ import _ from "lodash"
import { generator } from "@budibase/backend-core/tests"
import { utils } from "@budibase/backend-core"
import { GenericContainer } from "testcontainers"
import { generateRowIdField } from "../integrations/utils"
const config = setup.getConfig()!
@ -80,16 +84,10 @@ describe("row api - postgres", () => {
name: "id",
type: FieldType.AUTO,
autocolumn: true,
constraints: {
presence: true,
},
},
title: {
name: "title",
type: FieldType.STRING,
constraints: {
presence: true,
},
},
},
sourceId: postgresDatasource._id,
@ -121,16 +119,10 @@ describe("row api - postgres", () => {
name: "id",
type: FieldType.AUTO,
autocolumn: true,
constraints: {
presence: true,
},
},
name: {
name: "name",
type: FieldType.STRING,
constraints: {
presence: true,
},
},
description: {
name: "description",
@ -144,7 +136,6 @@ describe("row api - postgres", () => {
type: FieldType.LINK,
constraints: {
type: "array",
presence: false,
},
fieldName: oneToManyRelationshipInfo.fieldName,
name: "oneToManyRelation",
@ -156,7 +147,6 @@ describe("row api - postgres", () => {
type: FieldType.LINK,
constraints: {
type: "array",
presence: false,
},
fieldName: manyToOneRelationshipInfo.fieldName,
name: "manyToOneRelation",
@ -168,7 +158,6 @@ describe("row api - postgres", () => {
type: FieldType.LINK,
constraints: {
type: "array",
presence: false,
},
fieldName: manyToManyRelationshipInfo.fieldName,
name: "manyToManyRelation",
@ -309,9 +298,6 @@ describe("row api - postgres", () => {
id: {
name: "id",
type: FieldType.AUTO,
constraints: {
presence: true,
},
},
},
sourceId: postgresDatasource._id,
@ -921,18 +907,32 @@ describe("row api - postgres", () => {
foreignRows,
x => x.relationshipType
)
expect(res.body).toEqual({
...rowData,
[`fk_${oneToManyRelationshipInfo.table.name}_${oneToManyRelationshipInfo.fieldName}`]:
foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row.id,
[oneToManyRelationshipInfo.fieldName]: [
const m2mFieldName = manyToManyRelationshipInfo.fieldName,
o2mFieldName = oneToManyRelationshipInfo.fieldName,
m2oFieldName = manyToOneRelationshipInfo.fieldName
const m2mRow1 = res.body[m2mFieldName].find(
(row: Row) => row.id === 1
)
const m2mRow2 = res.body[m2mFieldName].find(
(row: Row) => row.id === 2
)
expect(m2mRow1).toEqual({
...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][0].row,
[m2mFieldName]: [
{
...foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row,
_id: expect.any(String),
_rev: expect.any(String),
_id: row._id,
},
],
[manyToOneRelationshipInfo.fieldName]: [
})
expect(m2mRow2).toEqual({
...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][1].row,
[m2mFieldName]: [
{
_id: row._id,
},
],
})
expect(res.body[m2oFieldName]).toEqual([
{
...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][0].row,
[`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
@ -948,20 +948,14 @@ describe("row api - postgres", () => {
[`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
row.id,
},
],
[manyToManyRelationshipInfo.fieldName]: [
])
expect(res.body[o2mFieldName]).toEqual([
{
...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][0].row,
},
{
...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][1].row,
},
],
id: row.id,
tableId: row.tableId,
...foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row,
_id: expect.any(String),
_rev: expect.any(String),
})
},
])
})
})
})

View File

@ -99,8 +99,8 @@ describe("Google Sheets Integration", () => {
})
})
test("removing an existing field will not remove the data from the spreadsheet", async () => {
await config.doInContext(structures.uuid(), async () => {
test("removing an existing field will remove the header from the google sheet", async () => {
const sheet = await config.doInContext(structures.uuid(), async () => {
const tableColumns = ["name"]
const table = createBasicTable(structures.uuid(), tableColumns)
@ -109,18 +109,14 @@ describe("Google Sheets Integration", () => {
})
sheetsByTitle[table.name] = sheet
await integration.updateTable(table)
return sheet
})
expect(sheet.loadHeaderRow).toBeCalledTimes(1)
expect(sheet.setHeaderRow).toBeCalledTimes(1)
expect(sheet.setHeaderRow).toBeCalledWith([
"name",
"description",
"location",
])
expect(sheet.setHeaderRow).toBeCalledWith(["name"])
// No undefineds are sent
expect((sheet.setHeaderRow as any).mock.calls[0][0]).toHaveLength(3)
})
// No undefined are sent
expect((sheet.setHeaderRow as any).mock.calls[0][0]).toHaveLength(1)
})
})
})

View File

@ -9,3 +9,4 @@ process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
process.env.ENABLE_4XX_HTTP_LOGGING = "0"
process.env.MOCK_REDIS = "1"
process.env.PLATFORM_URL = "http://localhost:10000"
process.env.REDIS_PASSWORD = "budibase"

View File

@ -46,6 +46,7 @@ import {
Row,
SourceName,
Table,
SearchFilters,
} from "@budibase/types"
type DefaultUserValues = {
@ -568,6 +569,16 @@ class TestConfiguration {
return this._req(null, { tableId }, controllers.row.fetch)
}
async searchRows(tableId: string, searchParams: SearchFilters = {}) {
if (!tableId && this.table) {
tableId = this.table._id
}
const body = {
query: searchParams,
}
return this._req(body, { tableId }, controllers.row.search)
}
// ROLE
async createRole(config?: any) {

View File

@ -10,3 +10,4 @@ process.env.MINIO_SECRET_KEY = "test"
process.env.PLATFORM_URL = "http://localhost:10000"
process.env.INTERNAL_API_KEY = "tet"
process.env.DISABLE_ACCOUNT_PORTAL = "0"
process.env.REDIS_PASSWORD = "budibase"