Try final cleanup

Signed-off-by: Derek Ho <dxho@amazon.com>
opensearch-project · Mar 18, 2024 · 3f577d5 · 3f577d5
1 parent d5522d0
commit 3f577d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 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
@@ -14,7 +14,9 @@
  */
 
 const createDataSource = () => {
-  cy.visit('http://localhost:5601/app/management/opensearch-dashboards/dataSources/create');
+  cy.visit('http://localhost:5601/app/management/opensearch-dashboards/dataSources/create', {
+    failOnStatusCode: false,
+  });
   cy.get('[data-test-subj="createDataSourceFormTitleField"]').focus().type('9202');
   cy.get('[data-test-subj="createDataSourceFormEndpointField"]')
     .focus()

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
@@ -91,12 +91,15 @@ Cypress.Commands.add('loginWithSamlMultiauth', () => {
   cy.get('button[id=btn-sign-in]').should('be.visible').click();
 });
 
-Cypress.Commands.overwrite('visit', (orig, url, options = {}) => {
-  if (Cypress.env('LOGIN_AS_ADMIN')) {
-    options.auth = ADMIN_AUTH;
-  }
-  orig(url, options);
-});
+if (Cypress.env('LOGIN_AS_ADMIN')) {
+  // Define custom cy.visit() only if LOGIN_AS_ADMIN is true
+  Cypress.Commands.overwrite('visit', (orig, url, options = {}) => {
+    if (Cypress.env('LOGIN_AS_ADMIN')) {
+      options.auth = ADMIN_AUTH;
+    }
+    orig(url, options);
+  });
+}
 
 Cypress.Commands.add('shortenUrl', (data, tenant) => {
   cy.request({