Merge pull request #9660 from jrafanie/fix-overvzealous-sharing-common-setup-teardown

Not all the tests in the describe blocks needed restore

Author: Fryguy

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

@@ -273,10 +273,6 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
   });
 
   describe('Validate Parent Tenant operations: Edit, Add Project, Manage Quotas', () => {
-    afterEach(() => {
-      cy.appDbState('restore');
-    });
-
     describe('Validate Edit parent tenant', () => {
       beforeEach(() => {
         cy.toolbar(CONFIG_TOOLBAR_BUTTON, EDIT_TENANT_CONFIG_OPTION);
@@ -313,6 +309,10 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
     });
 
     describe('Validate Add Project to parent tenant', () => {
+      afterEach(() => {
+        cy.appDbState('restore');
+      });
+
       it('Validate Add Project function', () => {
         addProjectToTenant();
       });
@@ -323,6 +323,10 @@ 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,
@@ -341,15 +345,15 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
   });
 
   describe('Validate Child Tenant operations: Add, Edit, Add Project, Manage Quotas', () => {
-    afterEach(() => {
-      cy.appDbState('restore');
-    });
-
     describe('Validate Add child tenant function', () => {
       beforeEach(() => {
         cy.toolbar(CONFIG_TOOLBAR_BUTTON, ADD_CHILD_TENANT_CONFIG_OPTION);
       });
 
+      afterEach(() => {
+        cy.appDbState('restore');
+      });
+
       it('Validate Add child tenant form elements', () => {
         validateFormElements(false);
       });
@@ -400,6 +404,10 @@ 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();
@@ -432,6 +440,10 @@ describe('Automate Tenant form operations: Settings > Application Settings > Acc
         createAndSelectChildTenant();
       });
 
+      afterEach(() => {
+        cy.appDbState('restore');
+      });
+
       it('Validate Add Project function', () => {
         addProjectToTenant();
       });
@@ -449,6 +461,10 @@ 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,