From 53f78d330c98f803c09a2314397d48f253db0866 Mon Sep 17 00:00:00 2001
From: Nizamudeen A <nia@redhat.com>
Date: Fri, 17 Sep 2021 21:37:09 +0530
Subject: [PATCH] mgr/dashboard: Fix failing config dashboard e2e check

Recently a new osd config has been added in
6ca32bde2e1d0dd58df168126582a570ac09aad6 and this is getting Modified.
So on our dashboard e2e config check which checks for the Modified
filter, this is also coming on the entry. So we need to increase the
count.

Fixes: https://tracker.ceph.com/issues/52649
Signed-off-by: Nizamudeen A <nia@redhat.com>
---
 .../cluster/configuration.e2e-spec.ts         | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts
index f9bc8d43f5d45..d022d59cfa9a2 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts
@@ -31,6 +31,7 @@ describe('Configuration page', () => {
 
     beforeEach(() => {
       configuration.clearTableSearchInput();
+      configuration.getTableCount('found').as('configFound');
     });
 
     after(() => {
@@ -49,14 +50,29 @@ describe('Configuration page', () => {
       );
     });
 
-    it('should show only modified configurations', () => {
+    it('should verify modified filter is applied properly', () => {
+      configuration.filterTable('Modified', 'no');
+      configuration.getTableCount('found').as('unmodifiedConfigs');
+
+      // Modified filter value to yes
       configuration.filterTable('Modified', 'yes');
-      configuration.getTableCount('found').should('eq', 2);
-    });
+      configuration.getTableCount('found').as('modifiedConfigs');
+
+      cy.get('@configFound').then((configFound) => {
+        cy.get('@unmodifiedConfigs').then((unmodifiedConfigs) => {
+          const modifiedConfigs = Number(configFound) - Number(unmodifiedConfigs);
+          configuration.getTableCount('found').should('eq', modifiedConfigs);
+        });
+      });
 
-    it('should hide all modified configurations', () => {
+      // Modified filter value to no
       configuration.filterTable('Modified', 'no');
-      configuration.getTableCount('found').should('gt', 1);
+      cy.get('@configFound').then((configFound) => {
+        cy.get('@modifiedConfigs').then((modifiedConfigs) => {
+          const unmodifiedConfigs = Number(configFound) - Number(modifiedConfigs);
+          configuration.getTableCount('found').should('eq', unmodifiedConfigs);
+        });
+      });
     });
   });
 });