new functions for data lake utils + fixes for delete-widget-test

apache · Aug 19, 2024 · be4dd23 · be4dd23
1 parent 0cdecb8
commit be4dd23
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 46 deletions.
diff --git a/ui/cypress/support/utils/datalake/DataLakeUtils.ts b/ui/cypress/support/utils/datalake/DataLakeUtils.ts
@@ -198,6 +198,20 @@ export class DataLakeUtils {
         cy.dataCy('confirm-delete', { timeout: 10000 }).click();
     }
 
+    public static cancelDeleteDashboard(dashboardName: string) {
+        cy.dataCy('delete-dashboard-' + dashboardName, {
+            timeout: 10000,
+        }).click();
+        cy.dataCy('cancel-delete', { timeout: 10000 }).click();
+    }
+
+    public static cancelDeleteDataView(dataViewName: string) {
+        cy.dataCy('delete-data-view-' + dataViewName, {
+            timeout: 10000,
+        }).click();
+        cy.dataCy('cancel-delete', { timeout: 10000 }).click();
+    }
+
     public static editWidget(widgetName: string) {
         cy.dataCy('edit-' + widgetName).click();
     }
@@ -440,4 +454,16 @@ export class DataLakeUtils {
             .invoke('text')
             .then(text => text.trim());
     }
+
+    public static checkRowsDashboardTable(amount: number) {
+        cy.dataCy('dashboard-table-overview', {
+            timeout: 10000,
+        }).should('have.length', amount);
+    }
+
+    public static checkRowsViewsTable(amount: number) {
+        cy.dataCy('data-views-table-overview', {
+            timeout: 10000,
+        }).should('have.length', amount);
+    }
 }
diff --git a/ui/cypress/tests/datalake/deleteViewAndDashboard.spec.ts b/ui/cypress/tests/datalake/deleteViewAndDashboard.spec.ts
@@ -34,48 +34,25 @@ describe('Test Deletion of Data View and Dashboard', () => {
 
         DataLakeUtils.saveDashboardConfiguration();
 
-        cy.dataCy('dashboard-table-overview', { timeout: 10000 }).should(
-            'have.length',
-            1,
-        );
+        DataLakeUtils.checkRowsDashboardTable(1);
 
-        cy.dataCy('data-views-table-overview', { timeout: 10000 }).should(
-            'have.length',
-            1,
-        );
+        DataLakeUtils.checkRowsViewsTable(1);
 
         // Click "Delete" but cancel action and check if dashboard and view are still displayed
-        cy.dataCy('delete-dashboard-TestDashboard', {
-            timeout: 10000,
-        }).click();
-        cy.dataCy('cancel-delete', { timeout: 10000 }).click();
-
-        cy.dataCy('dashboard-table-overview', { timeout: 10000 }).should(
-            'have.length',
-            1,
-        );
-
-        cy.dataCy('data-views-table-overview', { timeout: 10000 }).should(
-            'have.length',
-            1,
-        );
-
-        cy.dataCy('delete-data-view-TestView', {
-            timeout: 10000,
-        }).click();
-        cy.dataCy('cancel-delete', { timeout: 10000 }).click();
+        DataLakeUtils.cancelDeleteDashboard('TestDashboard');
+
+        DataLakeUtils.checkRowsDashboardTable(1);
+
+        DataLakeUtils.cancelDeleteDataView('TestView');
+
+        DataLakeUtils.checkRowsViewsTable(1);
 
         DataLakeUtils.deleteDashboard('TestDashboard');
+
         DataLakeUtils.deleteDataView('TestView');
 
-        cy.dataCy('dashboard-table-overview', { timeout: 10000 }).should(
-            'have.length',
-            0,
-        );
+        DataLakeUtils.checkRowsDashboardTable(0);
 
-        cy.dataCy('data-views-table-overview', { timeout: 10000 }).should(
-            'have.length',
-            0,
-        );
+        DataLakeUtils.checkRowsViewsTable(0);
     });
 });
diff --git a/ui/cypress/tests/datalake/deleteWidget.ts b/ui/cypress/tests/datalake/deleteWidget.ts
@@ -45,24 +45,16 @@ describe('Test Table View in Data Explorer', () => {
         DataLakeUtils.saveAndReEditDashboard('TestDashboard');
 
         // Check that widget is gone
-        cy.dataCy('widget-datalake_configuration', { timeout: 10000 }).should(
-            'not.exist',
-        );
+        cy.dataCy('widget-TestView', { timeout: 10000 }).should('not.exist');
 
         DataLakeUtils.goBackToOverview();
 
-        cy.dataCy('delete-dashboard-TestDashboard', { timeout: 10000 }).should(
-            'have.length',
-            1,
-        );
+        DataLakeUtils.checkRowsDashboardTable(1);
 
         // Delete dashboard
         DataLakeUtils.deleteDashboard('TestDashboard');
 
         // Check that dashboard is gone
-        cy.dataCy('delete-dashboard-TestDashboard', { timeout: 10000 }).should(
-            'have.length',
-            0,
-        );
+        DataLakeUtils.checkRowsDashboardTable(0);
     });
 });
diff --git a/...et-selection-panel/data-view-selection/data-view-preview/data-view-preview.component.html b/...et-selection-panel/data-view-selection/data-view-preview/data-view-preview.component.html
@@ -19,6 +19,10 @@
 <div
     fxLayout="row"
     class="data-view-preview-outer"
+    [attr.data-cy]="
+        'add-data-view-btn-' +
+        dataView.baseAppearanceConfig.widgetTitle.replaceAll(' ', '')
+    "
     (click)="addDataViewEmitter.emit(dataView.elementId)"
 >
     <div fxFlex fxLayout="column">