From eaf4dbd2611d7d249bfa8466ebefc2e06c031541 Mon Sep 17 00:00:00 2001
From: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com>
Date: Thu, 8 Oct 2020 20:13:20 +0530
Subject: [PATCH] Fix datasource structure test (#1080)

* Fix datasource structure test

* Dummy commit
---
 .../Entity_Explorer_Datasource_Structure_spec.js             | 5 +++--
 app/client/cypress/support/commands.js                       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
index 4146404a6a..587af0cba4 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
@@ -59,7 +59,6 @@ describe("Entity explorer datasource structure", function() {
       .find(explorer.collapse)
       .as("datasourceEntityCollapse");
 
-    cy.get("@datasourceEntityCollapse").click();
     cy.wait("@getDatasourceStructure").should(
       "have.nested.property",
       "response.body.responseMeta.status",
@@ -90,7 +89,9 @@ describe("Entity explorer datasource structure", function() {
     );
 
     cy.GlobalSearchEntity(datasourceName);
-    cy.get("@datasourceEntityCollapse").click();
+    cy.get("@datasourceEntityCollapse")
+      .first()
+      .click();
     cy.xpath(explorer.datsourceEntityPopover)
       .last()
       .click({ force: true });
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 0fc05ab64c..a92fcf341d 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -1322,8 +1322,8 @@ Cypress.Commands.add("saveDatasource", () => {
 });
 
 Cypress.Commands.add("testSaveDatasource", () => {
-  cy.testDatasource();
   cy.saveDatasource();
+  cy.testDatasource();
 });
 
 Cypress.Commands.add("fillMongoDatasourceForm", () => {