From 280a0b8aa2885e2353de4727b2f4decff7adfaad Mon Sep 17 00:00:00 2001
From: Yulong Ruan <ruanyl@amazon.com>
Date: Wed, 28 Feb 2024 05:06:06 +0800
Subject: [PATCH] fixed failed discover app shared links tests (#1079)

1. refactor so that each test case is indepent from each other
2. use decodeURI to make url consistent so that the url matches

Signed-off-by: Yulong Ruan <ruanyl@amazon.com>
---
 .../apps/data_explorer/shared_links.spec.js   | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/shared_links.spec.js b/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/shared_links.spec.js
index 2adbfcdbb..90c137a72 100644
--- a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/shared_links.spec.js
+++ b/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/shared_links.spec.js
@@ -43,16 +43,19 @@ describe('shared links', () => {
     cy.setAdvancedSetting({
       defaultIndex: 'logstash-*',
     });
-
-    miscUtils.visitPage('app/data-explorer/discover#/');
-    cy.waitForLoader();
-    cy.setTopNavDate(DE_DEFAULT_START_TIME, DE_DEFAULT_END_TIME);
-    cy.waitForSearch();
   });
 
   describe('shared links with state in query', () => {
+    beforeEach(() => {
+      CURRENT_TENANT.newTenant = 'global';
+      miscUtils.visitPage('app/data-explorer/discover#/');
+      cy.waitForLoader();
+      cy.setTopNavDate(DE_DEFAULT_START_TIME, DE_DEFAULT_END_TIME);
+      cy.waitForSearch();
+    });
+
     it('should allow for copying the snapshot URL', function () {
-      const url = `http://localhost:5601/app/data-explorer/discover#/?_a=(discover:(columns:!(_source),isDirty:!f,sort:!()),metadata:(indexPattern:'logstash-*',view:discover))&_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2015-09-19T13:31:44.000Z',to:'2015-09-24T01:31:44.000Z'))&_q=(filters:!(),query:(language:kuery,query:''))`;
+      const url = `http://localhost:5601/app/data-explorer/discover?security_tenant=global#/?_a=(discover:(columns:!(_source),isDirty:!f,sort:!()),metadata:(indexPattern:'logstash-*',view:discover))&_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2015-09-19T13:31:44.000Z',to:'2015-09-24T01:31:44.000Z'))&_q=(filters:!(),query:(language:kuery,query:''))`;
       cy.getElementByTestId('shareTopNavButton').should('be.visible').click();
       cy.getElementByTestId('copyShareUrlButton')
         .invoke('attr', 'data-share-url')
@@ -64,6 +67,7 @@ describe('shared links', () => {
     });
 
     it('should allow for copying the snapshot URL as a short URL', function () {
+      cy.getElementByTestId('shareTopNavButton').should('be.visible').click();
       cy.getElementByTestId('useShortUrl')
         .should('be.visible')
         .invoke('attr', 'aria-checked', 'true');
@@ -74,9 +78,11 @@ describe('shared links', () => {
     });
 
     it('should allow for copying the saved object URL', function () {
-      const url =
-        'http://localhost:5601/app/data-explorer/discover/#/view/ab12e3c0-f231-11e6-9486-733b1ac9221a?_g=%28filters%3A%21%28%29%2CrefreshInterval%3A%28pause%3A%21t%2Cvalue%3A0%29%2Ctime%3A%28from%3A%272015-09-19T13%3A31%3A44.000Z%27%2Cto%3A%272015-09-24T01%3A31%3A44.000Z%27%29%29';
+      const url = decodeURI(
+        'http://localhost:5601/app/data-explorer/discover/#/view/ab12e3c0-f231-11e6-9486-733b1ac9221a?_g=%28filters%3A%21%28%29%2CrefreshInterval%3A%28pause%3A%21t%2Cvalue%3A0%29%2Ctime%3A%28from%3A%272015-09-19T13%3A31%3A44.000Z%27%2Cto%3A%272015-09-24T01%3A31%3A44.000Z%27%29%29'
+      );
 
+      cy.getElementByTestId('shareTopNavButton').should('be.visible').click();
       cy.getElementByTestId('exportAsSavedObject')
         .get('.euiRadio__input')
         .should('be.disabled');
@@ -101,7 +107,10 @@ describe('shared links', () => {
       cy.setAdvancedSetting({
         'state:storeInSessionStorage': true,
       });
+    });
 
+    beforeEach(() => {
+      CURRENT_TENANT.newTenant = 'global';
       miscUtils.visitPage('app/data-explorer/discover#/');
       cy.waitForLoader();
       cy.setTopNavDate(DE_DEFAULT_START_TIME, DE_DEFAULT_END_TIME);
@@ -125,6 +134,7 @@ describe('shared links', () => {
     });
 
     it('should allow for copying the snapshot URL as a short URL', function () {
+      cy.getElementByTestId('shareTopNavButton').should('be.visible').click();
       cy.getElementByTestId('useShortUrl').should('be.visible').click();
       cy.getElementByTestId('copyShareUrlButton')
         .invoke('attr', 'data-share-url')
@@ -135,6 +145,7 @@ describe('shared links', () => {
     });
 
     it('should allow for copying the saved object URL', function () {
+      cy.getElementByTestId('shareTopNavButton').should('be.visible').click();
       cy.getElementByTestId('exportAsSavedObject')
         .get('.euiRadio__input')
         .should('be.disabled');