From 79fe6ecbae6b15d81ec35eb78db57de1f8c90552 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 1 Dec 2022 12:52:37 +0530
Subject: [PATCH] test(playwright): add test for insert before/after option

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../pages/Dashboard/Grid/Column/index.ts      | 45 ++++++++++++++++---
 ...e.spec.ts => columnMenuOperations.spec.ts} | 39 +++++++++++++++-
 2 files changed, 77 insertions(+), 7 deletions(-)
 rename tests/playwright/tests/{columnDuplicate.spec.ts => columnMenuOperations.spec.ts} (55%)

diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index b69be265a7..25dfcf1705 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -1,4 +1,4 @@
-import { expect, Page } from '@playwright/test';
+import { expect } from '@playwright/test';
 import { GridPage } from '..';
 import BasePage from '../../../Base';
 import { SelectOptionColumnPageObject } from './SelectOptionColumn';
@@ -35,6 +35,8 @@ export class ColumnPageObject extends BasePage {
     relationType = '',
     rollupType = '',
     format = '',
+    insertAfterColumnTitle,
+    insertBeforeColumnTitle,
   }: {
     title: string;
     type?: string;
@@ -45,8 +47,19 @@ export class ColumnPageObject extends BasePage {
     relationType?: string;
     rollupType?: string;
     format?: string;
+    insertBeforeColumnTitle?: string;
+    insertAfterColumnTitle?: string;
   }) {
-    await this.grid.get().locator('.nc-column-add').click();
+    if (insertBeforeColumnTitle) {
+      await this.grid.get().locator(`th[data-title="${insertBeforeColumnTitle}"] .nc-ui-dt-dropdown`).click();
+      await this.rootPage.locator('li[role="menuitem"]:has-text("Insert Before"):visible').click();
+    } else if (insertAfterColumnTitle) {
+      await this.grid.get().locator(`th[data-title="${insertAfterColumnTitle}"] .nc-ui-dt-dropdown`).click();
+      await this.rootPage.locator('li[role="menuitem"]:has-text("Insert After"):visible').click();
+    } else {
+      await this.grid.get().locator('.nc-column-add').click();
+    }
+
     await this.rootPage.waitForTimeout(500);
     await this.fillTitle({ title });
     await this.rootPage.waitForTimeout(500);
@@ -54,8 +67,6 @@ export class ColumnPageObject extends BasePage {
     await this.rootPage.waitForTimeout(500);
 
     switch (type) {
-      case 'SingleTextLine':
-        break;
       case 'SingleSelect':
       case 'MultiSelect':
         await this.selectOption.addOption({
@@ -142,6 +153,30 @@ export class ColumnPageObject extends BasePage {
     }
 
     await this.save();
+
+    // verify column inserted after the target column
+    if (insertAfterColumnTitle) {
+      const headersText = await this.grid.get().locator(`th`).allTextContents();
+
+      await expect(
+        this.grid
+          .get()
+          .locator(`th`)
+          .nth(headersText.findIndex(title => title.startsWith(insertAfterColumnTitle)) + 1)
+      ).toHaveText(title);
+    }
+
+    // verify column inserted before the target column
+    if (insertBeforeColumnTitle) {
+      const headersText = await this.grid.get().locator(`th`).allTextContents();
+
+      await expect(
+        this.grid
+          .get()
+          .locator(`th`)
+          .nth(headersText.findIndex(title => title.startsWith(insertBeforeColumnTitle)) - 1)
+      ).toHaveText(title);
+    }
   }
 
   async fillTitle({ title }: { title: string }) {
@@ -155,7 +190,7 @@ export class ColumnPageObject extends BasePage {
     await this.get().locator('.ant-select-selection-search-input[aria-expanded="true"]').fill(type);
 
     // Select column type
-    await this.rootPage.locator('.rc-virtual-list-holder-inner > div').locator(`text="${type}"`).click();
+    await this.rootPage.locator(`text=${type}:visible`).nth(1).click();
   }
 
   async changeReferencedColumnForQrCode({ titleOfReferencedColumn }: { titleOfReferencedColumn: string }) {
diff --git a/tests/playwright/tests/columnDuplicate.spec.ts b/tests/playwright/tests/columnMenuOperations.spec.ts
similarity index 55%
rename from tests/playwright/tests/columnDuplicate.spec.ts
rename to tests/playwright/tests/columnMenuOperations.spec.ts
index ce3b8b1006..bff597c40c 100644
--- a/tests/playwright/tests/columnDuplicate.spec.ts
+++ b/tests/playwright/tests/columnMenuOperations.spec.ts
@@ -38,7 +38,7 @@ const columns = [
   },
 ];
 
-test.describe('Duplicate column', () => {
+test.describe('Column menu operations', () => {
   let dashboard: DashboardPage;
   let context: any;
 
@@ -47,7 +47,7 @@ test.describe('Duplicate column', () => {
     dashboard = new DashboardPage(page, context.project);
   });
 
-  test('Duplicate text field', async () => {
+  test('Duplicate fields', async () => {
     await dashboard.treeView.openTable({ title: 'Film' });
 
     for (const { title, type } of columns) {
@@ -66,4 +66,39 @@ test.describe('Duplicate column', () => {
     }
     await dashboard.closeTab({ title: 'Film' });
   });
+  test('Insert after', async () => {
+    await dashboard.treeView.openTable({ title: 'Film' });
+
+    await dashboard.grid.column.create({
+      title: 'InsertAfterColumn',
+      type: 'SingleLineText',
+      insertAfterColumnTitle: 'Title',
+    });
+
+    await dashboard.grid.column.create({
+      title: 'InsertAfterColumn1',
+      type: 'SingleLineText',
+      insertAfterColumnTitle: 'Store List',
+    });
+
+    await dashboard.closeTab({ title: 'Film' });
+  });
+
+  test('Insert before', async () => {
+    await dashboard.treeView.openTable({ title: 'Film' });
+
+    await dashboard.grid.column.create({
+      title: 'InsertBeforeColumn',
+      type: 'SingleLineText',
+      insertBeforeColumnTitle: 'Title',
+    });
+
+    await dashboard.grid.column.create({
+      title: 'InsertBeforeColumn1',
+      type: 'SingleLineText',
+      insertBeforeColumnTitle: 'Store List',
+    });
+
+    await dashboard.closeTab({ title: 'Film' });
+  });
 });