Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CIV-14295 Test PR #4633

Closed
wants to merge 135 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
3dc32ae
CIV-14112 Added ccd event for discontinue claim
German-A-Amoros Jun 12, 2024
e2fa292
CIV-14112 Changed ccd event id
German-A-Amoros Jun 12, 2024
3dd2aec
CIV-14112 Fix event name
German-A-Amoros Jun 12, 2024
0462113
CIV-14112 Fix event name
German-A-Amoros Jun 12, 2024
8a1d5c4
CIV-14112 Fix precondition states
German-A-Amoros Jun 12, 2024
346a69f
Merge branch 'master' of github.com:hmcts/civil-ccd-definition into f…
German-A-Amoros Jun 12, 2024
e34f98c
Merge branch 'master' into feat/CIV-14112
Azam-Hmcts Jun 13, 2024
a740c48
Merge branch 'master' into feat/CIV-14112
Azam-Hmcts Jun 14, 2024
a9de9ee
Update UserEvents-SettleDiscontinue-nonprod.json
Azam-Hmcts Jun 14, 2024
2f2fde9
Merge branch 'master' into feat/CIV-14128_CCD
sjamihmcts Jun 16, 2024
a7f5b5c
Merge branch 'master' into feat/CIV-14128_CCD
sjamihmcts Jun 18, 2024
27674f2
CIV-14128: Initial Commit
sjamihmcts Jun 18, 2024
d81d9c1
Merge branch 'master' into feat/CIV-14128_CCD
sjamihmcts Jun 18, 2024
3524ca1
Merge branch 'master' into feat/CIV-14112
Azam-Hmcts Jun 19, 2024
3e5d589
Merge branch 'master' into feat/CIV-14112
German-A-Amoros Jun 20, 2024
904cc79
Merge remote-tracking branch 'origin/feat/CIV-14128_CCD' into feat/CI…
Omaira-Melo-Hmcts Jun 20, 2024
3f647ec
CIV-14128:Added midEvent for new Claim Consent page
sjamihmcts Jun 21, 2024
611e973
Merge branch 'master' into feat/CIV-14128_CCD
sjamihmcts Jun 21, 2024
1ff0df1
CIV-14128:Added page title for Claimant Consent screen
sjamihmcts Jun 21, 2024
7d9ba54
CIV-14128:Removed the file as its not needed
sjamihmcts Jun 21, 2024
8dc4854
CIV-14145 CCD changes for add the court permission view
Omaira-Melo-Hmcts Jun 24, 2024
0fc722a
CIV-14145 CCD changes for add the court permission view
Omaira-Melo-Hmcts Jun 24, 2024
9f57caa
CIV-14128: Added API test for Discontinue Claim
sjamihmcts Jun 24, 2024
30bf823
CIV-14145 CCD changes for add the court permission view
Omaira-Melo-Hmcts Jun 25, 2024
56c68b1
CIV-14145 CCD changes for add the court permission view
Omaira-Melo-Hmcts Jun 25, 2024
c924bc0
Merge branch 'feat/CIV-14145' into feat/CIV-14148
hmcts-version1-ignacio Jun 25, 2024
5afc755
CIV-14128: Uncommented the lines that are mistakenly committed
sjamihmcts Jun 25, 2024
93bd4a5
Merge branch 'master' into feat/CIV-14128_CCD
sjamihmcts Jun 25, 2024
b9c716a
Merge remote-tracking branch 'origin/feat/CIV-14128_CCD' into feat/CI…
Omaira-Melo-Hmcts Jun 25, 2024
9ffd480
CIV-14128: Fixed build errors
sjamihmcts Jun 25, 2024
3c4240b
CIV-14145 CCD changes for add the court permission view
Omaira-Melo-Hmcts Jun 25, 2024
d59d775
Merge branch 'feat/CIV-14145' into feat/CIV-14148
hmcts-version1-ignacio Jun 25, 2024
95a0899
Merge branch 'master' into feat/CIV-14148
hmcts-version1-ignacio Jun 25, 2024
8b5bc4e
CIV-14128: Removed the caseworker roles as per review comments
sjamihmcts Jun 25, 2024
765d857
CIV-14145 CCD merge error fixed
Omaira-Melo-Hmcts Jun 25, 2024
926eebe
Merge remote-tracking branch 'origin/feat/CIV-14128_CCD' into feat/CI…
Omaira-Melo-Hmcts Jun 25, 2024
e7d4176
Merge branch 'feat/CIV-14145' into feat/CIV-14148
hmcts-version1-ignacio Jun 25, 2024
3bb7d1a
CIV-14145 Update current API test with new page data
Omaira-Melo-Hmcts Jun 25, 2024
c465c44
Merge branch 'master' into feat/CIV-14145
Omaira-Melo-Hmcts Jun 25, 2024
facd53d
CIV-14145 Update current API test with new page data
Omaira-Melo-Hmcts Jun 25, 2024
6cd7d6f
CIV-14128: Removed the caseworker roles as per review comments
sjamihmcts Jun 25, 2024
a3860dc
CIV-14128: Reverted the change as partiesName is already used in Sett…
sjamihmcts Jun 25, 2024
82503de
CIV-14128: Updated the ClaimantConsent pageId to be consistent with o…
sjamihmcts Jun 25, 2024
6c76147
Merge branch 'master' into feat/CIV-14128_CCD
sjamihmcts Jun 25, 2024
ea5d0c2
CIV-14148 Add new screen
hmcts-version1-ignacio Jun 25, 2024
8888ead
Merge remote-tracking branch 'origin/feat/CIV-14128_CCD' into feat/CI…
Omaira-Melo-Hmcts Jun 26, 2024
aaf9076
CIV-14145 Fix tests tags
Omaira-Melo-Hmcts Jun 26, 2024
f5556d4
Merge branch 'feat/CIV-14145' into feat/CIV-14148
hmcts-version1-ignacio Jun 26, 2024
6beed20
Merge branch 'master' into feat/CIV-14145
Omaira-Melo-Hmcts Jun 26, 2024
4ae61bc
CIV-14156: Type of Discontinuance page - Initial Commit
sjamihmcts Jun 26, 2024
caf4263
CIV-14145 Fix cosmetic change for parties name
Omaira-Melo-Hmcts Jun 26, 2024
f036395
CIV-14148 Add new screen elements
hmcts-version1-ignacio Jun 26, 2024
0395b35
Merge branch 'feat/CIV-14145' into feat/CIV-14148
hmcts-version1-ignacio Jun 26, 2024
93c456e
CIV-14148 Update new screen show condition
hmcts-version1-ignacio Jun 26, 2024
0a19210
CIV-14148 Update fields
hmcts-version1-ignacio Jun 26, 2024
82c0feb
Merge branch 'master' into feat/CIV-14148
hmcts-version1-ignacio Jun 26, 2024
19f357c
CIV-14148 delete repeated list
hmcts-version1-ignacio Jun 26, 2024
91147f3
CIV-14148 Add API tests
hmcts-version1-ignacio Jun 26, 2024
2e4e8fd
CIV-14148 Refactor Yes or No list
hmcts-version1-ignacio Jun 27, 2024
88889bb
Merge remote-tracking branch 'origin/feat/CIV-14148' into feat/CIV-14…
sjamihmcts Jun 27, 2024
835ff6e
Merge branch 'feat/CIV-14148' into feat/CIV-14146_CCD
sjamihmcts Jun 27, 2024
ae482c3
CIV-14146: Added ccd fields - Initial Commit
sjamihmcts Jun 27, 2024
3d09a62
CIV-14233 added validate discontinue event
kalachandrasekar1 Jun 27, 2024
63707da
Updated role permission
kalachandrasekar1 Jun 27, 2024
23d11b5
Merge branch 'master' into feat/CIV-14233
kalachandrasekar1 Jun 27, 2024
2db4668
Merge branch 'feat/CIV-14233' of https://github.com/hmcts/civil-ccd-d…
kalachandrasekar1 Jun 27, 2024
55aefb0
Merge branch 'master' into feat/CIV-14146_CCD
sjamihmcts Jun 28, 2024
838146c
Merge branch 'master' into feat/CIV-14233
kalachandrasekar1 Jun 28, 2024
dfa9354
CIV-14146: Added fields for Permission Granted page
sjamihmcts Jul 1, 2024
387e478
Merge remote-tracking branch 'origin/feat/CIV-14146_CCD' into feat/CI…
kalachandrasekar1 Jul 1, 2024
8bbae8d
CIV-14146: Updated code to fix midEvent issue
sjamihmcts Jul 1, 2024
bba063f
CIV-14146: Updated field definition with HintText
sjamihmcts Jul 1, 2024
a596640
Merge branch 'master' into feat/CIV-14146_CCD
sjamihmcts Jul 2, 2024
9f13df9
CIV-14146: Updated as per review comments
sjamihmcts Jul 2, 2024
416177b
Merge branch 'master' into feat/CIV-14146_CCD
sjamihmcts Jul 2, 2024
60fbeb3
Merge remote-tracking branch 'origin/feat/CIV-14146_CCD' into feat/CI…
kalachandrasekar1 Jul 2, 2024
3c877b7
Merge branch 'master' into feat/CIV-14146_CCD
sjamihmcts Jul 2, 2024
439e606
CIV-14146: Removed duplicate fields
sjamihmcts Jul 2, 2024
0bfcb81
Merge remote-tracking branch 'origin/feat/CIV-14146_CCD' into feat/CI…
sjamihmcts Jul 2, 2024
654fa73
CIV-14146: Added a missing condition
sjamihmcts Jul 2, 2024
b52bab2
CIV-14236 Merge changes from CIV-14233
hmcts-version1-ignacio Jul 2, 2024
f32f9db
CIV-14236 Add Validate discontinuance screens
hmcts-version1-ignacio Jul 2, 2024
f5136df
Merge branch 'feat/CIV-14146_CCD' into feat/CIV-14156_CCD
sjamihmcts Jul 2, 2024
9a2759b
CIV-14146: Updated page display order
sjamihmcts Jul 2, 2024
c153acb
Merge branch 'master' into feat/CIV-14156_CCD
sjamihmcts Jul 3, 2024
ea67d22
CIV-14156:Updated the page labels
sjamihmcts Jul 3, 2024
142dafb
CIV-14156: Updated API tests
sjamihmcts Jul 3, 2024
fe0629b
CIV-14236 Add Validate discontinuance screens
hmcts-version1-ignacio Jul 3, 2024
1835742
CIV-14156: Updated labels to make them bold
sjamihmcts Jul 3, 2024
92531b0
CIV-14156: Updated labels to make them bold - few more
sjamihmcts Jul 3, 2024
bb3a90f
Merge branch 'master' into feat/CIV-14156_CCD
sjamihmcts Jul 3, 2024
a694bbf
CIV-14156: Updated to single quotes
sjamihmcts Jul 3, 2024
6ad66c2
Merge remote-tracking branch 'origin/feat/CIV-14156_CCD' into feat/CI…
sjamihmcts Jul 3, 2024
e710cbf
CIV-14156: Updated as per review comments
sjamihmcts Jul 3, 2024
eec026f
CIV-14156: Updated to just field labels as discussed with Ignacio. Th…
sjamihmcts Jul 3, 2024
3ed985c
CIV-14156: Updated label for Permission granted complex type as Summa…
sjamihmcts Jul 3, 2024
76efd91
CIV-14156 Add lines to screens
hmcts-version1-ignacio Jul 4, 2024
0e3bdf1
Merge branch 'master' into feat/CIV-14156_CCD
hmcts-version1-ignacio Jul 4, 2024
0d250f2
Merge branch 'feat/CIV-14156' into feat/CIV-14236
hmcts-version1-ignacio Jul 4, 2024
57052f0
CIV-14236 Update Validate discontinuance screens
hmcts-version1-ignacio Jul 4, 2024
55c2ad7
CIV-14194 initial commit
kalachandrasekar1 Jul 4, 2024
ee6eae9
Merge branch 'feat/CIV-14156_CCD' into feat/CIV-14194
kalachandrasekar1 Jul 5, 2024
beaa7f0
CIV-14194 testcase added
kalachandrasekar1 Jul 5, 2024
b2993dc
Merge branch 'master' into feat/CIV-14194
kalachandrasekar1 Jul 5, 2024
65b0dcd
Merge branch 'master' into feat/CIV-14194
kalachandrasekar1 Jul 8, 2024
0251703
CIV-14194 updated testcase
kalachandrasekar1 Jul 8, 2024
f8afcb1
CIV-14236 update permissions
hmcts-version1-ignacio Jul 8, 2024
f2bd9bf
CIV-14236 Fix variable issue
hmcts-version1-ignacio Jul 8, 2024
c107265
Merge branch 'master' into feat/CIV-14194
kalachandrasekar1 Jul 9, 2024
2f17559
Merge branch 'master' into feat/CIV-14236
hmcts-version1-ignacio Jul 9, 2024
ab40c2a
CIV-14236 Merge changes from 14194
hmcts-version1-ignacio Jul 9, 2024
3d496b7
CIV-14236 Add API tests
hmcts-version1-ignacio Jul 9, 2024
62aae89
CIV-14236 Add API tests
hmcts-version1-ignacio Jul 9, 2024
82194ae
Merge branch 'master' into feat/CIV-14236
hmcts-version1-ignacio Jul 10, 2024
d04266b
CIV-14236 Fix merge issue
hmcts-version1-ignacio Jul 10, 2024
dbc3c98
CIV-14236 Fix API tests
hmcts-version1-ignacio Jul 10, 2024
c205584
CIV-14236 Fix permission
hmcts-version1-ignacio Jul 10, 2024
e5f901a
Merge branch 'master' into feat/CIV-14236
hmcts-version1-ignacio Jul 10, 2024
e6691a3
Merge branch 'master' into feat/CIV-14236
hmcts-version1-ignacio Jul 11, 2024
3de6cb0
Merge branch 'master' into feat/CIV-14295
hmcts-version1-ignacio Jul 11, 2024
2e8e760
CIV-14295 Notification events and permissions
hmcts-version1-ignacio Jul 12, 2024
1451a2b
Merge branch 'master' into feat/CIV-14295
hmcts-version1-ignacio Jul 15, 2024
dc479cc
CIV-14295 Add new notification
hmcts-version1-ignacio Jul 15, 2024
b349a2a
CIV-14295 Update event name
hmcts-version1-ignacio Jul 15, 2024
1eec3e5
Merge branch 'master' into feat/CIV-14295
hmcts-version1-ignacio Jul 16, 2024
81bfa31
CIV-14295 Update event name
hmcts-version1-ignacio Jul 16, 2024
3e4fef9
CIV-14295 Add new camunda event
hmcts-version1-ignacio Jul 16, 2024
92b201c
CIV-14295 Update API tests user for local
hmcts-version1-ignacio Jul 16, 2024
9aaaa3c
Merge branch 'master' into feat/CIV-14295
hmcts-version1-ignacio Jul 16, 2024
4341575
CIV-14295 test pr
hmcts-version1-ignacio Jul 16, 2024
dfae9e5
CIV-14295 test pr
hmcts-version1-ignacio Jul 16, 2024
bee7cc5
CIV-14295 fix charts
hmcts-version1-ignacio Jul 17, 2024
5d156a4
Merge branch 'master' into feat/CIV-14295-test
Azam-Hmcts Jul 18, 2024
63bbce0
Merge branch 'master' into feat/CIV-14295-test
Azam-Hmcts Jul 18, 2024
262ca26
Update Jenkinsfile_CNP
Azam-Hmcts Jul 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,43 @@
"CRUD": "CRU"
}
]
},
{
"CaseTypeID": "CIVIL",
"CaseEventID": "NOTIFY_VALIDATION_DICONTINUANCE_FAILURE_CLAIMANT",
"AccessControl": [
{
"UserRoles": [
"caseworker-civil-systemupdate"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"caseworker-civil-admin",
"caseworker-civil-staff"
],
"CRUD": "R"
}
]
},
{
"CaseTypeID": "CIVIL",
"CaseEventID": "UPDATE_VISIBILITY_NOTICE_OF_DISCONTINUANCE",
"AccessControl": [
{
"UserRoles": [
"caseworker-civil-systemupdate"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"caseworker-civil-admin",
"caseworker-civil-staff"
],
"CRUD": "R"
}
]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,8 @@
{
"UserRoles": [
"caseworker-civil-admin",
"caseworker-civil-staff"
"caseworker-civil-staff",
"caseworker-civil-systemupdate"
],
"CRUD": "CRU"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,31 @@
"ShowSummary": "N",
"ShowEventNotes": "N",
"RetriesTimeoutURLAboutToSubmitEvent": 0
},
{
"CaseTypeID": "CIVIL",
"ID": "NOTIFY_VALIDATION_DICONTINUANCE_FAILURE_CLAIMANT",
"Name": "Notify Validation Failure",
"Description": "Notify Validation Failure Claimant",
"PreConditionState(s)": "*",
"PostConditionState": "*",
"SecurityClassification": "Public",
"CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
"ShowSummary": "N",
"ShowEventNotes": "N",
"RetriesTimeoutURLAboutToSubmitEvent": 0
},
{
"CaseTypeID": "CIVIL",
"ID": "UPDATE_VISIBILITY_NOTICE_OF_DISCONTINUANCE",
"Name": "Update Visibility Notice Disc",
"Description": "Update Visibility Notice of Discontinuance",
"PreConditionState(s)": "*",
"PostConditionState": "*",
"SecurityClassification": "Public",
"CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
"ShowSummary": "N",
"ShowEventNotes": "N",
"RetriesTimeoutURLAboutToSubmitEvent": 0
}

]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
civil-service:
java:
image: 'hmctspublic.azurecr.io/civil/service:latest'
image: 'hmctspublic.azurecr.io/civil/service:pr-5075'
keyVaults:
civil:
resourceGroup: civil
Expand Down
Original file line number Diff line number Diff line change
@@ -1,50 +1,51 @@
/* eslint-disable no-unused-vars */

const config = require('../../../config.js');
const solicitorUser = config.applicantSolicitorUser;
const caseWorkerUser = config.hearingCenterAdminWithRegionId2;
// To use on local because the idam images are different:
// const caseWorkerUser = config.tribunalCaseworkerWithRegionId1Local;
// const caseWorkerUser = config.hearingCenterAdminLocal;

Feature('CCD Settle and discontinue claim 2v1 API test @api-spec @api-nonprod @api-settle-discont');
Scenario('Settle claim 2v1 scenario', async ({I, api_spec}) => {
if (['preview', 'demo'].includes(config.runningEnv)) {
await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE');
await api_spec.createClaimWithRepresentedRespondent(solicitorUser, 'TWO_V_ONE');
await api_spec.createCaseFlags(caseWorkerUser);
await api_spec.manageCaseFlags(caseWorkerUser);
await api_spec.settleClaimSelectClaimant(config.applicantSolicitorUser, 'YES');
await api_spec.settleClaimSelectClaimant(solicitorUser, 'YES');
}
});

Scenario('Discontinue claim 1v2 scenario', async ({I, api_spec}) => {
if (['preview', 'demo'].includes(config.runningEnv)) {
let mpScenario = 'ONE_V_TWO';
await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario);
await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario);
await api_spec.discontinueClaim(solicitorUser, mpScenario);
}
});

Scenario('Discontinue claim 2v1 scenario', async ({I, api_spec}) => {
if (['preview', 'demo'].includes(config.runningEnv)) {
let mpScenario = 'TWO_V_ONE';
await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario);
await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario);
await api_spec.discontinueClaim(solicitorUser, mpScenario);
}
});

Scenario('Discontinue claim 1v1 scenario', async ({I, api_spec}) => {
if (['preview', 'demo'].includes(config.runningEnv)) {
let mpScenario = 'ONE_V_ONE';
await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario);
await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario);
await api_spec.discontinueClaim(solicitorUser, mpScenario);
}
});

Scenario('Validate discontinue claim claimant 1v1 scenario', async ({I, api_spec}) => {
if (['preview', 'demo'].includes(config.runningEnv)) {
let mpScenario = 'ONE_V_ONE';
let permission = 'YES';
await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario);
await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario);
await api_spec.discontinueClaim(solicitorUser, mpScenario);
await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission);
}
});
Expand All @@ -53,8 +54,8 @@ Scenario('Validate discontinue claim claimant 1v2 scenario', async ({I, api_spec
if (['preview', 'demo'].includes(config.runningEnv)) {
let mpScenario = 'ONE_V_TWO';
let permission = 'YES';
await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
await api_spec.discontinueClaim(config.applicantSolicitorUser, 'ONE_V_TWO_P_NEEDED');
await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario);
await api_spec.discontinueClaim(solicitorUser, 'ONE_V_TWO_P_NEEDED');
await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission);
}
});
Expand All @@ -63,8 +64,8 @@ Scenario('Validate discontinue claim claimant 1v2 negative scenario', async ({I,
if (['preview', 'demo'].includes(config.runningEnv)) {
let mpScenario = 'ONE_V_TWO';
let permission = 'NO';
await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
await api_spec.discontinueClaim(config.applicantSolicitorUser, 'ONE_V_TWO_P_NEEDED');
await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario);
await api_spec.discontinueClaim(solicitorUser, 'ONE_V_TWO_P_NEEDED');
await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission);
}
});
Expand Down
Loading