Skip to content

Commit

Permalink
CIV-0000 pulled over commits from test branch (#2291)
Browse files Browse the repository at this point in the history 
* pulled over commits from test branch

* added service image

* Update api_1v2_spec_test.js

* removed hard coded values

---------

Co-authored-by: m-meulendijks-v1 <[email protected]>
  • Loading branch information
@kurt-uk @m-meulendijks-v1
kurt-uk and m-meulendijks-v1 authored Mar 3, 2023
1 parent 6479561 commit 9f673ec
Show file tree
Hide file tree
Showing 14 changed files with 220 additions and 98 deletions.
12 changes: 12 additions & 0 deletions ccd-definition/AuthorisationCaseField/AuthorisationCaseField-nonprod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,17 @@
"CRUD": "R"
}
]
},
{
"CaseTypeID": "CIVIL",
"CaseFieldID": "businessProcess",
"AccessControl": [
{
"UserRoles": [
"APP-SOL-SPEC-PROFILE"
],
"CRUD": "RU"
}
]
}
]
11 changes: 9 additions & 2 deletions ccd-definition/AuthorisationCaseField/HearingNotice-nonprod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,15 @@
{
"CaseTypeID": "CIVIL",
"CaseFieldID": "claimIssuedPBADetails",
"UserRole": "caseworker-civil-systemupdate",
"CRUD": "CRU"
"AccessControl": [
{
"UserRoles": [
"caseworker-civil-solicitor",
"caseworker-civil-systemupdate"
],
"CRUD": "CRU"
}
]
},
{
"CaseTypeID": "CIVIL",
Expand Down
93 changes: 81 additions & 12 deletions e2e/api/steps_LRspec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ let caseData = {};

const data = {
CREATE_CLAIM: (scenario) => claimData.createClaim(scenario),
DEFENDANT_RESPONSE: (response) => require('../fixtures/events/defendantResponseSpec.js').respondToClaim(response),
DEFENDANT_RESPONSE2: (response) => require('../fixtures/events/defendantResponseSpec.js').respondToClaim2(response),
DEFENDANT_RESPONSE_1v2: (response) => require('../fixtures/events/defendantResponseSpec1v2.js').respondToClaim(response),
DEFENDANT_RESPONSE_2v1: (response) => require('../fixtures/events/defendantResponseSpec2v1.js').respondToClaim(response),
DEFENDANT_RESPONSE: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec.js').respondToClaim(response, camundaEvent),
DEFENDANT_RESPONSE2: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec.js').respondToClaim2(response, camundaEvent),
DEFENDANT_RESPONSE_1v2: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec1v2.js').respondToClaim(response, camundaEvent),
DEFENDANT_RESPONSE_2v1: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec2v1.js').respondToClaim(response, camundaEvent),
CLAIMANT_RESPONSE: (mpScenario) => require('../fixtures/events/claimantResponseSpec.js').claimantResponse(mpScenario),
CLAIMANT_RESPONSE_1v2: (response) => require('../fixtures/events/claimantResponseSpec1v2.js').claimantResponse(response),
CLAIMANT_RESPONSE_2v1: (response) => require('../fixtures/events/claimantResponseSpec2v1.js').claimantResponse(response),
INFORM_AGREED_EXTENSION_DATE: () => require('../fixtures/events/informAgreeExtensionDateSpec.js'),
INFORM_AGREED_EXTENSION_DATE: (camundaEvent) => require('../fixtures/events/informAgreeExtensionDateSpec.js').informExtension(camundaEvent),
DEFAULT_JUDGEMENT_SPEC: require('../fixtures/events/defaultJudgmentSpec.js'),
DEFAULT_JUDGEMENT_SPEC_1V2: require('../fixtures/events/defaultJudgment1v2Spec.js'),
DEFAULT_JUDGEMENT_SPEC_2V1: require('../fixtures/events/defaultJudgment2v1Spec.js')
Expand All @@ -43,36 +43,60 @@ const eventData = {
defendantResponses: {
ONE_V_ONE: {
FULL_DEFENCE: data.DEFENDANT_RESPONSE('FULL_DEFENCE'),
FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
FULL_ADMISSION: data.DEFENDANT_RESPONSE('FULL_ADMISSION'),
FULL_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE('FULL_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
PART_ADMISSION: data.DEFENDANT_RESPONSE('PART_ADMISSION'),
COUNTER_CLAIM: data.DEFENDANT_RESPONSE('COUNTER_CLAIM')
PART_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE('PART_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
COUNTER_CLAIM: data.DEFENDANT_RESPONSE('COUNTER_CLAIM'),
COUNTER_CLAIM_PBAv3: data.DEFENDANT_RESPONSE('COUNTER_CLAIM', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT')
},
ONE_V_TWO: {
FULL_DEFENCE: data.DEFENDANT_RESPONSE_1v2('FULL_DEFENCE'),
FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_1v2('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
FULL_ADMISSION: data.DEFENDANT_RESPONSE_1v2('FULL_ADMISSION'),
FULL_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE_1v2('FULL_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
PART_ADMISSION: data.DEFENDANT_RESPONSE_1v2('PART_ADMISSION'),
PART_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE_1v2('PART_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
COUNTER_CLAIM: data.DEFENDANT_RESPONSE_1v2('COUNTER_CLAIM'),
COUNTER_CLAIM_PBAv3: data.DEFENDANT_RESPONSE_1v2('COUNTER_CLAIM', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
DIFF_FULL_DEFENCE: data.DEFENDANT_RESPONSE_1v2('DIFF_FULL_DEFENCE'),
DIFF_NOT_FULL_DEFENCE: data.DEFENDANT_RESPONSE_1v2('DIFF_NOT_FULL_DEFENCE')
DIFF_FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_1v2('DIFF_FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
DIFF_NOT_FULL_DEFENCE: data.DEFENDANT_RESPONSE_1v2('DIFF_NOT_FULL_DEFENCE'),
DIFF_NOT_FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_1v2('DIFF_NOT_FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
},
ONE_V_ONE_DIF_SOL: {
FULL_DEFENCE1: data.DEFENDANT_RESPONSE('FULL_DEFENCE'),
FULL_DEFENCE1_PBAv3: data.DEFENDANT_RESPONSE('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
FULL_ADMISSION1: data.DEFENDANT_RESPONSE('FULL_ADMISSION'),
FULL_ADMISSION1_PBAv3: data.DEFENDANT_RESPONSE('FULL_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
PART_ADMISSION1: data.DEFENDANT_RESPONSE('PART_ADMISSION'),
PART_ADMISSION1_PBAv3: data.DEFENDANT_RESPONSE('PART_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
COUNTER_CLAIM1: data.DEFENDANT_RESPONSE('COUNTER_CLAIM'),
COUNTER_CLAIM1_PBAv3: data.DEFENDANT_RESPONSE('COUNTER_CLAIM', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),

FULL_DEFENCE2: data.DEFENDANT_RESPONSE2('FULL_DEFENCE'),
FULL_DEFENCE2_PBAv3: data.DEFENDANT_RESPONSE2('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
FULL_ADMISSION2: data.DEFENDANT_RESPONSE2('FULL_ADMISSION'),
FULL_ADMISSION2_PBAv3: data.DEFENDANT_RESPONSE2('FULL_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
PART_ADMISSION2: data.DEFENDANT_RESPONSE2('PART_ADMISSION'),
COUNTER_CLAIM2: data.DEFENDANT_RESPONSE2('COUNTER_CLAIM')
PART_ADMISSION2_PBAv3: data.DEFENDANT_RESPONSE2('PART_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
COUNTER_CLAIM2: data.DEFENDANT_RESPONSE2('COUNTER_CLAIM'),
COUNTER_CLAIM2_PBAv3: data.DEFENDANT_RESPONSE2('COUNTER_CLAIM', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT')
},
TWO_V_ONE: {
FULL_DEFENCE: data.DEFENDANT_RESPONSE_2v1('FULL_DEFENCE'),
FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_2v1('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
FULL_ADMISSION: data.DEFENDANT_RESPONSE_2v1('FULL_ADMISSION'),
FULL_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE_2v1('FULL_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
PART_ADMISSION: data.DEFENDANT_RESPONSE_2v1('PART_ADMISSION'),
PART_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE_2v1('PART_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
COUNTER_CLAIM: data.DEFENDANT_RESPONSE_2v1('COUNTER_CLAIM'),
COUNTER_CLAIM_PBAv3: data.DEFENDANT_RESPONSE_2v1('COUNTER_CLAIM', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
DIFF_FULL_DEFENCE: data.DEFENDANT_RESPONSE_2v1('DIFF_FULL_DEFENCE'),
DIFF_NOT_FULL_DEFENCE: data.DEFENDANT_RESPONSE_2v1('DIFF_NOT_FULL_DEFENCE')
DIFF_FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_2v1('DIFF_FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
DIFF_NOT_FULL_DEFENCE: data.DEFENDANT_RESPONSE_2v1('DIFF_NOT_FULL_DEFENCE'),
DIFF_NOT_FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_2v1('DIFF_NOT_FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
}
},
claimantResponses: {
Expand Down Expand Up @@ -164,9 +188,9 @@ module.exports = {
eventName = 'INFORM_AGREED_EXTENSION_DATE_SPEC';
await apiRequest.setupTokens(user);
caseData = await apiRequest.startEvent(eventName, caseId);
const pbaV3 = await checkToggleEnabled(PBAv3);


let informAgreedExtensionData = data.INFORM_AGREED_EXTENSION_DATE();
let informAgreedExtensionData = data.INFORM_AGREED_EXTENSION_DATE(pbaV3 ? 'CREATE_CLAIM_SPEC_AFTER_PAYMENT': 'CREATE_CLAIM_SPEC');

for (let pageId of Object.keys(informAgreedExtensionData.userInput)) {
await assertValidData(informAgreedExtensionData, pageId);
Expand All @@ -187,6 +211,11 @@ module.exports = {
await apiRequest.setupTokens(user);
eventName = 'DEFENDANT_RESPONSE_SPEC';

const pbaV3 = await checkToggleEnabled(PBAv3);
if(pbaV3){
response = response+'_PBAv3';
}

let returnedCaseData = await apiRequest.startEvent(eventName, caseId);

let defendantResponseData = eventData['defendantResponses'][scenario][response];
Expand Down Expand Up @@ -297,6 +326,38 @@ module.exports = {
let returnedCaseData = await apiRequest.startEvent(eventName, caseId);
caseData = returnedCaseData;
assertContainsPopulatedFields(returnedCaseData);

const pbaV3 = await checkToggleEnabled(PBAv3);
if(pbaV3){
let claimIssuedPBADetails = {
claimIssuedPBADetails:{
applicantsPbaAccounts: {
value: {
code:'66b21c60-aed1-11ed-8aa3-494efce63912',
label:'PBA0088192'
},
list_items:[
{
code:'66b21c60-aed1-11ed-8aa3-494efce63912',
label:'PBA0088192'
},
{
code:'66b21c61-aed1-11ed-8aa3-494efce63912',
label:'PBA0078095'
}
]
},
fee:{
calculatedAmountInPence:'8000',
code:'FEE0205',
version:'6'
},
serviceRequestReference:'2023-1676644996295'
}
};
caseData = update(caseData, claimIssuedPBADetails);
}

if (scenario === 'ONE_V_TWO') {
registrationData = {
registrationTypeRespondentOne: [
Expand Down Expand Up @@ -520,6 +581,7 @@ const assertValidDataDefaultJudgments = async (data, pageId, scenario) => {
responseBody = clearDataForSearchCriteria(responseBody); //Until WA release

assert.equal(response.status, 200);

if (pageId === 'defendantDetailsSpec') {
delete responseBody.data['registrationTypeRespondentOne'];
delete responseBody.data['registrationTypeRespondentTwo'];
Expand Down Expand Up @@ -618,7 +680,14 @@ const adjustDataForHnl = (inputData, response) => {
if (!response.startsWith('FULL_DEFENCE')) {
return inputData;
}
const respondentNum = response == 'FULL_DEFENCE' ? '1' : '2';

let fullDefence1v1 = false;
if(response === 'FULL_DEFENCE' || response == 'FULL_DEFENCE_AFTER_PAYMENT'){
fullDefence1v1 = true;
}

const respondentNum = response == fullDefence1v1 ? '1' : '2';

return {
...inputData,
userInput: {
Expand Down
44 changes: 32 additions & 12 deletions e2e/api/steps_LRspecFast.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,54 @@ let caseData = {};

const data = {
CREATE_CLAIM: (scenario) => claimData.createClaim(scenario),
DEFENDANT_RESPONSE: (response) => require('../fixtures/events/defendantResponseSpec.js').respondToClaim(response),
DEFENDANT_RESPONSE_1v2: (response) => require('../fixtures/events/defendantResponseSpec1v2Fast.js').respondToClaim(response),
DEFENDANT_RESPONSE_2v1: (response) => require('../fixtures/events/defendantResponseSpec2v1Fast.js').respondToClaim(response),
DEFENDANT_RESPONSE: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec.js').respondToClaim(response, camundaEvent),
DEFENDANT_RESPONSE_1v2: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec1v2Fast.js').respondToClaim(response, camundaEvent),
DEFENDANT_RESPONSE_2v1: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec2v1Fast.js').respondToClaim(response, camundaEvent),
CLAIMANT_RESPONSE: (mpScenario) => require('../fixtures/events/claimantResponseSpec.js').claimantResponse(mpScenario),
CLAIMANT_RESPONSE_1v2: (response) => require('../fixtures/events/claimantResponseSpec1v2Fast.js').claimantResponse(response),
CLAIMANT_RESPONSE_2v1: (response) => require('../fixtures/events/claimantResponseSpec2v1Fast.js').claimantResponse(response),
INFORM_AGREED_EXTENSION_DATE: () => require('../fixtures/events/informAgreeExtensionDateSpec.js')
INFORM_AGREED_EXTENSION_DATE: (camundaEvent) => require('../fixtures/events/informAgreeExtensionDateSpec.js').informExtension(camundaEvent)
};

const eventData = {
defendantResponses: {
ONE_V_ONE: {
FULL_DEFENCE: data.DEFENDANT_RESPONSE('FULL_DEFENCE'),
FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
FULL_ADMISSION: data.DEFENDANT_RESPONSE('FULL_ADMISSION'),
FULL_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
PART_ADMISSION: data.DEFENDANT_RESPONSE('PART_ADMISSION'),
COUNTER_CLAIM: data.DEFENDANT_RESPONSE('COUNTER_CLAIM')
PART_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
COUNTER_CLAIM: data.DEFENDANT_RESPONSE('COUNTER_CLAIM'),
COUNTER_CLAIM_PBAv3: data.DEFENDANT_RESPONSE('COUNTER_CLAIM', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT')
},
ONE_V_TWO: {
FULL_DEFENCE: data.DEFENDANT_RESPONSE_1v2('FULL_DEFENCE'),
FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_1v2('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
FULL_ADMISSION: data.DEFENDANT_RESPONSE_1v2('FULL_ADMISSION'),
FULL_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE_1v2('FULL_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
PART_ADMISSION: data.DEFENDANT_RESPONSE_1v2('PART_ADMISSION'),
PART_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE_1v2('PART_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
COUNTER_CLAIM: data.DEFENDANT_RESPONSE_1v2('COUNTER_CLAIM'),
COUNTER_CLAIM_PBAv3: data.DEFENDANT_RESPONSE_1v2('COUNTER_CLAIM', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
DIFF_FULL_DEFENCE: data.DEFENDANT_RESPONSE_1v2('DIFF_FULL_DEFENCE'),
DIFF_NOT_FULL_DEFENCE: data.DEFENDANT_RESPONSE_1v2('DIFF_NOT_FULL_DEFENCE')
DIFF_FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_1v2('DIFF_FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
DIFF_NOT_FULL_DEFENCE: data.DEFENDANT_RESPONSE_1v2('DIFF_NOT_FULL_DEFENCE'),
DIFF_NOT_FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_1v2('DIFF_NOT_FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT')
},
TWO_V_ONE:{
FULL_DEFENCE: data.DEFENDANT_RESPONSE_2v1('FULL_DEFENCE'),
FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_2v1('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
FULL_ADMISSION: data.DEFENDANT_RESPONSE_2v1('FULL_ADMISSION'),
FULL_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE_2v1('FULL_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
PART_ADMISSION: data.DEFENDANT_RESPONSE_2v1('PART_ADMISSION'),
PART_ADMISSION_PBAv3: data.DEFENDANT_RESPONSE_2v1('PART_ADMISSION', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
COUNTER_CLAIM: data.DEFENDANT_RESPONSE_2v1('COUNTER_CLAIM'),
COUNTER_CLAIM_PBAv3: data.DEFENDANT_RESPONSE_2v1('COUNTER_CLAIM', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
DIFF_FULL_DEFENCE: data.DEFENDANT_RESPONSE_2v1('DIFF_FULL_DEFENCE'),
DIFF_NOT_FULL_DEFENCE: data.DEFENDANT_RESPONSE_2v1('DIFF_NOT_FULL_DEFENCE')
DIFF_FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_2v1('DIFF_FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT'),
DIFF_NOT_FULL_DEFENCE: data.DEFENDANT_RESPONSE_2v1('DIFF_NOT_FULL_DEFENCE'),
DIFF_NOT_FULL_DEFENCE_PBAv3: data.DEFENDANT_RESPONSE_2v1('DIFF_NOT_FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT')
}
},
claimantResponses: {
Expand Down Expand Up @@ -122,9 +138,8 @@ module.exports = {
console.log('Service request update sent to callback URL');
}

await assignCaseRoleToUser(caseId, 'RESPONDENTSOLICITORONE', config.defendantSolicitorUser);

await waitForFinishedBusinessProcess(caseId);
await assignCaseRoleToUser(caseId, 'RESPONDENTSOLICITORONE', config.defendantSolicitorUser);
if(checkCaseFlagsEnabled()) {
await assertFlagsInitialisedAfterCreateClaim(config.adminUser, caseId);
}
Expand All @@ -139,9 +154,9 @@ module.exports = {
eventName = 'INFORM_AGREED_EXTENSION_DATE_SPEC';
await apiRequest.setupTokens(user);
caseData = await apiRequest.startEvent(eventName, caseId);
const pbaV3 = await checkToggleEnabled(PBAv3);


let informAgreedExtensionData = data.INFORM_AGREED_EXTENSION_DATE();
let informAgreedExtensionData = data.INFORM_AGREED_EXTENSION_DATE(pbaV3 ? 'CREATE_CLAIM_SPEC_AFTER_PAYMENT':'CREATE_CLAIM_SPEC');

for (let pageId of Object.keys(informAgreedExtensionData.userInput)) {
await assertValidData(informAgreedExtensionData, pageId);
Expand All @@ -161,6 +176,11 @@ module.exports = {
await apiRequest.setupTokens(user);
eventName = 'DEFENDANT_RESPONSE_SPEC';

const pbaV3 = await checkToggleEnabled(PBAv3);
if(pbaV3){
response = response+'_PBAv3';
}

let returnedCaseData = await apiRequest.startEvent(eventName, caseId);

let defendantResponseData = eventData['defendantResponses'][scenario][response];
Expand All @@ -187,7 +207,7 @@ module.exports = {
else if(scenario === 'ONE_V_TWO')
await assertSubmittedEvent('AWAITING_APPLICANT_INTENTION');
else if (scenario === 'TWO_V_ONE')
if (response === 'DIFF_FULL_DEFENCE')
if (response === 'DIFF_FULL_DEFENCE' || response === 'DIFF_FULL_DEFENCE_PBAv3')
await assertSubmittedEvent('PROCEEDS_IN_HERITAGE_SYSTEM');
else
await assertSubmittedEvent('AWAITING_APPLICANT_INTENTION');
Expand Down
Loading

0 comments on commit 9f673ec

Please sign in to comment.