Merge remote-tracking branch 'origin/main'

DFE-Digital · Mar 10, 2022 · c85fc7c · c85fc7c
2 parents 6d77c7b + be2744d
commit c85fc7c
Showing 1 changed file with 33 additions and 22 deletions.
diff --git a/end-to-end-tests/cypress/integration/End2EndTests/project-runthrough.spec.js b/end-to-end-tests/cypress/integration/End2EndTests/project-runthrough.spec.js
@@ -120,13 +120,13 @@ describe("Creating and editing an academy transfer", function () {
         cy.get("h1").should('contain.text',"Burnt Ash Primary School");
     });
 
-    it.only("Edit an Academy Transfer", function () {        
+    it("Edit an Academy Transfer", function () {        
         selectExistingAcademyTransfer("Burnt Ash Primary School");
         cy.get("h1").should('contain.text',"Burnt Ash Primary School");
         cy.clickBackLink()
         cy.get("h1").should('contain.text',"Manage an academy transfer");
         selectExistingAcademyTransfer("Burnt Ash Primary School");
-
+      
         //  *** Transfer details ***
         // Features of the transfer
         cy.clickDataTest("transfer-features")
@@ -228,7 +228,7 @@ describe("Creating and editing an academy transfer", function () {
         submit();
         cy.get('.govuk-button').should('contain.text', 'Confirm and continue').click();
         cy.getDataTest("academyandtrustinformation").should('have.text',"COMPLETED");
-        
+
         // *** School Data ***
         cy.clickDataTest("sd-academy-1")
         cy.clickBackLink()
@@ -239,54 +239,65 @@ describe("Creating and editing an academy transfer", function () {
         clickBackLink();
 
         // Pupil numbers
-        cy.clickDataTest("pupil-numbers")
+        cy.get(`[data-test='pupil-numbers']`).click()
         cy.clickBackLink()
-        cy.clickDataTest("pupil-numbers")
-        cy.clickDataTest("additional-information")
+        cy.get(`[data-test='pupil-numbers']`).click()
+        //cy.clickDataTest("additional-information")
+        cy.get(`[data-test='additional-information']`).click()
         cy.clickBackLink()
-        cy.clickDataTest("additional-information")
+        //cy.clickDataTest("additional-information")
+        cy.get(`[data-test='pupil-numbers']`).click()
+        cy.get(`[data-test='additional-information']`).click()
         cy.fillInText("AdditionalInformation", "Additional information for pupil numbers");
         submit();
         clickBackLink();
 
         // *** School characteristics ***        
         // Latest Ofsted report
-        cy.clickDataTest("ofsted")
+        cy.get(`[data-test='ofsted']`).click()
         clickBackLink();
-        cy.clickDataTest("ofsted")
-        cy.clickDataTest("additional-information")
+        cy.get(`[data-test='ofsted']`).click()
+        cy.get(`[data-test='additional-information']`).click()
         clickBackLink();
-        cy.clickDataTest("additional-information")
+        cy.get(`[data-test='ofsted']`).click()
+        cy.get(`[data-test='additional-information']`).click()
         cy.fillInText("AdditionalInformation", "Additional information for ofsted");
         submit();
         clickBackLink()
-        cy.pause
+
         // *** School performance ***
         // Key stage 2 performance tables
-        cy.clickDataTest("ks2-performance")
-        cy.clickDataTest("additional-information")
+        cy.get(`[data-test='ks2-performance']`).click()
+        clickBackLink();
+        cy.get(`[data-test='ks2-performance']`).click()
+        cy.get(`[data-test='additional-information']`).click()
+        clickBackLink();
+        cy.get(`[data-test='ks2-performance']`).click()
+        cy.get(`[data-test='additional-information']`).click()
         cy.fillInText("AdditionalInformation", "Additional information for ks2 performance");
         submit();
         clickBackLink()
 
         // Key stage 4 performance tables
-        cy.clickDataTest("ks4-performance")
+        cy.get(`[data-test='ks4-performance']`).click()
         clickBackLink()
-        cy.clickDataTest("ks4-performance")
-        cy.clickDataTest("additional-information")
+        cy.get(`[data-test='ks4-performance']`).click()
+        cy.get(`[data-test='additional-information']`).click()
         clickBackLink()
-        cy.clickDataTest("additional-information")
+        cy.get(`[data-test='ks4-performance']`).click()
+        cy.get(`[data-test='additional-information']`).click()
         cy.fillInText("AdditionalInformation", "Additional information for ks4 performance");
         submit();
         clickBackLink()
 
         // Key stage 5 performance tables
-        cy.clickDataTest("ks5-performance")
+        cy.get(`[data-test='ks5-performance']`).click()
         clickBackLink()
-        cy.clickDataTest("ks5-performance")
-        cy.clickDataTest("additional-information")
+        cy.get(`[data-test='ks5-performance']`).click()
+        cy.get(`[data-test='additional-information']`).click()
         clickBackLink()
-        cy.clickDataTest("additional-information")
+        cy.get(`[data-test='ks5-performance']`).click()
+        cy.get(`[data-test='additional-information']`).click()
         cy.fillInText("AdditionalInformation", "Additional information for ks5 performance");
         submit();
         clickBackLink()