diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/e2e/Core-journeys/project_group_test.cy.js b/Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/e2e/Core-journeys/project_group_test.cy.js index 6e0d0e548..bafc16fd8 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/e2e/Core-journeys/project_group_test.cy.js +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/e2e/Core-journeys/project_group_test.cy.js @@ -2,7 +2,7 @@ import projectTaskList from "../../pages/projectTaskList"; import { decisionPage } from '../../pages/decisionPage'; import { Logger } from '../../support/logger'; -describe('Decisions Tests', () => { +describe('Groups Tests', () => { let projectId; @@ -59,7 +59,7 @@ describe('Group Creation Tests', () => { Logger.log("Click on create a group"); projectTaskList.clickCreateGroupBtn(); - Logger.log("enerting which trust will the group join"); + Logger.log("Entering the trust details for the group to join"); cy.get('.autocomplete__wrapper > #SearchQuery').type('Greater Manchester Academies Trust (10058252)') cy.get('.autocomplete__wrapper > #SearchQuery').type('{enter}') diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/pages/projectTaskList.js b/Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/pages/projectTaskList.js index f757aa7e2..1ff736cfc 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/pages/projectTaskList.js +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/pages/projectTaskList.js @@ -34,55 +34,55 @@ export default class ProjectTaskList extends BasePage { urnField: '[data-cy="UKPRN"]', continueButton: '[data-cy="submit-btn"]', conversionSelection: '[id="available-conversion-\\[0\\]"]', - confirmandcontinue: '[data-cy="select-common-submitbutton"]' + confirmAndContinue: '[data-cy="select-common-submitbutton"]' } - static path = 'task-list' - static path1 = 'groups/project-list' + static taskListPath = 'task-list'; + static groupsProjectListPath = 'groups/project-list'; static selectAssignProject() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) cy.get(this.selectors.assignProjectButton).click() } static getAssignedUser() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) return cy.get(this.selectors.assignedUser) } static getNotificationMessage() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) return cy.get(this.selectors.notificationMessage) } static selectSchoolOverview() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) cy.get(this.selectors.schoolOverviewLink).click() } static getSchoolOverviewStatus() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) return cy.get(this.selectors.schoolOverviewStatus) } static selectBudget() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) cy.get(this.selectors.budgetLink).click() } static getBudgetStatus() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) return cy.get(this.selectors.budgetStatus) } static selectPupilForecast() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) cy.get(this.selectors.pupilForecastLink).click() } static selectConversionDetails() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) cy.get(this.selectors.conversionDetailsLink).click() } @@ -91,47 +91,47 @@ export default class ProjectTaskList extends BasePage { } static getConversionDetailsStatus() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) return cy.get(this.selectors.conversionDetailsStatus) } static selectRationale() { - cy.checkPath(this.path) + cy.checkPath(this.pataskListPathth) cy.get(this.selectors.rationaleLink).click() } static getRationaleStatus() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) return cy.get(this.selectors.rationaleStatus) } static selectRisksAndIssues() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) cy.get(this.selectors.riskAndIssuesLink).click() } static getRisksAndIssuesStatus() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) return cy.get(this.selectors.riskAndIssuesStatus) } static selectLA() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) cy.get(this.selectors.LALink).click() } static getLAStatus() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) return cy.get(this.selectors.LAStatus) } static selectOfsted() { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) cy.get(this.selectors.ofstedLink).click() } static selectKeyStage(keyStageNumber) { - cy.checkPath(this.path) + cy.checkPath(this.taskListPath) cy.get(this.selectors.keyStageLink(keyStageNumber)).click() } @@ -152,7 +152,7 @@ export default class ProjectTaskList extends BasePage { } static clickGroupsLink() { - cy.checkPath(this.path1); + cy.checkPath(this.groupsProjectListPath); cy.get(this.selectors.groupsLink).click(); return this; } @@ -175,7 +175,7 @@ export default class ProjectTaskList extends BasePage { static selectConversion() { cy.get(this.selectors.conversionSelection).click(); - cy.get(this.selectors.confirmandcontinue).click(); + cy.get(this.selectors.confirmAndContinue).click(); return this; } @@ -191,7 +191,7 @@ export default class ProjectTaskList extends BasePage { } static deleteGroup() { - cy.get('[data-cy="tes"]').click(); + cy.get('[data-cy="delete-btn"]').click(); cy.get('#delete-group-confirmation').click(); return this; } diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Groups/ProjectGroupIndex.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Groups/ProjectGroupIndex.cshtml index ff290ca5d..ce653fd30 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Groups/ProjectGroupIndex.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Groups/ProjectGroupIndex.cshtml @@ -167,7 +167,7 @@
There are currently no schools or academies in this group
Delete this group