Fix test 155 prevent it for failing (#288)

* Fix test 155 prevent it for failing

Signed-off-by: Satyajit Bulage <[email protected]>

* Added 2.9 validation to if block as suggested

* Updated code based on suggestion

---------

Signed-off-by: Satyajit Bulage <[email protected]>

Author: sbulage

tests/cypress/e2e/unit_tests/p1_fleet.spec.ts

@@ -1258,23 +1258,34 @@ if (!/\/2\.7/.test(Cypress.env('rancher_version')) && !/\/2\.8/.test(Cypress.env
   describe('Test Fleet Resource Count', { tags: '@p1'}, () => {
     qase(155,
       it("Fleet-155: Test clusters resource count is correct", { tags: '@fleet-155' }, () => {
+
         const repoName = 'default-cluster-count-155'
         const branch = "master"
         const path = "simple"
         const repoUrl = "https://github.com/rancher/fleet-examples"
+        let resourceCount = '18 / 18'
+        let multipliedResourceCount = true
+
+        if (/\/2\.10/.test(Cypress.env('rancher_version')) || /\/2\.9/.test(Cypress.env('rancher_version'))) {
+          resourceCount = '6 / 6'
+          multipliedResourceCount = false
+        }
+
+        // Get Default Resources from single cluster before GitRepo.
+        cy.currentClusterResourceCount(dsFirstClusterName);
 
         cy.addFleetGitRepo({ repoName, repoUrl, branch, path });
         cy.clickButton('Create');
-        cy.checkGitRepoStatus(repoName, '1 / 1', '6 / 6');
+        cy.checkGitRepoStatus(repoName, '1 / 1', resourceCount);
 
         // Get the Resource count from GitRepo and store it.
         cy.gitRepoResourceCountAsInteger(repoName, 'fleet-default');
 
-        // Compare Resource count from GitRepo(stored)
-        // with resource count from each downstream cluster.
-        dsAllClusterList.forEach((dsCluster) => {
-          cy.compareClusterResourceCount(dsCluster);
-        })
+        // Get Actual Resources from single cluster by subtracting default resources.
+        cy.actualResourceOnCluster(dsFirstClusterName);
+
+        // Compare Resource count from GitRepo with Cluster resource.
+        cy.compareClusterResourceCount(multipliedResourceCount);
 
         cy.deleteAllFleetRepos();
       })

tests/cypress/support/commands.ts

@@ -783,42 +783,74 @@ Cypress.Commands.add('checkGitRepoAfterUpgrade', (repoName, fleetNamespace='flee
   cy.verifyTableRow(0, /Active|Modified/, repoName);
 });
 
+Cypress.Commands.add('currentClusterResourceCount', (clusterName) => {
+  cy.accesMenuSelection('Continuous Delivery', 'Clusters');
+  cy.contains('.title', 'Clusters').should('be.visible');
+  cy.filterInSearchBox(clusterName);
+  cy.verifyTableRow(0, 'Active', clusterName);
+  cy.get('td.col-link-detail > span').contains(clusterName).click();
+  cy.get("div[primary-color-var='--sizzle-success'] div[class='data compact'] > h1")
+  .invoke('text')
+  .then((clusterResourceCountText) => {
+    // Convert to integer
+    const clusterCurrentResourceCount = parseInt(clusterResourceCountText.trim(), 10);
+    cy.log("Resource count on each cluster is: " + clusterCurrentResourceCount);
+    cy.wrap(clusterCurrentResourceCount).as('clusterCurrentResourceCount');
+  })
+})
+
 Cypress.Commands.add('gitRepoResourceCountAsInteger', (repoName, fleetNamespace='fleet-local') => {
   cy.accesMenuSelection('Continuous Delivery', 'Git Repos');
   cy.fleetNamespaceToggle(fleetNamespace);
   cy.verifyTableRow(0, 'Active', repoName);
   cy.contains(repoName).click()
   cy.get('.primaryheader > h1').contains(repoName).should('be.visible')
 
-  // Get the Resource count text from UI and convert it into integer.
   cy.get("div[data-testid='gitrepo-deployment-summary'] div[class='count']")
   .invoke('text')
-  .then((countText) => {
-    // Add '7' default resource count available on each cluster.
-    const gitRepoResourceCount = parseInt(countText.trim(), 10) + 7;
-    cy.log("GitRepo Resource count is: " + gitRepoResourceCount);
-    cy.wrap(gitRepoResourceCount).as('gitRepoResourceCount');
+  .then((gitRepoResourceCountText) => {
+    const gitRepoTotalResourceCount = parseInt(gitRepoResourceCountText.trim(), 10);
+    cy.log("GitRepo Resource count is: " + gitRepoTotalResourceCount);
+    cy.wrap(gitRepoTotalResourceCount).as('gitRepoTotalResourceCount');
   })
 })
 
-Cypress.Commands.add('compareClusterResourceCount', (clusterName) => {
-  // Check the resource count from each cluster matches with resources created by GitRepo.
+Cypress.Commands.add('actualResourceOnCluster', (clusterName) => {
+// Get Cluster Resources before GitRepo created.
   cy.accesMenuSelection('Continuous Delivery', 'Clusters');
   cy.contains('.title', 'Clusters').should('be.visible');
   cy.filterInSearchBox(clusterName);
   cy.verifyTableRow(0, 'Active', clusterName);
   cy.get('td.col-link-detail > span').contains(clusterName).click();
+  // Get resources from the cluster page after GitRepo install.
+  cy.get("div[primary-color-var='--sizzle-success'] div[class='data compact'] > h1")
+  .invoke('text')
+  .then((clusterResourceCountText) => {
+    const resourceCountOnCluster = parseInt(clusterResourceCountText.trim(), 10);
+    cy.log("Resource count on each cluster is: " + resourceCountOnCluster);
+    cy.get('@clusterCurrentResourceCount').then((clusterCurrentResourceCount) => {
+      // Remove default 6/7 resources from Total resources available
+      // on single cluster after GitRepo install it's resources.
+      const actualResourceOnCluster = resourceCountOnCluster - clusterCurrentResourceCount;
+      cy.wrap(actualResourceOnCluster).as('actualResourceOnCluster');
+    })
+  })
+})
 
+Cypress.Commands.add('compareClusterResourceCount', (multipliedResourceCount=true) => {
   // Get the stored 'gitRepoResourceCount' value and
-  // compare with existing resource count from cluster.
-  cy.get('@gitRepoResourceCount').then((gitRepoResourceCount) => {
-    cy.get("div[primary-color-var='--sizzle-success'] div[class='data compact'] > h1")
-    .invoke('text')
-    .then((clusterResourceCountText) => {
-      // Covert it into integer and then compare with resources created via GitRepo.
-      const resourceCountOnCluster = parseInt(clusterResourceCountText.trim(), 10);
-      cy.log("Resource count on each cluster is: " + resourceCountOnCluster);
-      expect(gitRepoResourceCount).to.equal(resourceCountOnCluster);
+  // Multipy 'actualResourceOnCluster' 3 times because 3 clusters.
+  // Compare final result with the 'gitRepoTotalResourceCount'.
+  cy.get('@actualResourceOnCluster').then((actualResourceOnCluster) => {
+    cy.get('@gitRepoTotalResourceCount').then((gitRepoTotalResourceCount) => {
+      // When 'sameResourceEachCluster' is true then each cluster has 
+      // 'actualResourceOnCluster' is equal to 'gitRepoResourceCount'
+      if (multipliedResourceCount) {
+        expect(gitRepoTotalResourceCount).to.equal(actualResourceOnCluster * 3);
+      }
+      else {
+        expect(gitRepoTotalResourceCount).to.equal(actualResourceOnCluster);
+      }
     })
   })
 })

tests/cypress/support/e2e.ts

@@ -54,9 +54,11 @@ declare global {
       typeIntoCanvasTermnal(textToType: string): Chainable<Element>;
       checkGitRepoAfterUpgrade(repoName: string, fleetNamespace?: string): Chainable<Element>;
       gitRepoResourceCountAsInteger(repoName: string, fleetNamespace?: string): Chainable<Element>;
-      compareClusterResourceCount(clusterName: string): Chainable<Element>;
+      compareClusterResourceCount(multipliedResourceCount: boolean): Chainable<Element>;
       createNewUser(username: string, password: string, role: string, uncheckStandardUser?: boolean): Chainable<Element>;
       addFleetGitRepoNew(repoName: string, repoUrl?: string, branch?: string, path?: string, path2?: string, fleetNamespace?: string, editConfig?: boolean, helmUrlRegex?: string, deployToTarget?: string, tlsOption?: string, tlsCertificate?: string, allowedTargetNamespace?: string): Chainable<Element>;
+      currentClusterResourceCount(clusterName: string): Chainable<Element>;
+      actualResourceOnCluster(clusterName: string): Chainable<Element>;
     }
   }
 }