Rollback the tenant test changes due to timing issue failures

This commit reverts #9660, #9658 and part of #9633.

The database reset in the tenant spec is colliding with another puma thread
that is trying to do an API request at the same time.  We need to ensure the
reset is done in isolation to avoid this test failure that is happening more
than sporadically.

Author: jrafanie

cypress/e2e/ui/Settings/Application-Settings/tenant.cy.js

@@ -202,6 +202,7 @@ function resetParentTenantForm() {
   );
 }
 
+// TODO: Aside from test that validates deletion, replace with a more reliable cleanup mechanism when ready
 function deleteAccordionItems(accordionsToDelete) {
   cy.get(`#${ACCESS_CONTROL_ACCORDION_ITEM_ID} li.list-group-item`).each(
     (item) => {
@@ -260,6 +261,28 @@ function editQuotasTable(quotaName = ALLOCATED_STORAGE_QUOTA, quotaValue) {
   });
 }
 
+function rollbackQuotas() {
+  cy.toolbar(CONFIG_TOOLBAR_BUTTON, MANAGE_QUOTAS_CONFIG_OPTION);
+  let quotaDisabled = false;
+  cy.get('#rbac_details .miq-data-table table tbody tr').each((row) => {
+    const quotaValueInputWrapper = row.find('div.bx--text-input-wrapper');
+    const isEnabled = !quotaValueInputWrapper.hasClass(
+      'bx--text-input-wrapper--readonly'
+    );
+    if (isEnabled) {
+      quotaDisabled = true;
+      cy.wrap(row).find('span.bx--toggle__switch').click();
+    }
+  });
+  // Save the form only if any quotas are reverted to disabled.
+  cy.then(() => {
+    if (quotaDisabled) {
+      // Saving the form
+      saveFormWithOptionalFlashCheck({ assertFlashMessage: false });
+    }
+  });
+}
+
 describe('Automate Tenant form operations: Settings > Application Settings > Access Control > Tenants', () => {
   beforeEach(() => {
     cy.login();
@@ -278,10 +301,6 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         cy.toolbar(CONFIG_TOOLBAR_BUTTON, EDIT_TENANT_CONFIG_OPTION);
       });
 
-      afterEach(() => {
-        confirmUiNavigation(() => resetParentTenantForm());
-      });
-
       it('Validate Edit tenant form elements', () => {
         validateFormElements();
       });
@@ -306,27 +325,27 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         );
         saveFormWithOptionalFlashCheck({ apiMethod: 'PUT' });
       });
-    });
 
-    describe('Validate Add Project to parent tenant', () => {
       afterEach(() => {
-        cy.appDbState('restore');
+        confirmUiNavigation(() => resetParentTenantForm());
       });
+    });
 
+    describe('Validate Add Project to parent tenant', () => {
       it('Validate Add Project function', () => {
         addProjectToTenant();
       });
+
+      afterEach(() => {
+        confirmUiNavigation(() => deleteAccordionItems([PROJECT_NAME_VALUE]));
+      });
     });
 
     describe('Validate Manage Quotas in parent tenant', () => {
       beforeEach(() => {
         cy.toolbar(CONFIG_TOOLBAR_BUTTON, MANAGE_QUOTAS_CONFIG_OPTION);
       });
 
-      afterEach(() => {
-        cy.appDbState('restore');
-      });
-
       it('Validate Reset & Cancel buttons in Manage Quotas form', () => {
         cy.getFormFooterButtonByTypeWithText({
           buttonText: RESET_BUTTON_TEXT,
@@ -341,6 +360,10 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         editQuotasTable(ALLOCATED_STORAGE_QUOTA, '10');
         saveFormWithOptionalFlashCheck();
       });
+
+      afterEach(() => {
+        confirmUiNavigation(() => rollbackQuotas());
+      });
     });
   });
 
@@ -350,10 +373,6 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         cy.toolbar(CONFIG_TOOLBAR_BUTTON, ADD_CHILD_TENANT_CONFIG_OPTION);
       });
 
-      afterEach(() => {
-        cy.appDbState('restore');
-      });
-
       it('Validate Add child tenant form elements', () => {
         validateFormElements(false);
       });
@@ -396,6 +415,12 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         );
         cancelFormWithOptionalFlashCheck(false);
       });
+
+      afterEach(() => {
+        confirmUiNavigation(() =>
+          deleteAccordionItems([INITIAL_CHILD_TENANT_NAME])
+        );
+      });
     });
 
     describe('Validate Edit child tenant', () => {
@@ -404,10 +429,6 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         cy.toolbar(CONFIG_TOOLBAR_BUTTON, EDIT_TENANT_CONFIG_OPTION);
       });
 
-      afterEach(() => {
-        cy.appDbState('restore');
-      });
-
       it('Validate Edit child tenant form elements', () => {
         validateFormElements();
         cancelFormWithOptionalFlashCheck();
@@ -433,17 +454,20 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         );
         saveFormWithOptionalFlashCheck({ apiMethod: 'PUT' });
       });
+
+      afterEach(() => {
+        deleteAccordionItems([
+          INITIAL_CHILD_TENANT_NAME,
+          EDITED_TENANT_NAME_VALUE,
+        ]);
+      });
     });
 
     describe('Validate Add Project to child tenant', () => {
       beforeEach(() => {
         createAndSelectChildTenant();
       });
 
-      afterEach(() => {
-        cy.appDbState('restore');
-      });
-
       it('Validate Add Project function', () => {
         addProjectToTenant();
       });
@@ -453,6 +477,13 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         deleteAccordionItems([INITIAL_CHILD_TENANT_NAME]);
         cy.expect_flash(flashClassMap.error, FLASH_MESSAGE_CANT_DELETE);
       });
+
+      afterEach(() => {
+        confirmUiNavigation(() => {
+          deleteAccordionItems([PROJECT_NAME_VALUE]);
+          deleteAccordionItems([INITIAL_CHILD_TENANT_NAME]);
+        });
+      });
     });
 
     describe('Validate Manage Quotas in child tenant', () => {
@@ -461,10 +492,6 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         cy.toolbar(CONFIG_TOOLBAR_BUTTON, MANAGE_QUOTAS_CONFIG_OPTION);
       });
 
-      afterEach(() => {
-        cy.appDbState('restore');
-      });
-
       it('Validate Reset & Cancel buttons in Manage Quotas form', () => {
         cy.getFormFooterButtonByTypeWithText({
           buttonText: RESET_BUTTON_TEXT,
@@ -479,6 +506,12 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         editQuotasTable(ALLOCATED_VM_QUOTA, '10');
         saveFormWithOptionalFlashCheck();
       });
+
+      afterEach(() => {
+        confirmUiNavigation(() => {
+          deleteAccordionItems([INITIAL_CHILD_TENANT_NAME]);
+        });
+      });
     });
   });
 });