From 8bfde3875603037bc8eacf79252862c87d91b789 Mon Sep 17 00:00:00 2001
From: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com>
Date: Mon, 13 Mar 2023 07:41:49 +0530
Subject: [PATCH 1/3] chore: fix test on ci

---
 .../ClientSideTests/Onboarding/CreateNewApp_spec.js       | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js
index 448570e43f9..11d7d80a73b 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js
@@ -3,19 +3,11 @@ const guidedTourLocators = require("../../../../locators/GuidedTour.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
 const homePage = require("../../../../locators/HomePage");
 import * as _ from "../../../../support/Objects/ObjectsCore";
-let workspaceName;
 
 describe("Creating new app after discontinuing guided tour should not start the same", function() {
   it("1. Creating new app after discontinuing guided tour should not start the same", function() {
     // Start guided tour
     _.homePage.NavigateToHome();
-    _.agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      workspaceName = "CNAppWorspace" + uid;
-      _.homePage.CreateNewWorkspace(workspaceName);
-      _.homePage.CreateAppInWorkspace(workspaceName); //Since welcome tour always creates app in 1st workspace available
-      _.homePage.NavigateToHome();
-    });
     _.agHelper.Sleep(4000); //Adding only because of the CI failure
     _.dataSources.CloseReconnectDataSourceModal(); // Check if reconnect data source modal is visible and close it
     cy.get(guidedTourLocators.welcomeTour)

From 1bb70361dd1ee57e455a2c8bfa08cd5a6bee0316 Mon Sep 17 00:00:00 2001
From: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com>
Date: Mon, 13 Mar 2023 08:57:34 +0530
Subject: [PATCH 2/3] chore: duplicate steps

---
 .../Onboarding/CreateNewApp_spec.js                | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js
index 11d7d80a73b..be889c9d3c8 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js
@@ -8,19 +8,7 @@ describe("Creating new app after discontinuing guided tour should not start the
   it("1. Creating new app after discontinuing guided tour should not start the same", function() {
     // Start guided tour
     _.homePage.NavigateToHome();
-    _.agHelper.Sleep(4000); //Adding only because of the CI failure
-    _.dataSources.CloseReconnectDataSourceModal(); // Check if reconnect data source modal is visible and close it
-    cy.get(guidedTourLocators.welcomeTour)
-      .click()
-      .wait(2000);
-    _.dataSources.CloseReconnectDataSourceModal(); // Check if reconnect data source modal is visible and close it
-    cy.get("body").then(($ele) => {
-      if ($ele.find(guidedTourLocators.welcomeTour).length) {
-        cy.get(guidedTourLocators.welcomeTour)
-          .click()
-          .wait(2000);
-      }
-    });
+    cy.get(guidedTourLocators.welcomeTour).click();
     _.dataSources.CloseReconnectDataSourceModal(); // Check if reconnect data source modal is visible and close it
 
     cy.get("body").then(($ele) => {

From b8ba541cf38e34296a4037fa413483b14f5fb33c Mon Sep 17 00:00:00 2001
From: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com>
Date: Mon, 13 Mar 2023 11:03:00 +0530
Subject: [PATCH 3/3] chore: remove duplicate click

---
 .../ClientSideTests/Onboarding/CreateNewApp_spec.js      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js
index be889c9d3c8..f7c9d04720e 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Onboarding/CreateNewApp_spec.js
@@ -11,15 +11,6 @@ describe("Creating new app after discontinuing guided tour should not start the
     cy.get(guidedTourLocators.welcomeTour).click();
     _.dataSources.CloseReconnectDataSourceModal(); // Check if reconnect data source modal is visible and close it
 
-    cy.get("body").then(($ele) => {
-      if ($ele.find(guidedTourLocators.startBuilding).length == 0) {
-        cy.get(commonlocators.homeIcon).click({ force: true });
-        cy.get(guidedTourLocators.welcomeTour)
-          .click()
-          .wait(4000);
-      }
-    });
-
     cy.get(guidedTourLocators.startBuilding).should("be.visible");
     // Go back to applications page
     cy.get(commonlocators.homeIcon).click({ force: true });