From ea4f5b3039d00b80eabbcfadbd4adb75cd49fea8 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Tue, 3 Sep 2024 16:48:15 +0530 Subject: [PATCH 01/10] Fix test case for api --- .../ServerSide/ApiTests/API_All_Verb_spec.js | 17 +++++++++++++++++ app/client/cypress/limited-tests.txt | 4 +++- app/client/cypress/locators/ApiEditor.js | 1 + app/client/cypress/support/ApiCommands.js | 11 ++++++++--- .../cypress/support/Pages/AggregateHelper.ts | 10 ++++++++++ 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js index e16c4acebbd9..a128c333d720 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js @@ -44,6 +44,8 @@ describe( testdata.baseUrl, testdata.echoMethod, testdata.Put, + false, + 0 ); }); cy.ResponseCheck("updatedAt"); @@ -68,6 +70,8 @@ describe( testdata.baseUrl, testdata.echoMethod, testdata.Post, + false, + 0 ); }); cy.ResponseCheck("createdAt"); @@ -92,6 +96,8 @@ describe( testdata.baseUrl, testdata.echoMethod, testdata.Patch, + false, + 0 ); }); cy.ResponseCheck("updatedAt"); @@ -116,6 +122,8 @@ describe( testdata.baseUrl, testdata.echoMethod, testdata.Delete, + false, + 0 ); }); }); @@ -132,6 +140,8 @@ describe( testdata.baseUrl, testdata.methods, testdata.Get, + false, + 0 ); apiPage.SelectPaneTab("Pagination"); @@ -149,6 +159,8 @@ describe( testdata.baseUrl, testdata.next, testdata.Get, + false, + 0 ); apiPage.SelectPaneTab("Pagination"); @@ -165,6 +177,8 @@ describe( testdata.baseUrl, testdata.prev, testdata.Get, + false, + 0 ); }); @@ -179,6 +193,8 @@ describe( testdata.baseUrl, testdata.queryAndValue, testdata.Get, + false, + 0 ); }); @@ -194,6 +210,7 @@ describe( testdata.methods, testdata.Get, true, + 0 ); cy.ResponseCheck("Invalid value for Content-Type"); }); diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 31c0c0253fef..779713877aff 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,7 @@ # To run only limited tests - give the spec names in below format: -cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js +cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js +cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* diff --git a/app/client/cypress/locators/ApiEditor.js b/app/client/cypress/locators/ApiEditor.js index 1e852c6ad114..a88e33469058 100644 --- a/app/client/cypress/locators/ApiEditor.js +++ b/app/client/cypress/locators/ApiEditor.js @@ -34,4 +34,5 @@ export default { slashCommandButton: ".commands-button", apiResponseObject: ".object-key", apiDebuggerLink: ".debugger-entity-link", + apiLogResultPointer : "div.debugger-list div.cursor-pointer button div", }; diff --git a/app/client/cypress/support/ApiCommands.js b/app/client/cypress/support/ApiCommands.js index 9c24c425d32a..1c72dcd52d63 100644 --- a/app/client/cypress/support/ApiCommands.js +++ b/app/client/cypress/support/ApiCommands.js @@ -85,13 +85,18 @@ Cypress.Commands.add("SaveAndRunAPI", () => { Cypress.Commands.add( "validateRequest", - (apiName, baseurl, path, verb, error = false) => { + (apiName, baseurl, path, verb, error = false, index = 0) => { cy.get(".ads-v2-tabs__list").contains("Logs").click(); cy.get("[data-testid=t--debugger-search]").clear().type(apiName); agHelper.PressEnter(2000); if (!error) { - cy.get(ApiEditor.apiResponseObject).last().contains("request").click(); - } + agHelper.IsElementVisibleWithEq(ApiEditor.apiResponseObject, index).then(isVisible => { + if (!isVisible) { + agHelper.GetNClick(ApiEditor.apiLogResultPointer, index, true); + } + cy.get(ApiEditor.apiResponseObject).last().contains("request").click(); + }); + } cy.get(".string-value").contains(baseurl.concat(path)); cy.get(".string-value").contains(verb); cy.get("[data-testid=t--tab-response]").first().click({ force: true }); diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index 4ddff74eb6cd..9ddc97c2529f 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -1552,6 +1552,16 @@ export class AggregateHelper { ) as Cypress.Chainable; } + IsElementVisibleWithEq(selector: ElementType, eq: number = 0) { + return this.GetElement(selector) + .eq(eq) + .then(($element) => { + const isVisible = Cypress.$($element).length > 0 ? true : false; + console.log(`Element visibility: ${isVisible}`); + return isVisible; + }) as Cypress.Chainable; + } + public FailIfErrorToast(error: string) { cy.get("body").then(($ele) => { if ($ele.find(this.locator._toastMsg).length > 0) { From 402b55619b861d37f06316e8e92de91ea2c59dd4 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Tue, 3 Sep 2024 22:38:11 +0530 Subject: [PATCH 02/10] Updated the code --- app/client/cypress/support/ApiCommands.js | 2 +- app/client/cypress/support/Pages/AggregateHelper.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/support/ApiCommands.js b/app/client/cypress/support/ApiCommands.js index 1c72dcd52d63..fa0dc9410409 100644 --- a/app/client/cypress/support/ApiCommands.js +++ b/app/client/cypress/support/ApiCommands.js @@ -94,8 +94,8 @@ Cypress.Commands.add( if (!isVisible) { agHelper.GetNClick(ApiEditor.apiLogResultPointer, index, true); } - cy.get(ApiEditor.apiResponseObject).last().contains("request").click(); }); + cy.get(ApiEditor.apiResponseObject).last().contains("request").click(); } cy.get(".string-value").contains(baseurl.concat(path)); cy.get(".string-value").contains(verb); diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index 9ddc97c2529f..80706d8fb40d 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -1556,7 +1556,8 @@ export class AggregateHelper { return this.GetElement(selector) .eq(eq) .then(($element) => { - const isVisible = Cypress.$($element).length > 0 ? true : false; + // Check if the element is present and visible + const isVisible = Cypress.$($element).length > 0 && Cypress.$($element).is(':visible'); console.log(`Element visibility: ${isVisible}`); return isVisible; }) as Cypress.Chainable; From a0c3bced73408f2ef0f90914ebd26e794075f0ae Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Wed, 4 Sep 2024 17:40:01 +0530 Subject: [PATCH 03/10] removed unwanted code --- .../ServerSide/ApiTests/API_All_Verb_spec.js | 97 +++++-------------- app/client/cypress/limited-tests.txt | 2 - app/client/cypress/locators/ApiEditor.js | 2 +- app/client/cypress/support/ApiCommands.js | 5 - 4 files changed, 25 insertions(+), 81 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js index a128c333d720..628b1e086a1a 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js @@ -12,6 +12,7 @@ import { dataSources, entityItems, } from "../../../../support/Objects/ObjectsCore"; +import ApiEditor from "../../../../locators/ApiEditor"; describe( "API Panel Test Functionality", @@ -39,14 +40,12 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); - cy.validateRequest( - "Executed successfully", - testdata.baseUrl, - testdata.echoMethod, - testdata.Put, - false, - 0 - ); + // agHelper.GetNAssertContains( + // ApiEditor. + // "Executed successfully from user request", + // ); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.AssertContains("Executed successfully from user request"); }); cy.ResponseCheck("updatedAt"); }); @@ -65,14 +64,8 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); - cy.validateRequest( - "Executed successfully", - testdata.baseUrl, - testdata.echoMethod, - testdata.Post, - false, - 0 - ); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.AssertContains("Executed successfully from user request"); }); cy.ResponseCheck("createdAt"); }); @@ -91,14 +84,8 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); - cy.validateRequest( - "Executed successfully", - testdata.baseUrl, - testdata.echoMethod, - testdata.Patch, - false, - 0 - ); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.AssertContains("Executed successfully from user request"); }); cy.ResponseCheck("updatedAt"); }); @@ -117,14 +104,8 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); - cy.validateRequest( - "Executed successfully", - testdata.baseUrl, - testdata.echoMethod, - testdata.Delete, - false, - 0 - ); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.AssertContains("Executed successfully from user request"); }); }); @@ -135,14 +116,8 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext); - cy.validateRequest( - "Executed successfully", - testdata.baseUrl, - testdata.methods, - testdata.Get, - false, - 0 - ); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.AssertContains("Executed successfully from user request"); apiPage.SelectPaneTab("Pagination"); agHelper.GetNClick(apiwidget.paginationWithUrl); @@ -154,14 +129,8 @@ describe( cy.clickTest(apiwidget.TestNextUrl); apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck("Josh M Krantz"); - cy.validateRequest( - "Executed successfully", - testdata.baseUrl, - testdata.next, - testdata.Get, - false, - 0 - ); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.AssertContains("Executed successfully from user request"); apiPage.SelectPaneTab("Pagination"); cy.enterUrl( @@ -172,14 +141,8 @@ describe( cy.clickTest(apiwidget.TestPreUrl); apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext); - cy.validateRequest( - "Executed successfully", - testdata.baseUrl, - testdata.prev, - testdata.Get, - false, - 0 - ); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.AssertContains("Executed successfully from user request"); }); it("6. API check with query params test API feature", function () { @@ -188,14 +151,8 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext3); - cy.validateRequest( - "Executed successfully", - testdata.baseUrl, - testdata.queryAndValue, - testdata.Get, - false, - 0 - ); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.AssertContains("Executed successfully from user request"); }); it("7. API check with Invalid Header", function () { @@ -204,15 +161,9 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(false); apiPage.ResponseStatusCheck("5000"); - cy.validateRequest( - "Execution failed", - testdata.baseUrl, - testdata.methods, - testdata.Get, - true, - 0 - ); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.AssertContains("Executed successfully from user request"); cy.ResponseCheck("Invalid value for Content-Type"); }); }, -); +); \ No newline at end of file diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 779713877aff..2496eace6429 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,7 +1,5 @@ # To run only limited tests - give the spec names in below format: cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js -cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js -cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* diff --git a/app/client/cypress/locators/ApiEditor.js b/app/client/cypress/locators/ApiEditor.js index a88e33469058..9340b355d441 100644 --- a/app/client/cypress/locators/ApiEditor.js +++ b/app/client/cypress/locators/ApiEditor.js @@ -34,5 +34,5 @@ export default { slashCommandButton: ".commands-button", apiResponseObject: ".object-key", apiDebuggerLink: ".debugger-entity-link", - apiLogResultPointer : "div.debugger-list div.cursor-pointer button div", + apiResponseTabsList : ".ads-v2-tabs__list" }; diff --git a/app/client/cypress/support/ApiCommands.js b/app/client/cypress/support/ApiCommands.js index fa0dc9410409..9ce4609e7c47 100644 --- a/app/client/cypress/support/ApiCommands.js +++ b/app/client/cypress/support/ApiCommands.js @@ -90,11 +90,6 @@ Cypress.Commands.add( cy.get("[data-testid=t--debugger-search]").clear().type(apiName); agHelper.PressEnter(2000); if (!error) { - agHelper.IsElementVisibleWithEq(ApiEditor.apiResponseObject, index).then(isVisible => { - if (!isVisible) { - agHelper.GetNClick(ApiEditor.apiLogResultPointer, index, true); - } - }); cy.get(ApiEditor.apiResponseObject).last().contains("request").click(); } cy.get(".string-value").contains(baseurl.concat(path)); From 0afea037b9a49456ff83472bfee1844f2b61b558 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Wed, 4 Sep 2024 17:42:08 +0530 Subject: [PATCH 04/10] revered the change --- app/client/cypress/support/ApiCommands.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/support/ApiCommands.js b/app/client/cypress/support/ApiCommands.js index 9ce4609e7c47..9c24c425d32a 100644 --- a/app/client/cypress/support/ApiCommands.js +++ b/app/client/cypress/support/ApiCommands.js @@ -85,13 +85,13 @@ Cypress.Commands.add("SaveAndRunAPI", () => { Cypress.Commands.add( "validateRequest", - (apiName, baseurl, path, verb, error = false, index = 0) => { + (apiName, baseurl, path, verb, error = false) => { cy.get(".ads-v2-tabs__list").contains("Logs").click(); cy.get("[data-testid=t--debugger-search]").clear().type(apiName); agHelper.PressEnter(2000); if (!error) { cy.get(ApiEditor.apiResponseObject).last().contains("request").click(); - } + } cy.get(".string-value").contains(baseurl.concat(path)); cy.get(".string-value").contains(verb); cy.get("[data-testid=t--tab-response]").first().click({ force: true }); From 627883139a12d7fd580deaf235b099f1ea69ca4d Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Wed, 4 Sep 2024 17:44:14 +0530 Subject: [PATCH 05/10] Removed comment --- .../e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js index 628b1e086a1a..c49722505ba0 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js @@ -40,10 +40,6 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); - // agHelper.GetNAssertContains( - // ApiEditor. - // "Executed successfully from user request", - // ); agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); }); From 4892b04cd07aa89329b3b8c7fd76792e356f38ea Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Wed, 4 Sep 2024 19:10:18 +0530 Subject: [PATCH 06/10] Removed limited test file --- .../ServerSide/ApiTests/API_All_Verb_spec.js | 18 +++++++++--------- app/client/cypress/limited-tests.txt | 2 +- .../cypress/support/Pages/AggregateHelper.ts | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js index c49722505ba0..91f1396adfc3 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js @@ -41,7 +41,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains("Executed successfully from user request"); }); cy.ResponseCheck("updatedAt"); }); @@ -61,7 +61,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains("Executed successfully from user request"); }); cy.ResponseCheck("createdAt"); }); @@ -81,7 +81,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains("Executed successfully from user request"); }); cy.ResponseCheck("updatedAt"); }); @@ -101,7 +101,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains("Executed successfully from user request"); }); }); @@ -113,7 +113,7 @@ describe( apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext); agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains("Executed successfully from user request"); apiPage.SelectPaneTab("Pagination"); agHelper.GetNClick(apiwidget.paginationWithUrl); @@ -126,7 +126,7 @@ describe( apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck("Josh M Krantz"); agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains("Executed successfully from user request"); apiPage.SelectPaneTab("Pagination"); cy.enterUrl( @@ -138,7 +138,7 @@ describe( apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext); agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains("Executed successfully from user request"); }); it("6. API check with query params test API feature", function () { @@ -148,7 +148,7 @@ describe( apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext3); agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains("Executed successfully from user request"); }); it("7. API check with Invalid Header", function () { @@ -157,7 +157,7 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(false); apiPage.ResponseStatusCheck("5000"); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); cy.ResponseCheck("Invalid value for Content-Type"); }); diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 2496eace6429..31c0c0253fef 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,5 @@ # To run only limited tests - give the spec names in below format: -cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index 80706d8fb40d..66ab17809842 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -1557,7 +1557,8 @@ export class AggregateHelper { .eq(eq) .then(($element) => { // Check if the element is present and visible - const isVisible = Cypress.$($element).length > 0 && Cypress.$($element).is(':visible'); + const isVisible = + Cypress.$($element).length > 0 && Cypress.$($element).is(":visible"); console.log(`Element visibility: ${isVisible}`); return isVisible; }) as Cypress.Chainable; From 56a05183a583f6d39e4b1a2a9e3be287196924de Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Wed, 4 Sep 2024 19:24:51 +0530 Subject: [PATCH 07/10] Updated file with format --- .../ServerSide/ApiTests/API_All_Verb_spec.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js index 91f1396adfc3..e8148a75be4e 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js @@ -1,6 +1,6 @@ import { AppSidebarButton, - AppSidebar, + AppSidebar } from "../../../../support/Pages/EditorNavigation"; const testdata = require("../../../../fixtures/testdata.json"); @@ -10,9 +10,9 @@ import { agHelper, apiPage, dataSources, - entityItems, + entityItems } from "../../../../support/Objects/ObjectsCore"; -import ApiEditor from "../../../../locators/ApiEditor"; +import apiLocators from "../../../../locators/apiLocators"; describe( "API Panel Test Functionality", @@ -40,7 +40,7 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); }); cy.ResponseCheck("updatedAt"); @@ -60,7 +60,7 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); }); cy.ResponseCheck("createdAt"); @@ -80,7 +80,7 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); }); cy.ResponseCheck("updatedAt"); @@ -100,7 +100,7 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); }); }); @@ -112,7 +112,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); apiPage.SelectPaneTab("Pagination"); @@ -125,7 +125,7 @@ describe( cy.clickTest(apiwidget.TestNextUrl); apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck("Josh M Krantz"); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); apiPage.SelectPaneTab("Pagination"); @@ -137,7 +137,7 @@ describe( cy.clickTest(apiwidget.TestPreUrl); apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); }); @@ -147,7 +147,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext3); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); }); @@ -157,7 +157,7 @@ describe( agHelper.AssertAutoSave(); apiPage.RunAPI(false); apiPage.ResponseStatusCheck("5000"); - agHelper.GetNClickByContains(ApiEditor.apiResponseTabsList, "Logs"); + agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); agHelper.AssertContains("Executed successfully from user request"); cy.ResponseCheck("Invalid value for Content-Type"); }); From 21c2795a33d0a1a45985b62856b5f469b28dcec5 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Wed, 4 Sep 2024 19:53:59 +0530 Subject: [PATCH 08/10] Fixed the prettier error --- .../Regression/ServerSide/ApiTests/API_All_Verb_spec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js index e8148a75be4e..55696e892b8c 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js @@ -1,18 +1,18 @@ import { AppSidebarButton, - AppSidebar + AppSidebar, } from "../../../../support/Pages/EditorNavigation"; const testdata = require("../../../../fixtures/testdata.json"); const apiwidget = require("../../../../locators/apiWidgetslocator.json"); +import apiLocators from "../../../../locators/ApiEditor"; import { agHelper, apiPage, dataSources, - entityItems + entityItems, } from "../../../../support/Objects/ObjectsCore"; -import apiLocators from "../../../../locators/apiLocators"; describe( "API Panel Test Functionality", @@ -162,4 +162,4 @@ describe( cy.ResponseCheck("Invalid value for Content-Type"); }); }, -); \ No newline at end of file +); From f22a8d755d5c529846e0b72ab0dd945515541bee Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Thu, 5 Sep 2024 09:58:36 +0530 Subject: [PATCH 09/10] Updated the document --- app/client/cypress/support/Pages/AggregateHelper.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index 66ab17809842..82fe2481fbdd 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -1552,6 +1552,13 @@ export class AggregateHelper { ) as Cypress.Chainable; } + /** + * Checks if the specified instance of the element is present with number and visible on the page. + * + * @param {ElementType} selector - The element selector. + * @param {number} [eq=0] - The index of the element to check (default is 0). + * @returns {Cypress.Chainable} - Returns a boolean wrapped in a Cypress Chainable indicating visibility. + */ IsElementVisibleWithEq(selector: ElementType, eq: number = 0) { return this.GetElement(selector) .eq(eq) From bd850ca5d80f39c544b6953c85cddc43a3e723d0 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Thu, 5 Sep 2024 10:32:07 +0530 Subject: [PATCH 10/10] Updated for comment --- .../ServerSide/ApiTests/API_All_Verb_spec.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js index 55696e892b8c..d88c2c7ba3e8 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js @@ -18,6 +18,7 @@ describe( "API Panel Test Functionality", { tags: ["@tag.Datasource"] }, function () { + const successMsg = "Executed successfully from user request"; afterEach(function () { agHelper.ActionContextMenuWithInPane({ action: "Delete", @@ -41,7 +42,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains(successMsg); }); cy.ResponseCheck("updatedAt"); }); @@ -61,7 +62,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains(successMsg); }); cy.ResponseCheck("createdAt"); }); @@ -81,7 +82,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains(successMsg); }); cy.ResponseCheck("updatedAt"); }); @@ -101,7 +102,7 @@ describe( apiPage.RunAPI(); apiPage.ResponseStatusCheck("200 OK"); agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains(successMsg); }); }); @@ -113,7 +114,7 @@ describe( apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext); agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains(successMsg); apiPage.SelectPaneTab("Pagination"); agHelper.GetNClick(apiwidget.paginationWithUrl); @@ -126,7 +127,7 @@ describe( apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck("Josh M Krantz"); agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains(successMsg); apiPage.SelectPaneTab("Pagination"); cy.enterUrl( @@ -138,7 +139,7 @@ describe( apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext); agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains(successMsg); }); it("6. API check with query params test API feature", function () { @@ -148,7 +149,7 @@ describe( apiPage.ResponseStatusCheck("200 OK"); cy.ResponseCheck(testdata.responsetext3); agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains(successMsg); }); it("7. API check with Invalid Header", function () { @@ -158,7 +159,7 @@ describe( apiPage.RunAPI(false); apiPage.ResponseStatusCheck("5000"); agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs"); - agHelper.AssertContains("Executed successfully from user request"); + agHelper.AssertContains(successMsg); cy.ResponseCheck("Invalid value for Content-Type"); }); },