Merge pull request #1119 from alphagov/2103-fix-helper-templates

2103: Fix names of helper template references

Author: ahernp

accessibility_monitoring_platform/apps/audits/templates/audits/statement_checks/equality_body_retest_statement_disproportionate.html

@@ -8,14 +8,14 @@
 <div class="govuk-width-container">
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-full">
-            {% include 'common/case_banner.html' with case=retest.simplified_case %}
+            {% include 'cases/helpers/case_banner.html' with case=retest.simplified_case %}
         </div>
     </div>
     {% include 'audits/helpers/retest_breadcrumbs.html' %}
     <main id="main-content" class="govuk-main-wrapper amp-padding-top-0">
         <div class="govuk-grid-row">
             <div class="govuk-grid-column-full">
-                {% include "simplified/helpers/edit_header.html" with retest_header=True %}
+                {% include "common/helpers/edit_header.html" with retest_header=True %}
             </div>
         </div>
         <div class="govuk-grid-row">

accessibility_monitoring_platform/apps/common/management/commands/init_int_test_data.py

@@ -31,17 +31,17 @@
 from ....cases.models import BaseCase
 from ....comments.models import Comment
 from ....common.models import EmailTemplate
+from ....detailed.models import Contact as DetailedContact
 from ....detailed.models import DetailedCase, DetailedCaseHistory, DetailedEventHistory
+from ....detailed.models import ZendeskTicket as DetailedZendeskTicket
 from ....exports.models import Export, ExportCase
 from ....mobile.models import MobileCase
 from ....notifications.models import NotificationSetting, Task
 from ....reports.models import Report, ReportVisitsMetrics, ReportWrapper
 from ....s3_read_write.models import S3Report
+from ....simplified.models import CaseCompliance, CaseEvent, CaseStatus
+from ....simplified.models import Contact as SimplifiedContact
 from ....simplified.models import (
-    CaseCompliance,
-    CaseEvent,
-    CaseStatus,
-    Contact,
     EqualityBodyCorrespondence,
     SimplifiedCase,
     SimplifiedEventHistory,
@@ -86,6 +86,7 @@ def handle(self, *args, **options):  # pylint: disable=unused-argument
         delete_from_models(
             [
                 Task,
+                DetailedZendeskTicket,
                 EmailTemplate,
                 ExportCase,
                 Export,
@@ -131,8 +132,12 @@ def handle(self, *args, **options):  # pylint: disable=unused-argument
                 Report,
             ]
         )
-        delete_from_models([DetailedEventHistory, DetailedCaseHistory, DetailedCase])
-        delete_from_models([SimplifiedEventHistory, Contact, CaseEvent, SimplifiedCase])
+        delete_from_models(
+            [DetailedEventHistory, DetailedCaseHistory, DetailedContact, DetailedCase]
+        )
+        delete_from_models(
+            [SimplifiedEventHistory, SimplifiedContact, CaseEvent, SimplifiedCase]
+        )
         delete_from_models([MobileCase])
         delete_from_models([BaseCase])
         delete_from_models([ChangeToPlatform, IssueReport, Platform, Sector])  # Common

stack_tests/integration_tests/cypress/e2e/new_simplified_case_test_report.cy.js

@@ -216,5 +216,63 @@ describe('Create simplified case, tests and report', () => {
 
     cy.title().should('eq', `${newOrganisationName} | Closing the case`)
     cy.contains('Save and continue').click()
+
+    cy.contains('Post case').click()
+    cy.contains('Retest overview').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Retest overview`)
+    cy.contains('New retest').click()
+
+    cy.title().should('eq', 'Retest #1 | Retest metadata')
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Retest #1 | Home`)
+    cy.contains('Save and next page').click()
+
+    cy.title().should('eq', 'Retest #1 | Comparison')
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', 'Retest #1 | Compliance decision')
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Statement links`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Statement overview`)
+    cy.get('[name="form-0-check_result_state"]').check('yes')
+    cy.get('[name="form-1-check_result_state"]').check('yes')
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Statement information`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Compliance status`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Non-accessible content`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Statement preparation`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Feedback and enforcement procedure`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Disproportionate burden claim`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Custom statement issues`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Statement results`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Disproportionate burden`)
+    cy.contains('Save and continue').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Statement decision`)
+    cy.contains('Save and exit').click()
+
+    cy.title().should('eq', `${newOrganisationName} | Retest overview`)
   })
 })