github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

test: retain filter modal open (optimisation for time) 

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
pull/5185/head
Raju Udava 2 years ago
parent
09b07d238c
commit
a4958bffcb
3 changed files with 139 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      tests/playwright/pages/Dashboard/Grid/index.ts
  2. 8
      tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
  3. 89
      tests/playwright/tests/filters.spec.ts

2
tests/playwright/pages/Dashboard/Grid/index.ts
Unescape View File

@ -212,8 +212,8 @@ export class GridPage extends BasePage {
recordCnt = records[0].split(' ')[0];
// to ensure page loading is complete
await this.rootPage.waitForTimeout(500);
i++;
await this.rootPage.waitForTimeout(100 * i);
}
expect(parseInt(recordCnt)).toEqual(count);
}

8
tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
Unescape View File

@ -29,6 +29,10 @@ export class ToolbarFilterPage extends BasePage {
).toBeChecked();
}
async clickAddFilter() {
await this.get().locator(`button:has-text("Add Filter")`).first().click();
}
async add({
columnTitle,
opType,
@ -36,6 +40,7 @@ export class ToolbarFilterPage extends BasePage {
value,
isLocallySaved,
dataType,
openModal = false,
}: {
columnTitle: string;
opType: string;
@ -43,8 +48,9 @@ export class ToolbarFilterPage extends BasePage {
value?: string;
isLocallySaved: boolean;
dataType?: string;
openModal?: boolean;
}) {
await this.get().locator(`button:has-text("Add Filter")`).first().click();
if (!openModal) await this.get().locator(`button:has-text("Add Filter")`).first().click();
const selectedField = await this.rootPage.locator('.nc-filter-field-select').textContent();
if (selectedField !== columnTitle) {

89
tests/playwright/tests/filters.spec.ts
Unescape View File

@ -44,6 +44,35 @@ async function validateRowArray(param) {
await dashboard.grid.verifyTotalRowCount({ count: rowCount });
}
async function verifyFilter_withFixedModal(param: {
column: string;
opType: string;
opSubType?: string;
value?: string;
result: { rowCount: number };
dataType?: string;
}) {
// if opType was included in skip list, skip it
if (skipList[param.column]?.includes(param.opType)) {
return;
}
await toolbar.filter.add({
columnTitle: param.column,
opType: param.opType,
opSubType: param.opSubType,
value: param.value,
isLocallySaved: false,
dataType: param?.dataType,
openModal: true,
});
// verify filtered rows
await validateRowArray({
rowCount: param.result.rowCount,
});
}
async function verifyFilter(param: {
column: string;
opType: string;
@ -348,8 +377,9 @@ test.describe('Filter Tests: Text based', () => {
},
];
await toolbar.clickFilter();
for (let i = 0; i < filterList.length; i++) {
await verifyFilter({
await verifyFilter_withFixedModal({
column: dataType,
opType: filterList[i].op,
value: filterList[i].value,
@ -612,7 +642,7 @@ test.describe('Filter Tests: Date based', () => {
const oneYearAgo = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).setHours(0, 0, 0, 0);
const oneYearFromNow = new Date(new Date().setFullYear(new Date().getFullYear() + 1)).setHours(0, 0, 0, 0);
async function dateTimeBasedFilterTest(dataType, suiteName) {
async function dateTimeBasedFilterTest(dataType) {
await dashboard.closeTab({ title: 'Team & Auth' });
await dashboard.treeView.openTable({ title: 'dateTimeBased' });
@ -770,10 +800,12 @@ test.describe('Filter Tests: Date based', () => {
},
];
switch (suiteName) {
case 'is_is_not':
await toolbar.clickFilter();
await toolbar.filter.clickAddFilter();
// "is" filter list
for (let i = 0; i < isFilterList.length; i++) {
await verifyFilter({
await verifyFilter_withFixedModal({
column: dataType,
opType: 'is',
opSubType: isFilterList[i].opSub,
@ -785,7 +817,7 @@ test.describe('Filter Tests: Date based', () => {
// mutually exclusive of "is" filter list
for (let i = 0; i < isFilterList.length; i++) {
await verifyFilter({
await verifyFilter_withFixedModal({
column: dataType,
opType: 'is not',
opSubType: isFilterList[i].opSub,
@ -794,11 +826,10 @@ test.describe('Filter Tests: Date based', () => {
dataType: dataType,
});
}
break;
case 'is_before_is_on_or_before':
// "is before" filter list
for (let i = 0; i < isAfterFilterList.length; i++) {
await verifyFilter({
await verifyFilter_withFixedModal({
column: dataType,
opType: 'is before',
opSubType: isAfterFilterList[i].opSub,
@ -808,8 +839,9 @@ test.describe('Filter Tests: Date based', () => {
});
}
// "is on or before" filter list
for (let i = 0; i < isAfterFilterList.length; i++) {
await verifyFilter({
await verifyFilter_withFixedModal({
column: dataType,
opType: 'is on or before',
opSubType: isAfterFilterList[i].opSub,
@ -818,11 +850,10 @@ test.describe('Filter Tests: Date based', () => {
dataType: dataType,
});
}
break;
case 'is_after_is_on_or_after':
// "is after" filter list
for (let i = 0; i < isAfterFilterList.length; i++) {
await verifyFilter({
await verifyFilter_withFixedModal({
column: dataType,
opType: 'is after',
opSubType: isAfterFilterList[i].opSub,
@ -832,8 +863,9 @@ test.describe('Filter Tests: Date based', () => {
});
}
// "is on or after" filter list
for (let i = 0; i < isAfterFilterList.length; i++) {
await verifyFilter({
await verifyFilter_withFixedModal({
column: dataType,
opType: 'is on or after',
opSubType: isAfterFilterList[i].opSub,
@ -842,11 +874,10 @@ test.describe('Filter Tests: Date based', () => {
dataType: dataType,
});
}
break;
case 'is_within_is_blank':
// "is within" filter list
for (let i = 0; i < isWithinFilterList.length; i++) {
await verifyFilter({
await verifyFilter_withFixedModal({
column: dataType,
opType: 'is within',
opSubType: isWithinFilterList[i].opSub,
@ -856,8 +887,9 @@ test.describe('Filter Tests: Date based', () => {
});
}
// "is blank" and "is not blank" filter list
for (let i = 0; i < filterList.length; i++) {
await verifyFilter({
await verifyFilter_withFixedModal({
column: dataType,
opType: filterList[i].opType,
opSubType: null,
@ -866,11 +898,6 @@ test.describe('Filter Tests: Date based', () => {
dataType: dataType,
});
}
break;
default:
break;
}
}
test.beforeEach(async ({ page }) => {
@ -921,20 +948,8 @@ test.describe('Filter Tests: Date based', () => {
}
});
test('Date : is, is not', async () => {
await dateTimeBasedFilterTest('Date', 'is_is_not');
});
test('Date : is before, is on or before', async () => {
await dateTimeBasedFilterTest('Date', 'is_before_is_on_or_before');
});
test('Date : is after, is on or after', async () => {
await dateTimeBasedFilterTest('Date', 'is_after_is_on_or_after');
});
test('Date : is within, is blank', async () => {
await dateTimeBasedFilterTest('Date', 'is_within_is_blank');
test('Date : filters', async () => {
await dateTimeBasedFilterTest('Date');
});
});

Write Preview
Loading…
Cancel
Save