From b4acc0daae6e2eef4c5f117de1165cb81d8b63df Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Mon, 13 Mar 2023 17:26:39 +0530 Subject: [PATCH] test: isempty to isblank Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- .../nocodb/tests/unit/rest/tests/tableRow.test.ts | 14 ++++++++------ .../nocodb/tests/unit/rest/tests/viewRow.test.ts | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts index e7698869dd..a058ebe17f 100644 --- a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts +++ b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts @@ -446,7 +446,7 @@ function tableTest() { fk_column_id: paymentListColumn?.id, status: 'create', logical_op: 'and', - comparison_op: 'notempty', + comparison_op: 'notblank', }, ], }; @@ -536,7 +536,7 @@ function tableTest() { fk_column_id: paymentListColumn?.id, status: 'create', logical_op: 'and', - comparison_op: 'notempty', + comparison_op: 'notblank', }, { is_group: true, @@ -665,7 +665,7 @@ function tableTest() { fk_column_id: paymentListColumn?.id, status: 'create', logical_op: 'and', - comparison_op: 'notempty', + comparison_op: 'notblank', }, { is_group: true, @@ -821,7 +821,7 @@ function tableTest() { fk_column_id: paymentListColumn?.id, status: 'create', logical_op: 'and', - comparison_op: 'notempty', + comparison_op: 'notblank', }, { is_group: true, @@ -1130,7 +1130,7 @@ function tableTest() { fk_column_id: paymentListColumn?.id, status: 'create', logical_op: 'and', - comparison_op: 'notempty', + comparison_op: 'notblank', }, { is_group: true, @@ -2129,7 +2129,9 @@ function tableTest() { // todo: only keep generic error message once updated in noco catchError middleware if ( - !response.body.message?.includes("The column 'customer_id' cannot be null") && + !response.body.message?.includes( + "The column 'customer_id' cannot be null" + ) && !response.body.message?.includes("Column 'customer_id' cannot be null") && !response.body.message?.includes('Cannot add or update a child row') && !response.body.msg?.includes("Column 'customer_id' cannot be null") && diff --git a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts index 3522e7daf9..b6388b5094 100644 --- a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts +++ b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts @@ -542,7 +542,7 @@ function viewRowTests() { fk_column_id: paymentListColumn?.id, status: 'create', logical_op: 'and', - comparison_op: 'notempty', + comparison_op: 'notblank', }, ], }; @@ -659,7 +659,7 @@ function viewRowTests() { fk_column_id: paymentListColumn?.id, status: 'create', logical_op: 'and', - comparison_op: 'notempty', + comparison_op: 'notblank', }, { is_group: true, @@ -928,7 +928,7 @@ function viewRowTests() { fk_column_id: paymentListColumn?.id, status: 'create', logical_op: 'and', - comparison_op: 'notempty', + comparison_op: 'notblank', }, { is_group: true,