Restructured after hooks

Author: asirvadAbrahamVarghese

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

@@ -193,7 +193,6 @@ describe('Automate Collect logs Edit form operations', () => {
   beforeEach(() => {
     registeredApiIntercepts = {};
     cy.login();
-    cy.wait(500);
     // Navigate to Application settings and Select Diagnostics
     cy.menu(settingsMenuOption, appSettingsMenuOption);
     interceptAndAwaitApi({
@@ -229,20 +228,19 @@ describe('Automate Collect logs Edit form operations', () => {
     });
 
     after(() => {
-      cy?.url()?.then((url) => {
-        // Ensures navigation to Settings -> Application-Settings in the UI
-        if (url?.includes(componentRouteUrl)) {
+      cy.url()
+        ?.then((url) => {
+          // Ensures navigation to Settings -> Application-Settings in the UI
+          if (!url?.includes(componentRouteUrl)) {
+            // Navigate to Settings -> Application-Settings before cleanup
+            cy.menu(settingsMenuOption, appSettingsMenuOption);
+          }
+        })
+        .then(() => {
           resetProtocolDropdown({
             currentApiIntercepts: registeredApiIntercepts,
           });
-        } else {
-          // Navigate to Settings -> Application-Settings before selecting Diagnostics
-          cy.menu(settingsMenuOption, appSettingsMenuOption);
-          resetProtocolDropdown({
-            currentApiIntercepts: registeredApiIntercepts,
-          });
-        }
-      });
+        });
     });
   });
 
@@ -274,22 +272,20 @@ describe('Automate Collect logs Edit form operations', () => {
     });
 
     after(() => {
-      cy?.url()?.then((url) => {
-        // Ensures navigation to Settings -> Application-Settings in the UI
-        if (url?.includes(componentRouteUrl)) {
+      cy.url()
+        ?.then((url) => {
+          // Ensures navigation to Settings -> Application-Settings in the UI
+          if (!url?.includes(componentRouteUrl)) {
+            // Navigate to Settings -> Application-Settings before cleanup
+            cy.menu(settingsMenuOption, appSettingsMenuOption);
+          }
+        })
+        .then(() => {
           resetProtocolDropdown({
             currentApiIntercepts: registeredApiIntercepts,
             selectServerListItem: false,
           });
-        } else {
-          // Navigate to Settings -> Application-Settings before selecting Diagnostics
-          cy.menu(settingsMenuOption, appSettingsMenuOption);
-          resetProtocolDropdown({
-            currentApiIntercepts: registeredApiIntercepts,
-            selectServerListItem: false,
-          });
-        }
-      });
+        });
     });
   });
 });