From c6711067bdf49674bf0332813375ab62735a8d86 Mon Sep 17 00:00:00 2001
From: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Date: Fri, 31 Mar 2023 19:51:16 +0200
Subject: [PATCH] mgr/dashboard: update landing page e2e tests

ignore the region that can vary on different clusters like charts

fixes: https://tracker.ceph.com/issues/59142
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
(cherry picked from commit 1157e3bff978b19573549c1af1a8fac720b678f6)
---
 .../cypress/e2e/ui/dashboard.e2e-spec.ts       | 18 ++++++++++++++++++
 .../e2e/visualTests/dashboard.vrt-spec.ts      |  7 +++++--
 .../dashboard/dashboard-v3.component.html      | 15 ++++++++++-----
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard.e2e-spec.ts
index 6e95c596d0751..43def20e1fdc2 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard.e2e-spec.ts
@@ -1,5 +1,6 @@
 import { IscsiPageHelper } from '../block/iscsi.po';
 import { HostsPageHelper } from '../cluster/hosts.po';
+import { ManagerModulesPageHelper } from '../cluster/mgr-modules.po';
 import { MonitorsPageHelper } from '../cluster/monitors.po';
 import { OSDsPageHelper } from '../cluster/osds.po';
 import { PageHelper } from '../page-helper.po';
@@ -15,6 +16,15 @@ describe('Dashboard Main Page', () => {
   const pools = new PoolPageHelper();
   const monitors = new MonitorsPageHelper();
   const iscsi = new IscsiPageHelper();
+  const mgrmodules = new ManagerModulesPageHelper();
+
+  before(() => {
+    cy.login();
+    mgrmodules.navigateTo();
+    mgrmodules.navigateEdit('dashboard');
+    cy.get('#FEATURE_TOGGLE_DASHBOARD').uncheck();
+    cy.contains('button', 'Update').click();
+  });
 
   beforeEach(() => {
     cy.login();
@@ -121,4 +131,12 @@ describe('Dashboard Main Page', () => {
       });
     }
   });
+
+  after(() => {
+    cy.login();
+    mgrmodules.navigateTo();
+    mgrmodules.navigateEdit('dashboard');
+    cy.get('#FEATURE_TOGGLE_DASHBOARD').click();
+    cy.contains('button', 'Update').click();
+  });
 });
diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/visualTests/dashboard.vrt-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/visualTests/dashboard.vrt-spec.ts
index b83d16d3d86ce..9613dbc85802a 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/visualTests/dashboard.vrt-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/visualTests/dashboard.vrt-spec.ts
@@ -16,7 +16,10 @@ describe('Dashboard Landing Page', () => {
   it('should take screenshot of dashboard landing page', () => {
     login.navigateTo();
     login.doLogin();
-    cy.get('.card-text').should('be.visible');
-    cy.eyesCheckWindow({ tag: 'Dashboard landing page', ignore: { selector: '.card-text' } });
+    cy.get('[aria-label="Details card"]').should('be.visible');
+    cy.get('[aria-label="Status card"]').should('be.visible');
+    cy.get('[aria-label="Inventory card"]').should('be.visible');
+    cy.get('[aria-label="Cluster utilization card"]').should('be.visible');
+    cy.eyesCheckWindow({ tag: 'Dashboard landing page' });
   });
 });
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.html
index 88edeb9ee15e4..94c1435557c11 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.html
@@ -4,7 +4,8 @@
     <cd-card cardTitle="Details"
              i18n-title
              class="col-sm-3 px-3"
-             [ngClass]="{'d-flex': flexHeight}">
+             [ngClass]="{'d-flex': flexHeight}"
+             aria-label="Details card">
       <dl class="ms-4 me-4">
         <dt>FSID</dt>
         <dd>{{ detailsCardData.fsid }}</dd>
@@ -17,7 +18,8 @@
 
     <cd-card cardTitle="Status"
              i18n-title
-             class="col-sm-6 px-3 d-flex">
+             class="col-sm-6 px-3 d-flex"
+             aria-label="Status card">
       <div class="d-flex ms-4 me-4 mb-5 center-content">
         <i *ngIf="healthData.health?.status"
            [ngClass]="[healthData.health.status | healthIcon, icons.large2x]"
@@ -78,7 +80,8 @@
     <cd-card cardTitle="Capacity"
              i18n-title
              class="col-sm-3 px-3"
-             [ngClass]="{'d-flex': flexHeight}">
+             [ngClass]="{'d-flex': flexHeight}"
+             aria-label="Capacity card">
       <ng-container class="ms-4 me-4"
                     *ngIf="capacity && osdSettings">
         <cd-dashboard-pie [data]="{max: capacity.total_bytes, current: capacity.total_used_raw_bytes}"
@@ -93,7 +96,8 @@
     <!-- Inventory Card -->
     <cd-card cardTitle="Inventory"
              i18n-title
-             class="col-sm-3 px-3 d-flex">
+             class="col-sm-3 px-3 d-flex"
+             aria-label="Inventory card">
       <hr>
       <!-- Hosts -->
       <li class="list-group-item">
@@ -181,7 +185,8 @@
 
     <cd-card cardTitle="Cluster utilization"
              i18n-title
-             class="col-sm-9 px-3 d-flex">
+             class="col-sm-9 px-3 d-flex"
+             aria-label="Cluster utilization card">
       <div class="ms-4 me-4 mt-0">
         <cd-dashboard-time-selector (selectedTime)="getPrometheusData($event)">
         </cd-dashboard-time-selector>
-- 
2.39.5