automation: part 2 of fixing flaky tests (#10792)

* add waits to namespace-picker and gitrepo tests * clean up projects/namespace created in cluster dashboard tests and add check for filter * update test to select cattle-fleet-system --------- Co-authored-by: Yonas Berhe <yberhe@Yonass-MacBook-Pro.local>
rancher · Apr 16, 2024 · da4a311 · da4a311
1 parent 14fd8b7
commit da4a311
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/cypress/e2e/tests/pages/explorer/cluster-dashboard.spec.ts b/cypress/e2e/tests/pages/explorer/cluster-dashboard.spec.ts
@@ -190,10 +190,12 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
 
       // create project
       cy.createProject(projName, 'local', userId).then((resp: Cypress.Response<any>) => {
-        const projId = resp.body.id.trim();
+        cy.wrap(resp.body.id.trim()).as('projId');
 
         // create ns
-        cy.createNamespace(nsName, projId);
+        cy.get<string>('@projId').then((projId) => {
+          cy.createNamespace(nsName, projId);
+        });
 
         // create pod
         // eslint-disable-next-line no-return-assign
@@ -217,9 +219,11 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
       .should('have.length.gte', 2);
   });
 
-  after(() => {
+  after(function() {
     if (removePod) {
       cy.deleteRancherResource('v1', `pods/${ nsName }`, `pod-${ podName }`);
+      cy.deleteRancherResource('v1', 'namespaces', `${ nsName }`);
+      cy.deleteRancherResource('v3', 'projects', this.projId);
     }
   });
 });
diff --git a/cypress/e2e/tests/pages/explorer/namespace-picker.spec.ts b/cypress/e2e/tests/pages/explorer/namespace-picker.spec.ts
@@ -23,7 +23,7 @@ describe('Namespace picker', { testIsolation: 'off' }, () => {
   });
 
   it('can filter workloads by project/namespace from the picker dropdown', { tags: ['@explorer', '@adminUser'] }, () => {
-    // Verify 'Namespace: cattle-fleet-local-system' appears once when filtering by Namespace
+    // Verify 'Namespace: cattle-fleet-system' appears once when filtering by Namespace
     // Verify multiple namespaces within Project: System display when filtering by Project
 
     // group workloads by namespace
@@ -38,13 +38,14 @@ describe('Namespace picker', { testIsolation: 'off' }, () => {
     WorkloadsPodsListPagePo.navTo();
     workloadsPodPage.waitForPage();
 
-    // Filter by Namespace: Select 'cattle-fleet-local-system'
+    // Filter by Namespace: Select 'cattle-fleet-system'
     namespacePicker.toggle();
-    namespacePicker.clickOptionByLabel('cattle-fleet-local-system');
-    namespacePicker.isChecked('cattle-fleet-local-system');
+    namespacePicker.getOptions().find('#ns_cattle-fleet-system').should('exist');
+    namespacePicker.clickOptionByLabel('cattle-fleet-system');
+    namespacePicker.isChecked('cattle-fleet-system');
     namespacePicker.closeDropdown();
     workloadsPodPage.sortableTable()
-      .groupElementWithName('cattle-fleet-local-system')
+      .groupElementWithName('cattle-fleet-system')
       .scrollIntoView().should('be.visible')
       .and('have.length', 1);
 
@@ -59,7 +60,7 @@ describe('Namespace picker', { testIsolation: 'off' }, () => {
     namespacePicker.isChecked('Project: System');
     namespacePicker.closeDropdown();
     workloadsPodPage.sortableTable().groupElementWithName('kube-system').scrollIntoView().should('be.visible');
-    workloadsPodPage.sortableTable().groupElementWithName('cattle-fleet-local-system').scrollIntoView().should('be.visible');
+    workloadsPodPage.sortableTable().groupElementWithName('cattle-fleet-system').scrollIntoView().should('be.visible');
   });
 
   it('can select only one of the top 5 resource filters at a time', { tags: ['@explorer', '@adminUser', '@standardUser'] }, () => {

diff --git a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
@@ -79,7 +79,13 @@ describe('Git Repo', { tags: ['@fleet', '@adminUser'] }, () => {
           prefPage.languageDropdownMenu().checkVisible();
           prefPage.languageDropdownMenu().toggle();
           prefPage.languageDropdownMenu().isOpened();
+
+          cy.intercept('PUT', 'v1/userpreferences/*').as(`prefUpdateZhHans`);
           prefPage.languageDropdownMenu().clickOption(2);
+          cy.wait('@prefUpdateZhHans').then(({ response }) => {
+            expect(response?.statusCode).to.eq(200);
+            expect(response?.body.data).to.have.property('locale', 'zh-hans');
+          });
           prefPage.languageDropdownMenu().isClosed();
 
           listPage.goTo();
@@ -100,7 +106,13 @@ describe('Git Repo', { tags: ['@fleet', '@adminUser'] }, () => {
       prefPage.languageDropdownMenu().checkVisible();
       prefPage.languageDropdownMenu().toggle();
       prefPage.languageDropdownMenu().isOpened();
+
+      cy.intercept('PUT', 'v1/userpreferences/*').as(`prefUpdateEnUs`);
       prefPage.languageDropdownMenu().clickOption(1);
+      cy.wait('@prefUpdateEnUs').then(({ response }) => {
+        expect(response?.statusCode).to.eq(200);
+        expect(response?.body.data).to.have.property('locale', 'en-us');
+      });
       prefPage.languageDropdownMenu().isClosed();
 
       const fleetDashboardPage = new FleetDashboardPagePo('_');