Merge pull request #800 from DFE-Digital/cypress-refactoring

Cypress refactoring
DFE-Digital · Jul 12, 2024 · 8f8ad60 · 8f8ad60
2 parents 06b0e82 + d0f26bb
commit 8f8ad60
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Dfe.PrepareTransfers.Web/Pages/Projects/TransferDates/Index.cshtml b/Dfe.PrepareTransfers.Web/Pages/Projects/TransferDates/Index.cshtml
@@ -15,7 +15,7 @@
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
-        <span class="govuk-caption-l">
+        <span class="govuk-caption-l" data-test="trust_name">
             @Model.IncomingTrustName?.ToTitleCase()
         </span>
         <h1 class="govuk-heading-xl">

diff --git a/end-to-end-tests/cypress/e2e/createTransfer.cy.ts b/end-to-end-tests/cypress/e2e/createTransfer.cy.ts
@@ -144,7 +144,7 @@ describe('Create a new transfer', () => {
         .confirmDates()
 
       projectPage
-        .checkTransferDatesStatus('Completed')
+        .checkTransferDatesStatus('IN PROGRESS')
     })
 
     it('Fill in Benefits and Risks', () => {
@@ -214,6 +214,7 @@ describe('Create a new transfer', () => {
 
       trustInformationProjectDatesPage
         .completeRecommendationAndAuthor()
+        .confirmTrustInformationProjectDates()
         .checkOtherTableData(advisoryBoardDate, incomingTrustData.name, transferDate)
         .confirmTrustInformationProjectDates()
 

diff --git a/end-to-end-tests/cypress/pages/dates.ts b/end-to-end-tests/cypress/pages/dates.ts
@@ -7,8 +7,7 @@ class DatesPage {
     cy.get('[data-test="ab-date"]').click()
 
     cy.get('h1').should('contain.text', 'Advisory board date')
-    // Check 'I don't know' checkbox is available
-    cy.get('[id="AdvisoryBoardViewModel_AdvisoryBoardDate_UnknownDate"]').should('exist')
+
 
     cy.get('[data-test="day"]').clear()
     cy.get('[data-test="day"]').type(date.date())
@@ -29,9 +28,7 @@ class DatesPage {
 
     cy.get('[data-test="target-date"]').click()
 
-    cy.get('h1').should('contain.text', 'When is the expected date for the transfer?')
-    // Check 'I don't know' checkbox is available
-    cy.get('[id="TargetDateViewModel_TargetDate_UnknownDate"]').should('exist')
+
 
     cy.get('[data-test="month"]').clear()
     cy.get('[data-test="month"]').type(date.month() + 1)
@@ -41,7 +38,7 @@ class DatesPage {
     cy.get('button').contains('Save and continue').click()
 
     // Check the table has been updated
-    cy.get('dd').eq(2).should('contain.text', date.format('1 MMMM YYYY'))
+    cy.get('dd').eq(4).should('contain.text', date.format('1 MMMM YYYY'))
 
     return this
   }

diff --git a/end-to-end-tests/cypress/pages/trustInformationProjectDates.ts b/end-to-end-tests/cypress/pages/trustInformationProjectDates.ts
@@ -36,9 +36,11 @@ class TrustInformationProjectDatesPage {
 
   public checkOtherTableData(advisoryBoardDate, projectName, transferDate): this {
 
+    cy.get('[data-test="transfer-dates"]').click()
     cy.get('dd').eq(0).should('contain.text', advisoryBoardDate.format('D MMMM YYYY'))
-    cy.get('dd').eq(5).should('contain.text', projectName)
-    cy.get('dd').eq(7).should('contain.text', transferDate.format('1 MMMM YYYY'))
+    cy.get('[data-test="trust_name"]').should('contain.text', projectName)
+    cy.get('dd').eq(4).should('contain.text', transferDate.format('1 MMMM YYYY'))
+
 
     return this
   }