Merge branch 'main' into feature/new-trust-template

DFE-Digital · Feb 6, 2024 · b060f26 · b060f26
2 parents 1949098 + 2ab00a6
commit b060f26
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,2 +1,3 @@
 * @dneed-nimble @paullocknimble @danielryannimble @dangood84 @nwarms @elielijah321 @FahadDarw
 /terraform/ @DrizzlyOwl @stretch96
+Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests @cshnimble
diff --git a/...ions/Dfe.PrepareConversions.CypressTests/cypress/e2e/Core-journeys/filteration-test.cy.js b/...ions/Dfe.PrepareConversions.CypressTests/cypress/e2e/Core-journeys/filteration-test.cy.js
@@ -13,39 +13,40 @@ describe('Filteration Tests', { tags: ['@dev', '@stage'] }, () => {
   nextMonthDate.setMonth(currentDate.getMonth() + 1);
 
   const testData = {
-    projectName: 'Sponsored Cypress Project',
+    projectName: 'Deanshanger Primary School',
     completedText: 'Completed',
     projectAssignment: {
-      deliveryOfficer: 'Richika Dogra',
-      assignedOfficerMessage: 'Project is assigned',
+       deliveryOfficer: 'Chris Sherlock',
+       assignedOfficerMessage: 'Project is assigned',
     },
     schoolOverview: {
-      pan: '98765',
-      pfiDescription: 'PFI Description',
-      distance: '15',
-      distanceDecription: 'Distance description',
-      mp: 'Important Politician, Independent',
+       pan: '999',
+       pfiDescription: 'PFI Description',
+       distance: '15',
+       distanceDecription: 'Distance description',
+       mp: 'Important Politician, Independent',
     },
     budget: {
-      endOfFinanicalYear: currentDate,
-      forecastedRevenueCurrentYear: 20,
-      forecastedCapitalCurrentYear: 10,
-      endOfNextFinancialYear: nextYearDate,
-      forecastedRevenueNextYear: 15,
-      forecastedCapitalNextYear: 12
+       endOfFinanicalYear: currentDate,
+       forecastedRevenueCurrentYear: 20,
+       forecastedCapitalCurrentYear: 10,
+       endOfNextFinancialYear: nextYearDate,
+       forecastedRevenueNextYear: 15,
+       forecastedCapitalNextYear: 12
     },
     pupilForecast: {
-      additionalInfomation: 'Pupil Forecast Additional Information'
+       additionalInfomation: 'Pupil Forecast Additional Information'
     },
     rationale: 'This is why this school should become an academy',
     risksAndIssues: 'Here are the risks and issues for this conversion',
     localAuthority: {
-      comment: 'Comment',
-      sharepointLink: 'https://sharepoint.com'
+       comment: 'Comment',
+       sharepointLink: 'https://sharepoint.com'
     },
     performanceInfo: 'Additional Information',
-    keyStages: [4, 5]
-  }
+    keyStages: [2]
+ }
+
 
   before(() => {
 

diff --git a/.../Dfe.PrepareConversions.CypressTests/cypress/e2e/Core-journeys/sponsored-conversion.cy.js b/.../Dfe.PrepareConversions.CypressTests/cypress/e2e/Core-journeys/sponsored-conversion.cy.js
@@ -24,14 +24,14 @@ describe('Sponsored conversion journey', { tags: ['@dev', '@stage'] }, () => {
    nextMonthDate.setMonth(currentDate.getMonth() + 1);
 
    const testData = {
-      projectName: 'Sponsored Cypress Project',
+      projectName: 'Deanshanger Primary School',
       completedText: 'Completed',
       projectAssignment: {
-         deliveryOfficer: 'Richika Dogra',
+         deliveryOfficer: 'Chris Sherlock',
          assignedOfficerMessage: 'Project is assigned',
       },
       schoolOverview: {
-         pan: '98765',
+         pan: '999',
          pfiDescription: 'PFI Description',
          distance: '15',
          distanceDecription: 'Distance description',
@@ -55,7 +55,7 @@ describe('Sponsored conversion journey', { tags: ['@dev', '@stage'] }, () => {
          sharepointLink: 'https://sharepoint.com'
       },
       performanceInfo: 'Additional Information',
-      keyStages: [4, 5]
+      keyStages: [2]
    }
 
    before(() => {

diff --git a/...PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/pages/conversionDetails.js b/...PrepareConversions/Dfe.PrepareConversions.CypressTests/cypress/pages/conversionDetails.js
@@ -34,7 +34,7 @@ export default class ConversionDetails extends BasePage {
         advisoryBoardDateInput: 'head-teacher-board-date',
         proposedOpeningLink: '[data-test="change-proposed-academy-opening-date"]',
         proposedOpeningValue: '[id="proposed-academy-opening-date"]',
-        proposedOpeningRadioButton: (month, year) => `input[data-cy="select-radio-01/${month}/${year} 00:00:00"]`,
+        proposedOpeningRadioButton: (month, year) => `input[data-cy="select-radio-${month}/01/${year} 00:00:00"]`,
         previousAdvisoryBoardLink: '[data-test="change-previous-advisory-board"]',
         previousAdvisoryBoardValue: '[id="previous-advisory-board"]',
         previousAdvisoryBoardDateInput: 'previous-head-teacher-board-date',