Revert to beforeeach and aftereach

Signed-off-by: Derek Ho <[email protected]>
DarshitChanpura · Apr 22, 2024 · ce4cad7 · ce4cad7
1 parent ce64989
commit ce4cad7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/test/cypress/e2e/multi-datasources/multi_datasources_enabled.spec.js b/test/cypress/e2e/multi-datasources/multi_datasources_enabled.spec.js
@@ -69,7 +69,7 @@ let externalDataSourceUrl;
 let localDataSourceUrl;
 
 describe('Multi-datasources enabled', () => {
-  before(() => {
+  beforeEach(() => {
     deleteAllDataSources();
     localStorage.setItem('opendistro::security::tenant::saved', '""');
     localStorage.setItem('home:newThemeModal:show', 'false');
@@ -82,18 +82,17 @@ describe('Multi-datasources enabled', () => {
     });
   });
 
-  after(() => {
+  afterEach(() => {
+    cy.clearCookies();
     cy.clearAllLocalStorage();
+    cy.clearAllSessionStorage();
     deleteAllDataSources();
   });
 
   it('Checks Get Started Tab', () => {
     // Remote cluster purge cache
     cy.visit(
-      `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/getstarted`,
-      {
-        failOnStatusCode: false,
-      }
+      `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/getstarted`
     );
 
     cy.contains('h1', 'Get started');
@@ -109,9 +108,7 @@ describe('Multi-datasources enabled', () => {
   });
 
   it('Checks Auth Tab', () => {
-    cy.visit(`http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/auth`, {
-      failOnStatusCode: false,
-    });
+    cy.visit(`http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/auth`);
 
     cy.get('.panel-header-count').first().invoke('text').should('contain', '(2)');
   });
@@ -130,10 +127,7 @@ describe('Multi-datasources enabled', () => {
       },
     }).then(() => {
       cy.visit(
-        `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/users`,
-        {
-          failOnStatusCode: false,
-        }
+        `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/users`
       );
 
       cy.get('[data-test-subj="tableHeaderCell_username_0"]').click();
@@ -153,10 +147,7 @@ describe('Multi-datasources enabled', () => {
       },
     }).then(() => {
       cy.visit(
-        `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/permissions`,
-        {
-          failOnStatusCode: false,
-        }
+        `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/permissions`
       );
 
       // Permission exists on the remote data source

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
@@ -97,6 +97,9 @@ if (Cypress.env('LOGIN_AS_ADMIN')) {
     if (Cypress.env('LOGIN_AS_ADMIN')) {
       options.auth = ADMIN_AUTH;
       options.failOnStatusCode = false;
+      options.qs = {
+        security_tenant: 'private',
+      };
     }
     orig(url, options);
   });