From a56c8fac2b9e6031ef2f13f36ae7c9b724ca41ab Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 10 Nov 2023 10:54:45 +0000
Subject: [PATCH] fix: Integrated new view context menu to tests

---
 .../components/smartsheet/toolbar/ViewActionMenu.vue      | 6 +++---
 .../pages/Dashboard/common/Toolbar/Actions/index.ts       | 2 +-
 tests/playwright/tests/db/general/viewMenu.spec.ts        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
index 9804c252fd..ebb647983c 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
@@ -143,7 +143,7 @@ const onDelete = async () => {
 </script>
 
 <template>
-  <NcMenu class="!min-w-70" data-testid="toolbar-actions">
+  <NcMenu class="!min-w-70" data-id="toolbar-actions" :data-testid="`view-sidebar-view-actions-${view!.alias || view!.title}`">
     <NcTooltip>
       <template #title> {{ $t('labels.clickToCopyViewID') }} </template>
       <div class="flex items-center justify-between py-2 px-3 cursor-pointer hover:bg-gray-100 group" @click="onViewIdCopy">
@@ -167,7 +167,7 @@ const onDelete = async () => {
         {{ $t('activity.renameView') }}
       </NcMenuItem>
       <NcMenuItem @click="onDuplicate">
-        <GeneralIcon icon="duplicate" />
+        <GeneralIcon icon="duplicate" class="nc-view-copy-icon" />
         {{ $t('labels.duplicateView') }}
       </NcMenuItem>
       <NcDivider />
@@ -240,7 +240,7 @@ const onDelete = async () => {
     <template v-if="!view.is_default">
       <NcDivider />
       <NcMenuItem class="!hover:bg-red-50 !text-red-500" @click="onDelete">
-        <GeneralIcon icon="delete" />
+        <GeneralIcon icon="delete" class="nc-view-delete-icon" />
         {{
           $t('general.deleteEntity', {
             entity: $t('objects.view'),
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Actions/index.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Actions/index.ts
index 8a5522983d..25d9e74fae 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Actions/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Actions/index.ts
@@ -13,7 +13,7 @@ export class ToolbarActionsPage extends BasePage {
   }
 
   get() {
-    return this.rootPage.locator(`[data-testid="toolbar-actions"]`);
+    return this.rootPage.locator(`[data-id="toolbar-actions"]`);
   }
 
   // todo: use enum
diff --git a/tests/playwright/tests/db/general/viewMenu.spec.ts b/tests/playwright/tests/db/general/viewMenu.spec.ts
index 96bd5c1cdc..0abd1d316c 100644
--- a/tests/playwright/tests/db/general/viewMenu.spec.ts
+++ b/tests/playwright/tests/db/general/viewMenu.spec.ts
@@ -23,8 +23,8 @@ test.describe('Grid view locked', () => {
 
     // enable view lock
     await dashboard.grid.toolbar.viewsMenu.click({
-      menu: 'Collaborative View',
-      subMenu: 'Locked View',
+      menu: 'Collaborative',
+      subMenu: 'Locked',
     });
 
     // verify view lock
@@ -32,8 +32,8 @@ test.describe('Grid view locked', () => {
 
     // enable collaborative view
     await dashboard.grid.toolbar.viewsMenu.click({
-      menu: 'Locked View',
-      subMenu: 'Collaborative View',
+      menu: 'Locked',
+      subMenu: 'Collaborative',
     });
 
     await dashboard.grid.verifyCollaborativeMode();