Merge branch 'master' into feature/CIV-1526-preview-environment

hmcts · Mar 10, 2022 · 08fc936 · 08fc936
2 parents 28396c5 + dcc3f2c
commit 08fc936
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 134 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,5 @@ node_modules/
 
 # test_output
 output/
-test-results/
 /e2e/reporters/
 /e2e/reporters/accessibility-reporter/
diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
@@ -75,7 +75,7 @@ withPipeline(type, product, component) {
     }
 
     before('smoketest:preview') {
-        sh """
+      sh """
           eval \$(./bin/variables/load-preview-environment-variables.sh ${CHANGE_ID})
           ./bin/add-roles.sh
           ./bin/pull-latest-release-asset.sh civil-ccd-definition civil-ccd-definition.zip
@@ -85,7 +85,6 @@ withPipeline(type, product, component) {
           ./bin/import-general-apps-ccd-definition.sh "-e *-prod.json,*-nonprod.json,*LRspec.json"
           ./bin/import-bpmn-diagram.sh .
         """
-
         env.URL="https://xui-civil-general-apps-ccd-definition-pr-${CHANGE_ID}.service.core-compute-preview.internal"
         env.CIVIL_SERVICE_URL="http://civil-service-civil-general-apps-ccd-definition-pr-${CHANGE_ID}.service.core-compute-preview.internal"
         env.CIVIL_GENERAL_APPLICATIONS_URL="http://civil-general-apps-ccd-definition-pr-${CHANGE_ID}.service.core-compute-preview.internal"

diff --git a/ga-ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldGAspec.json b/ga-ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldGAspec.json
@@ -318,31 +318,7 @@
   },
   {
     "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "isPCClaimantMakingApplication",
-    "UserRoles": [
-      "caseworker-civil-systemupdate"
-    ],
-    "CRUD": "CRUD"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "applicantSolicitor1UserDetails",
-    "UserRoles": [
-      "caseworker-civil-systemupdate"
-    ],
-    "CRUD": "CRUD"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "applicant1OrganisationPolicy",
-    "UserRoles": [
-      "caseworker-civil-systemupdate"
-    ],
-    "CRUD": "CRUD"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "respondent1OrganisationPolicy",
+    "CaseFieldID": "parentClaimantIsApplicant",
     "UserRoles": [
       "caseworker-civil-systemupdate"
     ],

diff --git a/ga-ccd-definition/AuthorisationCaseField/StaffGAspec.json b/ga-ccd-definition/AuthorisationCaseField/StaffGAspec.json
@@ -1,22 +1,4 @@
 [
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "applicantSolicitor1UserDetails",
-    "CRUD": "R",
-    "UserRole": "caseworker-civil-staff"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "applicant1OrganisationPolicy",
-    "UserRole": "caseworker-civil-staff",
-    "CRUD": "R"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "respondent1OrganisationPolicy",
-    "UserRole": "caseworker-civil-staff",
-    "CRUD": "R"
-  },
   {
     "CaseTypeID": "GENERALAPPLICATION",
     "CaseFieldID": "respondentSolicitor1EmailAddress",

diff --git a/ga-ccd-definition/AuthorisationComplexType/solicitorGAspec.json b/ga-ccd-definition/AuthorisationComplexType/solicitorGAspec.json
@@ -376,7 +376,7 @@
   {
     "CaseTypeID": "GENERALAPPLICATION",
     "CaseFieldID": "generalApplications",
-    "ListElementCode": "isPCClaimantMakingApplication",
+    "ListElementCode": "parentClaimantIsApplicant",
     "UserRole": "caseworker-civil-solicitor",
     "CRUD": "R"
   },
@@ -387,27 +387,6 @@
     "UserRole": "caseworker-civil-solicitor",
     "CRUD": "R"
   },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "generalApplications",
-    "ListElementCode": "applicantSolicitor1UserDetails",
-    "UserRole": "caseworker-civil-solicitor",
-    "CRUD": "R"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "generalApplications",
-    "ListElementCode": "applicant1OrganisationPolicy",
-    "UserRole": "caseworker-civil-solicitor",
-    "CRUD": "R"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "generalApplications",
-    "ListElementCode": "respondent1OrganisationPolicy",
-    "UserRole": "caseworker-civil-solicitor",
-    "CRUD": "R"
-  },
   {
     "CaseTypeID": "GENERALAPPLICATION",
     "CaseFieldID": "generalApplications",

diff --git a/ga-ccd-definition/AuthorisationComplexType/systemUpdateGAspec.json b/ga-ccd-definition/AuthorisationComplexType/systemUpdateGAspec.json
@@ -378,7 +378,7 @@
   {
     "CaseTypeID": "GENERALAPPLICATION",
     "CaseFieldID": "generalApplications",
-    "ListElementCode": "isPCClaimantMakingApplication",
+    "ListElementCode": "parentClaimantIsApplicant",
     "UserRole": "caseworker-civil-systemupdate",
     "CRUD": "CRU"
   },
@@ -389,27 +389,6 @@
     "UserRole": "caseworker-civil-systemupdate",
     "CRUD": "CRU"
   },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "generalApplications",
-    "ListElementCode": "applicantSolicitor1UserDetails",
-    "UserRole": "caseworker-civil-systemupdate",
-    "CRUD": "CRU"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "generalApplications",
-    "ListElementCode": "applicant1OrganisationPolicy",
-    "UserRole": "caseworker-civil-systemupdate",
-    "CRUD": "CRU"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "generalApplications",
-    "ListElementCode": "respondent1OrganisationPolicy",
-    "UserRole": "caseworker-civil-systemupdate",
-    "CRUD": "CRU"
-  },
   {
     "CaseTypeID": "GENERALAPPLICATION",
     "CaseFieldID": "generalApplications",

diff --git a/ga-ccd-definition/CaseField/CaseFieldGAspec.json b/ga-ccd-definition/CaseField/CaseFieldGAspec.json
@@ -185,32 +185,11 @@
   },
   {
     "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "isPCClaimantMakingApplication",
+    "ID": "parentClaimantIsApplicant",
     "Label": " ",
     "FieldType": "YesOrNo",
     "SecurityClassification": "Public"
   },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "applicantSolicitor1UserDetails",
-    "Label": " ",
-    "FieldType": "GAUserDetailsGAspec",
-    "SecurityClassification": "Public"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "applicant1OrganisationPolicy",
-    "Label": " ",
-    "FieldType": "OrganisationPolicy",
-    "SecurityClassification": "Public"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "respondent1OrganisationPolicy",
-    "Label": " ",
-    "FieldType": "OrganisationPolicy",
-    "SecurityClassification": "Public"
-  },
   {
     "CaseTypeID": "GENERALAPPLICATION",
     "ID": "respondentSolicitor1EmailAddress",

diff --git a/ga-ccd-definition/ComplexTypes/GeneralApplicationGAspec.json b/ga-ccd-definition/ComplexTypes/GeneralApplicationGAspec.json
@@ -111,32 +111,11 @@
     },
     {
       "ID": "GeneralApplicationGAspec",
-      "ListElementCode": "isPCClaimantMakingApplication",
+      "ListElementCode": "parentClaimantIsApplicant",
       "FieldType": "YesOrNo",
       "ElementLabel": " ",
       "SecurityClassification": "Public"
     },
-    {
-      "ID": "GeneralApplicationGAspec",
-      "ListElementCode": "applicantSolicitor1UserDetails",
-      "ElementLabel": " ",
-      "FieldType": "GAUserDetailsGAspec",
-      "SecurityClassification": "Public"
-    },
-    {
-      "ID": "GeneralApplicationGAspec",
-      "ListElementCode": "applicant1OrganisationPolicy",
-      "ElementLabel": " ",
-      "FieldType": "OrganisationPolicy",
-      "SecurityClassification": "Public"
-    },
-    {
-      "ID": "GeneralApplicationGAspec",
-      "ListElementCode": "respondent1OrganisationPolicy",
-      "ElementLabel": " ",
-      "FieldType": "OrganisationPolicy",
-      "SecurityClassification": "Public"
-    },
     {
       "ID": "GeneralApplicationGAspec",
       "ListElementCode": "respondentSolicitor1EmailAddress",

diff --git a/test-results/dummyResult.xml b/test-results/dummyResult.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites name="Mocha Tests" time="10.7190" tests="3" failures="0" skipped="2">
+  <testsuite name="Root Suite" timestamp="2022-03-09T13:35:43" tests="0" time="0.0000" failures="0">
+  </testsuite>
+  <testsuite name="CCD 1v1 - General Application Journey @e2e" timestamp="2022-03-09T13:35:43" tests="3" file="/Users/admin/Documents/GitHub/civil-general-apps-ccd-definition/e2e/tests/1v1GeneralApplication_test.js" time="10.7170" failures="0">
+    <testcase name="CCD 1v1 - General Application Journey @e2e: Create case for 1v1" time="8.5060" classname="Create case for 1v1">
+    </testcase>
+  </testsuite>
+</testsuites>