diff --git a/cypress/e2e/models/migration/reports/reports.ts b/cypress/e2e/models/migration/reports/reports.ts index 93b0d6a56..5b8b6dd00 100644 --- a/cypress/e2e/models/migration/reports/reports.ts +++ b/cypress/e2e/models/migration/reports/reports.ts @@ -19,7 +19,7 @@ limitations under the License. import { selectItemsPerPage } from "../../../../utils/utils"; import { applicationName, button, risk } from "../../../types/constants"; import { - adoptionCandidateDistributionTitle, + applicationConfidenceandRiskTitle, articleButton, articleCard, articleExpandedContent, @@ -49,9 +49,9 @@ export function expandArticle(name: string): void { export function verifyApplicationRisk(riskType: string, appName: string): void { // Verifies particular application's risk type - selectItemsPerPageInReports(100, adoptionCandidateDistributionTitle); + selectItemsPerPageInReports(100, applicationConfidenceandRiskTitle); cy.wait(4000); - cy.get(adoptionCandidateDistributionTitle) + cy.get(applicationConfidenceandRiskTitle) .closest(articleItem) .find("tbody > tr") .each(($ele) => { diff --git a/cypress/e2e/tests/migration/reports/appsrisk.test.ts b/cypress/e2e/tests/migration/reports/applicationRisk.test.ts similarity index 92% rename from cypress/e2e/tests/migration/reports/appsrisk.test.ts rename to cypress/e2e/tests/migration/reports/applicationRisk.test.ts index 3a975ddaf..44c021eae 100644 --- a/cypress/e2e/tests/migration/reports/appsrisk.test.ts +++ b/cypress/e2e/tests/migration/reports/applicationRisk.test.ts @@ -36,7 +36,6 @@ describe(["@tier2"], "Application risks tests", () => { let riskType = ["low", "medium", "high"]; before("Login and Create Test Data", function () { - // Perform login login(); stakeholdersList = createMultipleStakeholders(1); @@ -52,8 +51,7 @@ describe(["@tier2"], "Application risks tests", () => { } }); - it.skip("Bug MTA-1345: Application risk validation", function () { - // Navigate to reports page + it("Bug MTA-1746: Application risk validation", function () { selectUserPerspective(migration); clickByText(navMenu, reports); cy.wait(3 * SEC); @@ -64,7 +62,6 @@ describe(["@tier2"], "Application risks tests", () => { }); after("Perform test data clean up", function () { - // Delete the stakeholders and applications created before the tests deleteByList(stakeholdersList); deleteByList(applicationsList); }); diff --git a/cypress/e2e/tests/migration/reports/filter.test.ts b/cypress/e2e/tests/migration/reports/filter.test.ts index 9ac99816e..829bf5746 100644 --- a/cypress/e2e/tests/migration/reports/filter.test.ts +++ b/cypress/e2e/tests/migration/reports/filter.test.ts @@ -42,7 +42,7 @@ import { tdTag, } from "../../../types/constants"; import { - adoptionCandidateDistributionTitle, + applicationConfidenceandRiskTitle, articleBody, articleCard, identiFiedRisksTitle, @@ -61,7 +61,6 @@ let stakeholdersList: Array = []; let invalidSearchInput = String(data.getRandomNumber()); describe.skip(["@tier2"], "Reports filter validations", () => { - /* before("Login and create test data", function () { // Perform login login(); @@ -76,7 +75,7 @@ describe.skip(["@tier2"], "Reports filter validations", () => { // Perform application review applicationsList[0].perform_review("high"); applicationsList[0].verifyStatus("review", "Completed"); - });*/ + }); it("Bug MTA-1345: Name field validations", function () { // Navigate to reports @@ -91,10 +90,10 @@ describe.skip(["@tier2"], "Reports filter validations", () => { cy.wait(3 * SEC); // Check element filtered for table Adoption Candidate Distribution - selectItemsPerPageInReports(100, adoptionCandidateDistributionTitle); + selectItemsPerPageInReports(100, applicationConfidenceandRiskTitle); // Wait for DOM to render table and sibling elements - cy.get(adoptionCandidateDistributionTitle) + cy.get(applicationConfidenceandRiskTitle) .closest(articleCard) .find(articleBody) .should("not.have.class", "pf-v5-c-empty-state") diff --git a/cypress/e2e/tests/migration/reports/pagination.test.ts b/cypress/e2e/tests/migration/reports/pagination.test.ts index 6264a48bf..7344871a3 100644 --- a/cypress/e2e/tests/migration/reports/pagination.test.ts +++ b/cypress/e2e/tests/migration/reports/pagination.test.ts @@ -34,7 +34,7 @@ import { import { Stakeholders } from "../../../models/migration/controls/stakeholders"; import * as commonView from "../../../views/common.view"; import { - adoptionCandidateDistributionTitle, + applicationConfidenceandRiskTitle, identiFiedRisksTitle, } from "../../../views/reports.view"; @@ -69,7 +69,7 @@ describe.skip(["@tier3"], "Reports pagination validations", () => { cy.wait(3 * SEC); // select 10 items per page - selectItemsPerPageInReports(10, adoptionCandidateDistributionTitle); + selectItemsPerPageInReports(10, applicationConfidenceandRiskTitle); // Verify next buttons are enabled as there are more than 11 rows present cy.get(commonView.nextPageButton).each(($nextBtn) => { @@ -106,7 +106,7 @@ describe.skip(["@tier3"], "Reports pagination validations", () => { cy.wait(3 * SEC); // Select 10 items per page - selectItemsPerPageInReports(10, adoptionCandidateDistributionTitle); + selectItemsPerPageInReports(10, applicationConfidenceandRiskTitle); cy.wait(2 * SEC); // Verify that only 10 items are displayed @@ -115,7 +115,7 @@ describe.skip(["@tier3"], "Reports pagination validations", () => { }); // Select 20 items per page - selectItemsPerPageInReports(20, adoptionCandidateDistributionTitle); + selectItemsPerPageInReports(20, applicationConfidenceandRiskTitle); cy.wait(2 * SEC); // Verify that items less than or equal to 20 and greater than 10 are displayed @@ -131,7 +131,7 @@ describe.skip(["@tier3"], "Reports pagination validations", () => { cy.wait(3 * SEC); // Select 10 items per page - selectItemsPerPageInReports(10, adoptionCandidateDistributionTitle); + selectItemsPerPageInReports(10, applicationConfidenceandRiskTitle); cy.wait(2 * SEC); // Go to page number 2 diff --git a/cypress/e2e/views/reports.view.ts b/cypress/e2e/views/reports.view.ts index 3e09d3aa8..9d924dadf 100644 --- a/cypress/e2e/views/reports.view.ts +++ b/cypress/e2e/views/reports.view.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -export const adoptionCandidateDistributionTitle = 'h3:contains("Adoption candidate distribution")'; +export const applicationConfidenceandRiskTitle = 'h3:contains("Application confidence and risk")'; export const articleItem = "div.pf-v5-l-stack__item"; export const articleCard = "div.pf-v5-c-card"; export const articleHeader = "div.pf-v5-c-card__header";