From 6fd0683846fddb03650527c09300b10d9bc29b41 Mon Sep 17 00:00:00 2001
From: Sagar Khalasi <sagar@appsmith.com>
Date: Mon, 13 Jan 2025 15:47:11 +0530
Subject: [PATCH] Improve code

---
 .../AdminSettings/Admin_settings_spec.ts        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.ts
index 4a0cde5e7e84..c250602a91b7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.ts
@@ -3,6 +3,8 @@ import {
   agHelper,
   adminSettings as adminSettingsHelper,
   homePage,
+  locators,
+  assertHelper,
 } from "../../../../support/Objects/ObjectsCore";
 
 const {
@@ -25,6 +27,9 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
   it("1. Should test that settings page is accessible to super user", () => {
     cy.LogOut();
     cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+    agHelper.AssertElementAbsence(locators._loading);
+    assertHelper.AssertDocumentReady();
+    agHelper.WaitUntilEleAppear(adminSettingsHelper._adminSettingsBtn);
     agHelper.GetNClick(adminSettingsHelper._adminSettingsBtn);
     agHelper.AssertURL(adminSettingsHelper.routes.GENERAL);
     cy.wait("@getEnvVariables");
@@ -33,6 +38,8 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
 
   it("2. Should test that settings page is not accessible to normal users", () => {
     cy.LoginFromAPI(Cypress.env("TESTUSERNAME3"), Cypress.env("TESTPASSWORD3"));
+    agHelper.AssertElementAbsence(locators._loading);
+    assertHelper.AssertDocumentReady();
     agHelper.AssertElementAbsence(adminSettingsHelper._adminSettingsBtn);
     agHelper.VisitNAssert(adminSettingsHelper.routes.GENERAL);
     // non super users are redirected to home page
@@ -54,7 +61,9 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
     () => {
       cy.visit("/applications", { timeout: 60000 });
       if (!Cypress.env("AIRGAPPED")) cy.wait("@getAllWorkspaces");
-
+      agHelper.AssertElementAbsence(locators._loading);
+      assertHelper.AssertDocumentReady();
+      agHelper.WaitUntilEleAppear(adminSettingsHelper._adminSettingsBtn);
       agHelper.GetNClick(adminSettingsHelper._adminSettingsBtn);
       cy.wait("@getEnvVariables");
       agHelper.GetNClick(adminsSettings.generalTab);
@@ -199,6 +208,9 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
   it("10. Verify default instance name", () => {
     cy.LogOut();
     cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+    agHelper.AssertElementAbsence(locators._loading);
+    assertHelper.AssertDocumentReady();
+    agHelper.WaitUntilEleAppear(adminSettingsHelper._adminSettingsBtn);
     agHelper.GetNClick(adminSettingsHelper._adminSettingsBtn);
     agHelper.AssertURL(adminSettingsHelper.routes.GENERAL);
     cy.wait("@getEnvVariables");
@@ -213,6 +225,9 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
     () => {
       homePage.LogOutviaAPI();
       cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      agHelper.AssertElementAbsence(locators._loading);
+      assertHelper.AssertDocumentReady();
+      agHelper.WaitUntilEleAppear(adminSettingsHelper._adminSettingsBtn);
       agHelper.VisitNAssert("/applications", "getAllWorkspaces");
       agHelper.GetNClick(adminSettingsHelper._adminSettingsBtn);
       cy.wait("@getEnvVariables");