UpdateInternationalElementUITest

ccd-definition/CaseEventToComplexTypes/internationalElement/amendInternationalElement.json

@@ -0,0 +1,32 @@
+[
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "CaseEventID": "amendInternationalElement",
+    "CaseFieldID": "internationalElement",
+    "ListElementCode": "whichCountriesInvolved",
+    "EventElementLabel": "Which other countries are involved?",
+    "FieldDisplayOrder": 1,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "CaseEventID": "amendInternationalElement",
+    "CaseFieldID": "internationalElement",
+    "ListElementCode": "outsideHagueConvention",
+    "EventElementLabel": "Are any of these countries outside of the Hague Convention?",
+    "FieldDisplayOrder": 2,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "CaseEventID": "amendInternationalElement",
+    "CaseFieldID": "internationalElement",
+    "ListElementCode": "importantDetails",
+    "EventElementLabel": "Provide all important details",
+    "FieldDisplayOrder": 3,
+    "DisplayContext": "MANDATORY"
+  }
+]

ccd-definition/CaseEventToComplexTypes/internationalElement/enterInternationalElement.json

@@ -0,0 +1,32 @@
+[
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "CaseEventID": "enterInternationalElement",
+    "CaseFieldID": "internationalElement",
+    "ListElementCode": "whichCountriesInvolved",
+    "EventElementLabel": "Which other countries are involved?",
+    "FieldDisplayOrder": 1,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "CaseEventID": "enterInternationalElement",
+    "CaseFieldID": "internationalElement",
+    "ListElementCode": "outsideHagueConvention",
+    "EventElementLabel": "Are any of these countries outside of the Hague Convention?",
+    "FieldDisplayOrder": 2,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "CaseEventID": "enterInternationalElement",
+    "CaseFieldID": "internationalElement",
+    "ListElementCode": "importantDetails",
+    "EventElementLabel": "Provide all important details",
+    "FieldDisplayOrder": 3,
+    "DisplayContext": "MANDATORY"
+  }
+]

ccd-definition/CaseEventToFields/CareSupervision/amendInternationalElement.json

@@ -5,7 +5,7 @@
     "CaseEventID": "amendInternationalElement",
     "CaseFieldID": "internationalElement",
     "PageFieldDisplayOrder": 1,
-    "DisplayContext": "OPTIONAL",
+    "DisplayContext": "MANDATORY",
     "PageID": 1,
     "PageDisplayOrder": 1,
     "PageColumnNumber": 1

ccd-definition/CaseEventToFields/CareSupervision/enterInternationalElement.json

@@ -5,7 +5,7 @@
     "CaseEventID": "enterInternationalElement",
     "CaseFieldID": "internationalElement",
     "PageFieldDisplayOrder": 1,
-    "DisplayContext": "OPTIONAL",
+    "DisplayContext": "MANDATORY",
     "PageID": 1,
     "PageDisplayOrder": 1,
     "PageColumnNumber": 1,

ccd-definition/ComplexTypes/CareSupervision/DEPRECATED.json

@@ -224,5 +224,95 @@
     "FieldTypeParameter": "C1SupportingEvidenceBundle",
     "SecurityClassification": "Public",
     "Searchable": "N"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "possibleCarer",
+    "FieldType": "YesOrNo",
+    "ElementLabel": "Are there any suitable carers outside of the UK?",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "possibleCarerReason",
+    "FieldType": "TextArea",
+    "ElementLabel": "Give reason",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "significantEvents",
+    "FieldType": "YesOrNo",
+    "ElementLabel": "Are you aware of any significant events that have happened outside the UK?",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "significantEventsReason",
+    "FieldType": "TextArea",
+    "ElementLabel": "Give reason",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "issues",
+    "FieldType": "YesOrNo",
+    "ElementLabel": "Are you aware of any issues with the jurisdiction of this case - for example under the Brussels 2 regulation?",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "issuesReason",
+    "FieldType": "TextArea",
+    "ElementLabel": "Give reason",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "proceedings",
+    "FieldType": "YesOrNo",
+    "ElementLabel": "Are you aware of any proceedings outside the UK?",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "proceedingsReason",
+    "FieldType": "TextArea",
+    "ElementLabel": "Give reason",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "internationalAuthorityInvolvement",
+    "FieldType": "YesOrNo",
+    "ElementLabel": "Has, or should, a government or central authority in another country been involved in this case?",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "InternationalElement",
+    "ListElementCode": "internationalAuthorityInvolvementDetails",
+    "FieldType": "TextArea",
+    "ElementLabel": "Give reason",
+    "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
   }
 ]

ccd-definition/ComplexTypes/CareSupervision/InternationalElement.json

@@ -2,86 +2,26 @@
   {
     "LiveFrom": "01/01/2017",
     "ID": "InternationalElement",
-    "ListElementCode": "possibleCarer",
-    "FieldType": "YesOrNo",
-    "ElementLabel": "Are there any suitable carers outside of the UK?",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "InternationalElement",
-    "ListElementCode": "possibleCarerReason",
-    "FieldType": "TextArea",
-    "ElementLabel": "Give reason",
-    "FieldShowCondition": "possibleCarer=\"Yes\"",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "InternationalElement",
-    "ListElementCode": "significantEvents",
-    "FieldType": "YesOrNo",
-    "ElementLabel": "Are you aware of any significant events that have happened outside the UK?",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "InternationalElement",
-    "ListElementCode": "significantEventsReason",
-    "FieldType": "TextArea",
-    "ElementLabel": "Give reason",
-    "FieldShowCondition": "significantEvents=\"Yes\"",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "InternationalElement",
-    "ListElementCode": "issues",
-    "FieldType": "YesOrNo",
-    "ElementLabel": "Are you aware of any issues with the jurisdiction of this case - for example under the Brussels 2 regulation?",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "InternationalElement",
-    "ListElementCode": "issuesReason",
-    "FieldType": "TextArea",
-    "ElementLabel": "Give reason",
-    "FieldShowCondition": "issues=\"Yes\"",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "InternationalElement",
-    "ListElementCode": "proceedings",
-    "FieldType": "YesOrNo",
-    "ElementLabel": "Are you aware of any proceedings outside the UK?",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "InternationalElement",
-    "ListElementCode": "proceedingsReason",
+    "ListElementCode": "whichCountriesInvolved",
     "FieldType": "TextArea",
-    "ElementLabel": "Give reason",
-    "FieldShowCondition": "proceedings=\"Yes\"",
+    "ElementLabel": "Which other countries are involved?",
     "SecurityClassification": "Public"
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "InternationalElement",
-    "ListElementCode": "internationalAuthorityInvolvement",
+    "ListElementCode": "outsideHagueConvention",
     "FieldType": "YesOrNo",
-    "ElementLabel": "Has, or should, a government or central authority in another country been involved in this case?",
+    "ElementLabel": "Are any of these countries outside of the Hague Convention?",
     "SecurityClassification": "Public"
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "InternationalElement",
-    "ListElementCode": "internationalAuthorityInvolvementDetails",
+    "ListElementCode": "importantDetails",
     "FieldType": "TextArea",
-    "ElementLabel": "Give reason",
-    "FieldShowCondition": "internationalAuthorityInvolvement = \"Yes\"",
+    "ElementLabel": "Provide all important details",
+    "HintText": "Including any carers, events, proceedings or authorities outside the UK, or issues with jurisdiction.",
     "SecurityClassification": "Public"
   }
 ]

playwright-e2e/pages/international-element.ts

@@ -2,31 +2,26 @@ import {type Page, type Locator, expect} from "@playwright/test";
 import { BasePage } from "./base-page";
 
 export class InternationalElement extends BasePage {
-  readonly internationalElementHeading: Locator;
-  readonly areThereAnySuitableCarers: Locator;
-  readonly anySignificantEventsOutsideUk: Locator;
-  readonly anyIssueWithJurisdictionOfThisCase: Locator;
-  readonly awareOfAnyProceedingsOutsideTheUk: Locator;
-  readonly aGovtOrCentralAuthorityOutsideUkInvolvedInCase: Locator;
+    readonly internationalElementHeading: Locator;
+    readonly countryInvolved: Locator;
+    readonly importantDetails: Locator;
+    readonly outSideHague: Locator;
 
-  public constructor(page: Page) {
-    super(page);
-    this.internationalElementHeading = page.getByRole('heading', { name: 'International element', exact: true });
-    this.areThereAnySuitableCarers = page.getByRole('group', { name: 'Are there any suitable carers' });
-    this.anySignificantEventsOutsideUk = page.getByRole('group', { name: 'Are you aware of any significant events that have happened outside the UK? (' });
-    this.anyIssueWithJurisdictionOfThisCase = page.getByRole('group', { name: 'Are you aware of any issues' });
-    this.aGovtOrCentralAuthorityOutsideUkInvolvedInCase = page.getByRole('group', { name: 'Has, or should, a government' });
-    this.awareOfAnyProceedingsOutsideTheUk = page.getByRole('group', { name: 'Are you aware of any proceedings outside the UK? (Optional)' });
+    public constructor(page: Page) {
+        super(page);
+        this.internationalElementHeading = page.getByRole('heading', {name: 'International element', exact: true});
+        this.countryInvolved = page.getByLabel('Which other countries are involved? (Optional)');
+        this.outSideHague = page.getByRole('group', {name: 'Are any of these countries outside of the Hague Convention? (Optional)'});
+        this.importantDetails = page.getByLabel('Provide all important details (Optional)');
+    }
 
-  }
-  async internationalElementSmokeTest() {
-    await expect(this.internationalElementHeading).toBeVisible();
-    await this.areThereAnySuitableCarers.getByLabel('No').check();
-    await this.anySignificantEventsOutsideUk.getByLabel('No').check();
-    await this.anyIssueWithJurisdictionOfThisCase.getByLabel('No').check();
-    await this.awareOfAnyProceedingsOutsideTheUk.getByLabel('No').check();
-    await this.aGovtOrCentralAuthorityOutsideUkInvolvedInCase.getByLabel('No').check();
-    await this.clickContinue();
-    await this.checkYourAnsAndSubmit();
-  }
+    async internationalElementSmokeTest() {
+        await expect(this.internationalElementHeading).toBeVisible();
+        await expect(this.page.getByText('Including any carers, events, proceedings or authorities outside the UK, or issues with jurisdiction.', {exact: true})).toBeVisible();
+        await this.countryInvolved.fill('Spain\nItlay\nFrance');
+        await this.outSideHague.getByRole('radio', {name: 'Yes'}).click();
+        await this.importantDetails.fill('Convention\nCare order by the father');
+        await this.clickContinue();
+        await this.checkYourAnsAndSubmit();
+    }
 }

playwright-e2e/pages/start-application.ts

@@ -29,6 +29,7 @@ export class StartApplication {
   readonly courtServicesNeeded: Locator;
   readonly submitApplicationLink: Locator;
   readonly otherPeopleInCaseLink: Locator;
+  readonly internationalElementCompleted: Locator;
 
   public constructor(page: Page) {
     this.page = page;
@@ -56,10 +57,11 @@ export class StartApplication {
     this.welshLanguageRequirements = page.getByRole('link', { name: 'Welsh language requirements' });
     this.welshLanguageReqFinished = page.locator('p:has(a[text="Welsh language requirements"]) > img[title="Finished"]');
     this.internationalElementsHeading = page.getByRole('link', { name: 'International element' });
+    this.internationalElementCompleted = page.locator('p').filter({ hasText: 'International element' }).getByRole('img',{name:'Finished'});
     this.submitApplicationLink = page.getByRole('link', { name: 'Submit application' })
     this.otherProceedingsLink = page.getByRole('link', { name: "Other Proceedings", });
-    this.courtServicesNeeded = page.getByRole('link', { name: 'Court services needed'}); 
-    this.otherPeopleInCaseLink = page.getByRole('link', { name: 'Other people in the case'}); 
+    this.courtServicesNeeded = page.getByRole('link', { name: 'Court services needed'});
+    this.otherPeopleInCaseLink = page.getByRole('link', { name: 'Other people in the case'});
   }
 
   async groundsForTheApplication() {

service/src/functionalTest/resources/case-submission/application-draft.txt

@@ -141,11 +141,9 @@ Anything else                                                       -
 
 International element
 
-Suitable carers outside of the UK                                   -
-Significant events outside the UK                                   -
-Issues with jurisdiction                                            -
-Proceedings outside the UK                                          -
-Government or central authority in another country been involved    -
+Other countries which are involved                                  -
+Are any of these countries outside Hague Convention                 -
+Important details                                                   -
 
 Other proceedings
 

service/src/functionalTest/resources/case-submission/application.txt

@@ -141,11 +141,9 @@ Anything else                                                       -
 
 International element
 
-Suitable carers outside of the UK                                   -
-Significant events outside the UK                                   -
-Issues with jurisdiction                                            -
-Proceedings outside the UK                                          -
-Government or central authority in another country been involved    -
+Other countries which are involved                                  -
+Are any of these countries outside Hague Convention                 -
+Important details                                                   -
 
 Other proceedings
 

service/src/integrationTest/resources/c110a.txt

@@ -193,11 +193,9 @@ Domestic violence         Yes history of domestic violence
 Anything else             No
 
 International element
-Suitable carers outside of the UK                                 Yes Aunt outside UK
-Significant events outside the UK                                 Yes Something happened in France
-Issues with jurisdiction                                          Yes Brussels 2 regulation
-Proceedings outside the UK                                        Yes Outside of the UK
-Government or central authority in another country been involved  Yes French authorities were involved
+Other countries which are involved                                Italy, Spain, France
+Are any of these countries outside Hague Convention               Yes
+Important details                                                 Something happened in France
 
 Other proceedings 1
 Previous or ongoing   Ongoing