From a508ab8160a672bd723ec9abf82aba87687d78c1 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Wed, 19 Oct 2022 11:44:38 +0530
Subject: [PATCH] feat(testing): Integrated toolbar changes

---
 .../tests/linkToAnotherRecord.spec.ts         |  2 +-
 .../tests/viewFormShareSurvey.spec.ts         |  6 +++---
 .../playwright/tests/viewGridLocked.spec.ts   | 10 +++++-----
 .../playwright/tests/viewGridShare.spec.ts    | 20 +++++++++----------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/scripts/playwright/tests/linkToAnotherRecord.spec.ts b/scripts/playwright/tests/linkToAnotherRecord.spec.ts
index d88b1a0d4a..c2199b3d37 100644
--- a/scripts/playwright/tests/linkToAnotherRecord.spec.ts
+++ b/scripts/playwright/tests/linkToAnotherRecord.spec.ts
@@ -53,7 +53,7 @@ test.describe("LTAR create & update", () => {
 
     // Expanded form insert
 
-    await dashboard.toolbar.clickAddNewRow();
+    await dashboard.grid.toolbar.clickAddNewRow();
     await dashboard.expandedForm.fillField({
       columnTitle: "Title",
       value: "2a",
diff --git a/scripts/playwright/tests/viewFormShareSurvey.spec.ts b/scripts/playwright/tests/viewFormShareSurvey.spec.ts
index 0a7eac8955..fccea151e1 100644
--- a/scripts/playwright/tests/viewFormShareSurvey.spec.ts
+++ b/scripts/playwright/tests/viewFormShareSurvey.spec.ts
@@ -30,10 +30,10 @@ test.describe("Share form", () => {
     });
     await dashboard.form.showAnotherFormRadioButton.click();
     await dashboard.form.showAnotherFormAfter5SecRadioButton.click();
-    await dashboard.toolbar.clickShareView();
-    await dashboard.toolbar.shareView.toggleSurveyMode();
+    await dashboard.form.toolbar.clickShareView();
+    await dashboard.form.toolbar.shareView.toggleSurveyMode();
 
-    const surveyLink = await dashboard.toolbar.shareView.getShareLink();
+    const surveyLink = await dashboard.form.toolbar.shareView.getShareLink();
     await dashboard.rootPage.waitForTimeout(2000);
     await dashboard.rootPage.goto(surveyLink);
     await dashboard.rootPage.waitForTimeout(2000);
diff --git a/scripts/playwright/tests/viewGridLocked.spec.ts b/scripts/playwright/tests/viewGridLocked.spec.ts
index 737e261695..d935ed3f03 100644
--- a/scripts/playwright/tests/viewGridLocked.spec.ts
+++ b/scripts/playwright/tests/viewGridLocked.spec.ts
@@ -16,23 +16,23 @@ test.describe("Grid view locked", () => {
     await dashboard.closeTab({ title: "Team & Auth" });
     await dashboard.treeView.openTable({ title: "Country" });
 
-    await dashboard.toolbar.viewsMenu.verifyCollaborativeMode();
+    await dashboard.grid.toolbar.viewsMenu.verifyCollaborativeMode();
 
     // enable view lock
-    await dashboard.toolbar.viewsMenu.click({
+    await dashboard.grid.toolbar.viewsMenu.click({
       menu: "Collaborative View",
       subMenu: "Locked View",
     });
 
     // verify view lock
-    await dashboard.toolbar.viewsMenu.verifyLockMode();
+    await dashboard.grid.toolbar.viewsMenu.verifyLockMode();
 
     // enable collaborative view
-    await dashboard.toolbar.viewsMenu.click({
+    await dashboard.grid.toolbar.viewsMenu.click({
       menu: "Locked View",
       subMenu: "Collaborative View",
     });
 
-    await dashboard.toolbar.viewsMenu.verifyCollaborativeMode();
+    await dashboard.grid.toolbar.viewsMenu.verifyCollaborativeMode();
   });
 });
diff --git a/scripts/playwright/tests/viewGridShare.spec.ts b/scripts/playwright/tests/viewGridShare.spec.ts
index 9234414513..b543f7be5d 100644
--- a/scripts/playwright/tests/viewGridShare.spec.ts
+++ b/scripts/playwright/tests/viewGridShare.spec.ts
@@ -31,14 +31,14 @@ test.describe("Shared view", () => {
     await dashboard.treeView.openTable({ title: "Address" });
 
     // hide column
-    await dashboard.toolbar.fields.toggle({ title: "Address2" });
+    await dashboard.grid.toolbar.fields.toggle({ title: "Address2" });
     // sort
-    await dashboard.toolbar.sort.addSort({
+    await dashboard.grid.toolbar.sort.addSort({
       columnTitle: "District",
       isAscending: false,
     });
     // filter
-    await dashboard.toolbar.filter.addNew({
+    await dashboard.grid.toolbar.filter.addNew({
       columnTitle: "Address",
       value: "Ab",
       opType: "is like",
@@ -47,8 +47,8 @@ test.describe("Shared view", () => {
     mainPageLink = page.url();
 
     // share with password disabled, download enabled
-    await dashboard.toolbar.clickShareView();
-    sharedLink = await dashboard.toolbar.shareView.getShareLink();
+    await dashboard.grid.toolbar.clickShareView();
+    sharedLink = await dashboard.grid.toolbar.shareView.getShareLink();
 
     /**
      * 2. Access shared view: verify
@@ -182,13 +182,13 @@ test.describe("Shared view", () => {
     await dashboard.treeView.openTable({ title: "Country" });
 
     // enable password & verify share link
-    await dashboard.toolbar.clickShareView();
-    await dashboard.toolbar.shareView.enablePassword("p@ssword");
+    await dashboard.grid.toolbar.clickShareView();
+    await dashboard.grid.toolbar.shareView.enablePassword("p@ssword");
     // disable download
-    await dashboard.toolbar.shareView.toggleDownload();
+    await dashboard.grid.toolbar.shareView.toggleDownload();
 
-    sharedLink = await dashboard.toolbar.shareView.getShareLink();
-    await dashboard.toolbar.shareView.close();
+    sharedLink = await dashboard.grid.toolbar.shareView.getShareLink();
+    await dashboard.grid.toolbar.shareView.close();
 
     // add new column, record after share view creation
     await dashboard.grid.column.create({