fix: fix failed tests because of new dashboard building

JIRA: QA-24456
risk: nonprod

Author: lucydoan

libs/sdk-ui-tests-e2e/cypress/integration/01-sdk-ui-dashboard/dashboardShortenMetricName.spec.ts

@@ -8,31 +8,19 @@ const LEGEND_NAME_CSS = ".series-name";
 const TOOLTIP_TITLE_CSS = ".gd-viz-tooltip-title";
 const dashboard = new Dashboard();
 
-<<<<<<< HEAD
 describe(
     "Dashboard Shorten Metric Name",
     { tags: ["checklist_integrated_tiger", "checklist_integrated_tiger_releng"] },
     () => {
         beforeEach(() => {
             Navigation.visit("dashboard/shorten-metric-name");
+            dashboard.isLoaded();
         });
 
         it("Table should shorten metric name", () => {
             const table = new Widget(0).waitTableLoaded();
-            table.getTable().assertShortenMetricName(496);
+            table.getTable().assertShortenMetricName(504);
         });
-=======
-describe("Dashboard Shorten Metric Name", { tags: ["checklist_integrated_tiger"] }, () => {
-    beforeEach(() => {
-        Navigation.visit("dashboard/shorten-metric-name");
-        dashboard.isLoaded();
-    });
-
-    it("Table should shorten metric name", () => {
-        const table = new Widget(0).waitTableLoaded();
-        table.getTable().assertShortenMetricName(504);
-    });
->>>>>>> 696be18769 (fix: failed tests because of new dashboard building)
 
         it("Column chart should shorten metric name in legend", () => {
             const chart = new Widget(1).waitChartLoaded().getChart();

libs/sdk-ui-tests-e2e/cypress/integration/01-sdk-ui-dashboard/dependentFilters.spec.ts

@@ -17,9 +17,6 @@ const topBar = new TopBar();
 describe("Dependent filter", () => {
     beforeEach(() => {
         Navigation.visit("dashboard/dashboard-dependent-filters");
-<<<<<<< HEAD
-        new Dashboard().waitForDashboardLoaded();
-=======
     });
 
     it("should test parent - child interaction in view mode", { tags: "checklist_integrated_tiger" }, () => {
@@ -243,9 +240,8 @@ describe("Dependent filter", () => {
         regionFilter.isLoaded().open().hasSubtitle("East Coast").hasFilterListSize(4);
         stateFilter.isLoaded().open().hasSubtitle("All").hasFilterListSize(48);
         cityFilter.isLoaded().open().hasSubtitle("All").hasFilterListSize(300);
->>>>>>> 696be18769 (fix: failed tests because of new dashboard building)
     });
-    
+
     it(
         "should test parent - child interaction in view mode",
         { tags: ["checklist_integrated_tiger", "checklist_integrated_tiger_releng"] },

libs/sdk-ui-tests-e2e/cypress/integration/01-sdk-ui-dashboard/pivotTableHasTotalAndSubtotalsOnDashboard.spec.ts

@@ -37,14 +37,13 @@ describe(
     },
 );
 
-<<<<<<< HEAD
 describe(
     "Pivot Table with multi format metrics",
     { tags: ["checklist_integrated_tiger", "checklist_integrated_tiger_releng"] },
     () => {
         it("should render insight with multi format metrics correctly", () => {
             Navigation.visit("dashboard/dashboard-pivot-table-scenario");
-            const table = new Widget(1).waitTableLoaded().getTable();
+            const table = new Widget(0, 1).waitTableLoaded().getTable();
             table.waitLoaded();
             table.hasCellValue(6, 1, "Closed Won");
             table.hasCellValue(6, 2, "██████████");
@@ -65,28 +64,3 @@ describe(
         });
     },
 );
-=======
-describe("Pivot Table with multi format metrics", { tags: ["checklist_integrated_tiger"] }, () => {
-    it("should render insight with multi format metrics correctly", () => {
-        Navigation.visit("dashboard/dashboard-pivot-table-scenario");
-        const table = new Widget(0, 1).waitTableLoaded().getTable();
-        table.waitLoaded();
-        table.hasCellValue(6, 1, "Closed Won");
-        table.hasCellValue(6, 2, "██████████");
-        table.hasCellValue(6, 3, "406");
-        table.hasCellValue(7, 3, "–");
-        table.hasCellValue(6, 4, "▼ 423,451,258.0%");
-        table.hasCellValue(6, 5, "$406.00");
-        table.hasCellValue(6, 6, "<button>1.00</button>");
-        table.hasCellValue(
-            6,
-            7,
-            "100.0% long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long",
-        );
-        table.hasCellValue(6, 8, "406.00 kiểm tra nghiêm khắc");
-        table.scrollTo("center");
-        table.hasCellValue(6, 33, " 8,675,554.99");
-        table.hasCellValue(7, 33, "null value");
-    });
-});
->>>>>>> 696be18769 (fix: failed tests because of new dashboard building)