Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Improve code #38622

Merged
merged 1 commit into from
Jan 15, 2025
Merged

chore: Improve code #38622

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import {
agHelper,
adminSettings as adminSettingsHelper,
homePage,
locators,
assertHelper,
} from "../../../../support/Objects/ObjectsCore";

const {
Expand All @@ -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");
Expand All @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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");
Expand All @@ -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");
Expand Down
Loading