diff --git a/e2e/api/steps.js b/e2e/api/steps.js index c825197751..0fec612aa2 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -44,7 +44,7 @@ const {adjustCaseSubmittedDateForMinti, assertTrackAfterClaimCreation, addSubmit const data = { INITIATE_GENERAL_APPLICATION: genAppClaimData.createGAData('Yes', null, '27500','FEE0442'), INITIATE_GENERAL_APPLICATION_LR: genAppClaimDataLR.createGAData('Yes', null, '27500','FEE0442'), - CREATE_CLAIM: (mpScenario, claimAmount, pbaV3, sdoR2) => claimData.createClaim(mpScenario, claimAmount, pbaV3, sdoR2), + CREATE_CLAIM: (mpScenario, claimAmount, pbaV3, sdoR2, hmcTest) => claimData.createClaim(mpScenario, claimAmount, pbaV3, sdoR2, hmcTest), CREATE_CLAIM_RESPONDENT_LIP: claimData.createClaimLitigantInPerson, CREATE_CLAIM_RESPONDENT_LR_LIP: claimData.createClaimLRLIP, CREATE_CLAIM_RESPONDENT_LIP_LIP: claimData.createClaimLIPLIP, @@ -239,7 +239,7 @@ let mpScenario = 'ONE_V_ONE'; module.exports = { - createClaimWithRepresentedRespondent: async (user, multipartyScenario, claimAmount = '11000', isMintiCaseEnabled = false) => { + createClaimWithRepresentedRespondent: async (user, multipartyScenario, claimAmount = '11000', isMintiCaseEnabled = false, hmcTest = false) => { eventName = 'CREATE_CLAIM'; caseId = null; caseData = {}; @@ -247,7 +247,7 @@ module.exports = { const pbaV3 = await checkToggleEnabled(PBAv3); const sdoR2 = await checkToggleEnabled(SDOR2); - let createClaimData = data.CREATE_CLAIM(mpScenario, claimAmount, pbaV3, sdoR2); + let createClaimData = data.CREATE_CLAIM(mpScenario, claimAmount, pbaV3, sdoR2, hmcTest); // Workaround, toggle is active after 31/01/2025, based on either submittedDate, or current localdatetime const isMintiEnabled = await checkMintiToggleEnabled() && isMintiCaseEnabled; @@ -1488,7 +1488,7 @@ const assertValidData = async (data, pageId, solicitor) => { assert.equal(response.status, 200); - + let claimValue; if (data.valid && data.valid.ClaimValue && data.valid.ClaimValue.claimValue && data.valid.ClaimValue.claimValue.statementOfValueInPennies) { @@ -1788,7 +1788,7 @@ function checkCalculated(calculated, responseBodyData) { function removeUuidsFromDynamicList(data, dynamicListField) { const dynamicElements = data[dynamicListField].list_items; - + return dynamicElements.map(({code, ...item}) => item); } diff --git a/e2e/api/steps_LRspecFast.js b/e2e/api/steps_LRspecFast.js index 63f92959f5..6e0791cc34 100644 --- a/e2e/api/steps_LRspecFast.js +++ b/e2e/api/steps_LRspecFast.js @@ -33,6 +33,7 @@ const data = { CREATE_CLAIM: (scenario, pbaV3) => claimData.createClaim(scenario, pbaV3), DEFENDANT_RESPONSE: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec.js').respondToClaim(response, camundaEvent, true), DEFENDANT_RESPONSE_1v2: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec1v2Fast.js').respondToClaim(response, camundaEvent), + DEFENDANT_RESPONSE_1v2_HMC: (response, camundaEvent, hmcTest) => require('../fixtures/events/defendantResponseSpec1v2Fast.js').respondToClaim(response, camundaEvent, hmcTest), DEFENDANT_RESPONSE_2v1: (response, camundaEvent) => require('../fixtures/events/defendantResponseSpec2v1Fast.js').respondToClaim(response, camundaEvent), CLAIMANT_RESPONSE: (mpScenario) => require('../fixtures/events/claimantResponseSpec.js').claimantResponse(mpScenario, true), CLAIMANT_RESPONSE_1v2: (response) => require('../fixtures/events/claimantResponseSpec1v2Fast.js').claimantResponse(response), @@ -56,6 +57,7 @@ const eventData = { 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_DEFENCE_PBAv3_HMC_TEST: data.DEFENDANT_RESPONSE_1v2_HMC('FULL_DEFENCE', 'CREATE_CLAIM_SPEC_AFTER_PAYMENT', true), 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'), @@ -215,7 +217,7 @@ module.exports = { await unAssignAllUsers(); }, - defendantResponse: async (user, response = 'FULL_DEFENCE', scenario = 'ONE_V_ONE') => { + defendantResponse: async (user, response = 'FULL_DEFENCE', scenario = 'ONE_V_ONE', hmctest = false) => { await apiRequest.setupTokens(user); eventName = 'DEFENDANT_RESPONSE_SPEC'; @@ -223,6 +225,9 @@ module.exports = { if(pbaV3){ response = response+'_PBAv3'; } + if (hmctest) { + response = response + '_HMC_TEST'; + } let returnedCaseData = await apiRequest.startEvent(eventName, caseId); diff --git a/e2e/config.js b/e2e/config.js index 21a4621d24..40c4a590f6 100644 --- a/e2e/config.js +++ b/e2e/config.js @@ -2,7 +2,8 @@ const defaultPassword = process.env.DEFAULT_PASSWORD; const judgeDefaultPassword = process.env.JUDGE_DEFAULT_PASSWORD; const iacDefaultPassword = process.env.IAC_DEFAULT_PASSWORD; const defaultPasswordSystemUser = process.env.SYSTEM_USER_PASSWORD; -const courtToBeSelected = process.env.TEST_EA_COURTS == 'true' ? 'Nottingham County Court And Family Court - Canal Street - NG1 7EJ' : 'Central London County Court - Thomas More Building, Royal Courts of Justice, Strand, London - WC2A 2LL'; +const courtToBeSelected = 'Central London County Court - Thomas More Building, Royal Courts of Justice, Strand, London - WC2A 2LL'; +const courtToBeSelectedHmc = 'Nottingham County Court And Family Court - Canal Street - NG1 7EJ'; module.exports = { idamStub: { @@ -355,7 +356,6 @@ module.exports = { TestForAccessibility: process.env.TESTS_FOR_ACCESSIBILITY === 'true', runningEnv: process.env.ENVIRONMENT, runWAApiTest: process.env.RUN_WA_API_TEST == 'true' || false, - testEarlyAdopterCourts: process.env.TEST_EA_COURTS == 'true' || false, claimantSolicitorOrgId: process.env.ENVIRONMENT === 'demo' ? 'B04IXE4' : 'Q1KOKP2', defendant1SolicitorOrgId: process.env.ENVIRONMENT === 'demo' ? 'DAWY9LJ' : '79ZRSOU', defendant2SolicitorOrgId: process.env.ENVIRONMENT === 'demo' ? 'LCVTI1I' : 'H2156A0', @@ -366,5 +366,7 @@ module.exports = { liverpoolCourt: 'Liverpool Civil and Family Court - 35, Vernon Street, City Square - L2 2BX', sdoJudgeSelectedCourt: courtToBeSelected, localNoCTests: false, - localMediationTests: false + localMediationTests: false, + claimantSelectedCourtHmc: courtToBeSelectedHmc, + defendantSelectedCourtHmc: courtToBeSelectedHmc, }; diff --git a/e2e/fixtures/events/createClaim.js b/e2e/fixtures/events/createClaim.js index 932a310b15..0b1f0257e0 100644 --- a/e2e/fixtures/events/createClaim.js +++ b/e2e/fixtures/events/createClaim.js @@ -71,8 +71,13 @@ let selectedPba = listElement('PBAFUNC12345'); const validPba = listElement('PBAFUNC12345'); const invalidPba = listElement('PBA0078095'); -const createClaimData = (pbaV3, legalRepresentation, useValidPba, mpScenario, claimAmount = '30000', sdoR2) => { +let claimantCourt = config.claimantSelectedCourt; +const useHmcEaCourt = config.claimantSelectedCourtHmc; +const useClaimantSelectedCourt = config.claimantSelectedCourt; + +const createClaimData = (pbaV3, legalRepresentation, useValidPba, mpScenario, claimAmount = '30000', sdoR2, hmcTest) => { selectedPba = useValidPba ? validPba : invalidPba; + claimantCourt = hmcTest ? useHmcEaCourt : useClaimantSelectedCourt; const claimData = { References: { @@ -86,9 +91,9 @@ const createClaimData = (pbaV3, legalRepresentation, useValidPba, mpScenario, cl courtLocation: { applicantPreferredCourtLocationList: { list_items: [ - listElement(config.claimantSelectedCourt) + listElement(claimantCourt) ], - value: listElement(config.claimantSelectedCourt) + value: listElement(claimantCourt) } }, applicant1DQRemoteHearing: { diff --git a/e2e/fixtures/events/defendantResponseSpec1v2Fast.js b/e2e/fixtures/events/defendantResponseSpec1v2Fast.js index a61294c2e0..bd94e9b9a6 100644 --- a/e2e/fixtures/events/defendantResponseSpec1v2Fast.js +++ b/e2e/fixtures/events/defendantResponseSpec1v2Fast.js @@ -1,7 +1,14 @@ const {listElement, element} = require('../../api/dataHelper'); const config = require('../../config.js'); + +let defendantCourt = config.claimantSelectedCourt; +const useHmcEaCourt = config.claimantSelectedCourtHmc; +const useDefendantSelectedCourt = config.claimantSelectedCourt; + module.exports = { - respondToClaim: (response = 'FULL_DEFENCE', camundaEvent = 'CREATE_CLAIM_SPEC') => { + respondToClaim: (response = 'FULL_DEFENCE', camundaEvent = 'CREATE_CLAIM_SPEC', hmcTest) => { + defendantCourt = hmcTest ? useHmcEaCourt : useDefendantSelectedCourt; + const responseData = { userInput: { ResponseConfirmNameAddress: { @@ -116,9 +123,9 @@ module.exports = { respondToCourtLocation: { responseCourtLocations: { list_items: [ - listElement(config.defendantSelectedCourt) + listElement(defendantCourt) ], - value: listElement(config.defendantSelectedCourt) + value: listElement(defendantCourt) }, reasonForHearingAtSpecificCourt: 'Reasons' }, @@ -297,9 +304,9 @@ module.exports = { respondToCourtLocation: { responseCourtLocations: { list_items: [ - listElement(config.defendantSelectedCourt) + listElement(defendantCourt) ], - value: listElement(config.defendantSelectedCourt) + value: listElement(defendantCourt) }, reasonForHearingAtSpecificCourt: 'Reasons' }, @@ -469,9 +476,9 @@ module.exports = { respondToCourtLocation: { responseCourtLocations: { list_items: [ - listElement(config.defendantSelectedCourt) + listElement(defendantCourt) ], - value: listElement(config.defendantSelectedCourt) + value: listElement(defendantCourt) }, reasonForHearingAtSpecificCourt: 'Reasons' }, diff --git a/e2e/tests/api_tests/automated_hearing_notice/hearing_notice_scheduler_test.js b/e2e/tests/api_tests/automated_hearing_notice/hearing_notice_scheduler_test.js index f47ce9f295..c3bfab8d0d 100644 --- a/e2e/tests/api_tests/automated_hearing_notice/hearing_notice_scheduler_test.js +++ b/e2e/tests/api_tests/automated_hearing_notice/hearing_notice_scheduler_test.js @@ -2,7 +2,7 @@ const config = require('../../../config'); Feature('Automated hearing notice schedulers @api-nonprod @AHN'); -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; let caseId; diff --git a/e2e/tests/api_tests/hearings/api_1v2DS_unspec_fast_hearings_test.js b/e2e/tests/api_tests/hearings/api_1v2DS_unspec_fast_hearings_test.js index 9583848341..cb0e92291c 100644 --- a/e2e/tests/api_tests/hearings/api_1v2DS_unspec_fast_hearings_test.js +++ b/e2e/tests/api_tests/hearings/api_1v2DS_unspec_fast_hearings_test.js @@ -6,18 +6,12 @@ const {checkCaseFlagsAndHmcEnabled} = require('../../../api/testingSupport'); const mpScenario = 'ONE_V_TWO_TWO_LEGAL_REP'; const fastClaimAmount = '11000'; const serviceId = 'AAA7'; +const hmcTest = true; let caseId; let caseFlagsAndHmcEnabled = false; let continueWithScenario = () => { - const continueWithScenario = [ - config.testEarlyAdopterCourts, - caseFlagsAndHmcEnabled - ].filter(condition => !condition).length == 0; - - console.log(`${continueWithScenario ? '' : 'not '}continuing with scenario as toggles are ${continueWithScenario ? '' : ' not '}enabled...`); - - return continueWithScenario; + return caseFlagsAndHmcEnabled; }; Feature('CCD 1v2 Unspec fast hearings API test @api-hearings-unspec @api-hearings @api-nonprod'); @@ -28,7 +22,7 @@ BeforeSuite(async () => { Scenario('1v2DS full defence defendant and claimant response', async ({api}) => { if(!continueWithScenario()) return; - await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, fastClaimAmount); + await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, fastClaimAmount, false, hmcTest); await api.notifyClaim(config.applicantSolicitorUser, mpScenario); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, 'solicitorOne'); @@ -47,7 +41,7 @@ Scenario('Listing officer adds case flags', async ({hearings}) => { Scenario('Judge choose hearing in person', async ({api}) => { if(!continueWithScenario()) return; - await api.createSDO(config.judgeUserWithRegionId1, 'CREATE_FAST_IN_PERSON'); + await api.createSDO(config.judgeUser2WithRegionId2, 'CREATE_FAST_IN_PERSON'); }); Scenario('Hearing centre admin requests a hearing', async ({hearings}) => { diff --git a/e2e/tests/api_tests/hearings/api_1v2_spec_fast_hearings_test.js b/e2e/tests/api_tests/hearings/api_1v2_spec_fast_hearings_test.js index 9959c96be8..8e69076b1f 100644 --- a/e2e/tests/api_tests/hearings/api_1v2_spec_fast_hearings_test.js +++ b/e2e/tests/api_tests/hearings/api_1v2_spec_fast_hearings_test.js @@ -1,21 +1,15 @@ - + const config = require('../../../config.js'); const {getLanguageInterpreterFlag, getRAWheelchairFlag} = require('../../../api/caseFlagsHelper'); const {checkCaseFlagsAndHmcEnabled} = require('../../../api/testingSupport'); const serviceId = 'AAA6'; +const hmcTest = true; let caseId; let caseFlagsAndHmcEnabled = false; let continueWithScenario = () => { - const continueWithScenario = [ - config.testEarlyAdopterCourts, - caseFlagsAndHmcEnabled - ].filter(condition => !condition).length == 0; - - console.log(`${continueWithScenario ? '' : 'not '}continuing with scenario as toggles are ${continueWithScenario ? '' : ' not '}enabled...`); - - return continueWithScenario; + return caseFlagsAndHmcEnabled; }; Feature('CCD 1v2 Spec fast hearings API test @api-hearings @api-hearings-spec @api-nonprod'); @@ -27,7 +21,7 @@ BeforeSuite(async () => { Scenario('1v2 fast claim full defence', async ({api_spec_fast}) => { if(!continueWithScenario()) return; await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO_SAME_SOL'); - await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_TWO'); + await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_TWO', hmcTest); await api_spec_fast.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_TWO', 'AWAITING_APPLICANT_INTENTION'); @@ -42,7 +36,7 @@ Scenario('Listing officer adds case flags', async ({hearings}) => { Scenario('Judge choose hearing in person', async ({api_spec_fast}) => { if(!continueWithScenario()) return; - await api_spec_fast.createSDO(config.judgeUserWithRegionId1, 'CREATE_FAST'); + await api_spec_fast.createSDO(config.judgeUser2WithRegionId2, 'CREATE_FAST'); }); Scenario('Hearing centre admin requests a hearing', async ({hearings}) => { diff --git a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js index be55785124..763a1ac3af 100644 --- a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js +++ b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js @@ -1,9 +1,10 @@ - + const config = require('../../../config.js'); const mpScenario = 'ONE_V_ONE'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const caseWorkerUser = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const caseWorkerUserReg1 = config.hearingCenterAdminWithRegionId1; +const caseWorkerUserReg2 = config.hearingCenterAdminWithRegionId2; // to use on local because the idam images are different // const judgeUser = config.judgeUserWithRegionId1Local; // const caseWorkerUser = config.tribunalCaseworkerWithRegionId1Local; @@ -25,7 +26,7 @@ async function prepareClaimSpecRecordJudgment(api_spec){ console.log('--createFinalOrderJO--'); await api_spec.createFinalOrderJO(judgeUser, 'FREE_FORM_ORDER'); console.log('--recordJudgment--'); - await api_spec.recordJudgment(caseWorkerUser, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); + await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); } Scenario('SetAside Default Judgment after judgment error - Spec claim 1v1 - Case taken offline', async ({I, api_spec}) => { @@ -34,15 +35,14 @@ Scenario('SetAside Default Judgment after judgment error - Spec claim 1v1 - Case await api_spec.amendRespondent1ResponseDeadline(config.systemupdate); await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false); console.log('--setAsideJudgment--'); - console.log(` user : ${caseWorkerUser.email} : config.testEarlyAdopterCourts : ${config.testEarlyAdopterCourts}`); - await api_spec.setAsideJudgment(config.hearingCenterAdminWithRegionId2, 'JUDGMENT_ERROR','ORDER_AFTER_DEFENCE','All_FINAL_ORDERS_ISSUED'); + await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGMENT_ERROR','ORDER_AFTER_DEFENCE','All_FINAL_ORDERS_ISSUED'); } }); Scenario('Record Judgment Spec claim 1v1 with mark paid in full', async ({I, api_spec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { await prepareClaimSpecRecordJudgment(api_spec); - await api_spec.editJudgment(caseWorkerUser, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_BY_DATE'); + await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_BY_DATE'); console.log('--markJudgmentPaid--'); await api_spec.markJudgmentPaid(config.applicantSolicitorUser); } @@ -52,7 +52,7 @@ Scenario('Refer To Judge Spec claim 1v1 Defence Received In Time', async ({I, ap if (['preview', 'demo'].includes(config.runningEnv)) { await prepareClaimSpecRecordJudgment(api_spec); console.log('--referToJudgeDefenceReceived--'); - await api_spec.referToJudgeDefenceReceived(caseWorkerUser); + await api_spec.referToJudgeDefenceReceived(caseWorkerUserReg1); } }); @@ -61,7 +61,7 @@ Scenario('SetAside Default Judgment Spec claim 1v1 - Record new judgment after h await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); await api_spec.amendRespondent1ResponseDeadline(config.systemupdate); await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false); - await api_spec.setAsideJudgment(config.hearingCenterAdminWithRegionId2, 'JUDGE_ORDER','ORDER_AFTER_APPLICATION', 'AWAITING_RESPONDENT_ACKNOWLEDGEMENT'); + await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER','ORDER_AFTER_APPLICATION', 'AWAITING_RESPONDENT_ACKNOWLEDGEMENT'); console.log('--defendantResponse--'); await api_spec.defendantResponse(config.defendantSolicitorUser); console.log('--claimantResponse--'); @@ -72,8 +72,8 @@ Scenario('SetAside Default Judgment Spec claim 1v1 - Record new judgment after h console.log('--createFinalOrderJO--'); await api_spec.createFinalOrderJO(judgeUser, 'FREE_FORM_ORDER'); console.log('--recordJudgment--'); - await api_spec.recordJudgment(caseWorkerUser, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); - await api_spec.editJudgment(caseWorkerUser, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IN_INSTALMENTS'); + await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); + await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IN_INSTALMENTS'); } }); diff --git a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js index dbde18240e..0ed5fd4e30 100644 --- a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js +++ b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js @@ -1,9 +1,10 @@ - + const config = require('../../../config.js'); const mpScenario = 'ONE_V_TWO'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const caseWorkerUser = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const caseWorkerUserReg1 = config.hearingCenterAdminWithRegionId1; +const caseWorkerUserReg2 = config.hearingCenterAdminWithRegionId2; // to use on local because the idam images are different // const judgeUser = config.judgeUserWithRegionId1Local; // const caseWorkerUser = config.tribunalCaseworkerWithRegionId1Local; @@ -31,7 +32,7 @@ Scenario('Default judgment Spec claim 1v2 - Set Aside After Order - Record new await api_spec.amendRespondent1ResponseDeadline(config.systemupdate); await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false); console.log('--setAsideJudgment--'); - await api_spec.setAsideJudgment(config.hearingCenterAdminWithRegionId2, 'JUDGE_ORDER', 'ORDER_AFTER_APPLICATION','AWAITING_RESPONDENT_ACKNOWLEDGEMENT'); + await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER', 'ORDER_AFTER_APPLICATION','AWAITING_RESPONDENT_ACKNOWLEDGEMENT'); console.log('--defendantResponse--'); await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'AWAITING_APPLICANT_INTENTION', false, false,'00000',true); @@ -43,8 +44,8 @@ Scenario('Default judgment Spec claim 1v2 - Set Aside After Order - Record new console.log('--createFinalOrderJO--'); await api_spec.createFinalOrderJO(judgeUser, 'FREE_FORM_ORDER'); console.log('--recordJudgment--'); - await api_spec.recordJudgment(caseWorkerUser, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); - await api_spec.editJudgment(caseWorkerUser, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_BY_DATE'); + await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); + await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_BY_DATE'); console.log('--markJudgmentPaid--'); await api_spec.markJudgmentPaid(config.applicantSolicitorUser); } @@ -56,7 +57,7 @@ Scenario('Default judgment Spec claim 1v2 - Set Aside after defence - Case taken await api_spec.amendRespondent1ResponseDeadline(config.systemupdate); await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false); console.log('--setAsideJudgment--'); - await api_spec.setAsideJudgment(config.hearingCenterAdminWithRegionId2, 'JUDGE_ORDER', 'ORDER_AFTER_DEFENCE', 'All_FINAL_ORDERS_ISSUED'); + await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER', 'ORDER_AFTER_DEFENCE', 'All_FINAL_ORDERS_ISSUED'); } }); @@ -65,10 +66,10 @@ Scenario('Record Judgment with mark judgment paid Spec claim 1v2', async ({I, ap console.log('--createClaimWithRepresentedRespondent--'); await prepareClaimSpecFinalOrderJO(api_spec); console.log('--recordJudgment--'); - await api_spec.recordJudgment(caseWorkerUser, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IN_INSTALMENTS'); - await api_spec.editJudgment(caseWorkerUser, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_BY_DATE'); + await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IN_INSTALMENTS'); + await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_BY_DATE'); console.log('--markJudgmentPaid--'); - await api_spec.markJudgmentPaid(caseWorkerUser); + await api_spec.markJudgmentPaid(caseWorkerUserReg1); } }); diff --git a/e2e/tests/api_tests/lrspec/api_1v2_spec_fast_test.js b/e2e/tests/api_tests/lrspec/api_1v2_spec_fast_test.js index 1e049179cd..d32db4e550 100644 --- a/e2e/tests/api_tests/lrspec/api_1v2_spec_fast_test.js +++ b/e2e/tests/api_tests/lrspec/api_1v2_spec_fast_test.js @@ -1,4 +1,4 @@ - + const config = require('../../../config.js'); const {checkCarmToggleEnabled} = require('../../../api/testingSupport'); @@ -12,8 +12,8 @@ Scenario('1v2 fast claim counter claim @api-spec-counterclaim', async ({I, api_s Scenario('1v2 fast claim full defence', async ({I, api_spec_fast}) => { await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO_SAME_SOL'); await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_TWO'); - await api_spec_fast.createCaseFlags(config.hearingCenterAdminWithRegionId2); - await api_spec_fast.manageCaseFlags(config.hearingCenterAdminWithRegionId2); + await api_spec_fast.createCaseFlags(config.hearingCenterAdminWithRegionId1); + await api_spec_fast.manageCaseFlags(config.hearingCenterAdminWithRegionId1); }); Scenario('1v2 different response full defence', async ({I, api_spec_fast}) => { diff --git a/e2e/tests/api_tests/lrspec/api_1v2_spec_test.js b/e2e/tests/api_tests/lrspec/api_1v2_spec_test.js index 701cfa5f83..4bf166cc97 100644 --- a/e2e/tests/api_tests/lrspec/api_1v2_spec_test.js +++ b/e2e/tests/api_tests/lrspec/api_1v2_spec_test.js @@ -15,8 +15,8 @@ Scenario('Create claim spec 1v2', async ({I, api_spec}) => { Scenario('1v2 small claim full defence, defendant response', async ({I, api_spec}) => { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO_SAME_SOL'); await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_TWO'); - await api_spec.createCaseFlags(config.hearingCenterAdminWithRegionId2); - await api_spec.manageCaseFlags(config.hearingCenterAdminWithRegionId2); + await api_spec.createCaseFlags(config.hearingCenterAdminWithRegionId1); + await api_spec.manageCaseFlags(config.hearingCenterAdminWithRegionId1); }); //Covered this scenario at line 65 diff --git a/e2e/tests/api_tests/lrspec/api_2v1_spec_fast_test.js b/e2e/tests/api_tests/lrspec/api_2v1_spec_fast_test.js index 4688b6edc5..47b6a084bf 100644 --- a/e2e/tests/api_tests/lrspec/api_2v1_spec_fast_test.js +++ b/e2e/tests/api_tests/lrspec/api_2v1_spec_fast_test.js @@ -1,4 +1,4 @@ - + const config = require('../../../config.js'); @@ -6,8 +6,8 @@ Feature('CCD 2v1 API test @api-spec-fast @api-specified @api-nightly-prod'); Scenario('2v1 fast claim full defence', async ({I, api_spec_fast}) => { await api_spec_fast.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); await api_spec_fast.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'TWO_V_ONE'); - await api_spec_fast.createCaseFlags(config.hearingCenterAdminWithRegionId2); - await api_spec_fast.manageCaseFlags(config.hearingCenterAdminWithRegionId2); + await api_spec_fast.createCaseFlags(config.hearingCenterAdminWithRegionId1); + await api_spec_fast.manageCaseFlags(config.hearingCenterAdminWithRegionId1); }); Scenario('2v1 fast claim counter claim @api-spec-counterclaim', async ({I, api_spec_fast}) => { diff --git a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js index d682fa1fef..49044b3516 100644 --- a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js +++ b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js @@ -5,8 +5,8 @@ const config = require('../../../config.js'); Feature('CCD 2v1 API test @api-spec @api-nightly-prod'); Scenario('2v1 small claim full defence', async ({I, api_spec}) => { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); - await api_spec.createCaseFlags(config.hearingCenterAdminWithRegionId2); - await api_spec.manageCaseFlags(config.hearingCenterAdminWithRegionId2); + await api_spec.createCaseFlags(config.hearingCenterAdminWithRegionId1); + await api_spec.manageCaseFlags(config.hearingCenterAdminWithRegionId1); await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'TWO_V_ONE'); }); diff --git a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_mediation_test.js b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_mediation_test.js index e40c40a955..917dc9cfe4 100644 --- a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_mediation_test.js +++ b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_mediation_test.js @@ -5,8 +5,7 @@ const claimType = 'SmallClaims'; let carmEnabled = false; let claimRef; -let mediationAdmin = config.localMediationTests ? config.nbcUserLocal : - (config.testEarlyAdopterCourts ? config.nbcUserWithRegionId2 : config.nbcUserWithRegionId1); +let mediationAdmin = config.nbcUserWithRegionId1; async function prepareClaim(api_spec_cui, carmEnabled) { claimRef = await api_spec_cui.createSpecifiedClaimWithUnrepresentedRespondent(config.applicantSolicitorUser, '', claimType, carmEnabled); diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js index 56fcc0b465..26f6e604d1 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js @@ -4,8 +4,8 @@ const config = require('../../../config.js'); const claimAmountPenniesIntermediate = '9900000'; const claimAmountIntermediate = '99000'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD 1v1 API test spec intermediate track @api-spec-multi-intermediate'); diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js index 554f470514..09699d707c 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js @@ -4,8 +4,8 @@ const config = require('../../../config.js'); const intermediateTrackClaimAmount = '99000'; const mintiEnabled = true; const track = 'INTERMEDIATE_CLAIM'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD API test unspec intermediate @api-unspec-multi-intermediate'); diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js index cb9c74c36e..1baa93991d 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js @@ -4,8 +4,8 @@ const config = require('../../../config.js'); const claimAmountPenniesMulti = '20000001'; const claimAmountMulti = '200001'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD 1v1 API test spec multi track @api-spec-multi-intermediate'); diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js index 0640bdcde4..b28b6645ba 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js @@ -4,8 +4,8 @@ const config = require('../../../config.js'); const multiTrackClaimAmount = '200001'; const mintiEnabled = true; const track = 'MULTI_CLAIM'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD API test unspec multi track @api-unspec-multi-intermediate'); diff --git a/e2e/tests/api_tests/sdo/api_transfer_online_case_test.js b/e2e/tests/api_tests/sdo/api_transfer_online_case_test.js index 0a14557c2a..1ae4b7e4f3 100644 --- a/e2e/tests/api_tests/sdo/api_transfer_online_case_test.js +++ b/e2e/tests/api_tests/sdo/api_transfer_online_case_test.js @@ -3,8 +3,8 @@ const config = require('../../../config.js'); const mpScenario1v1 = 'ONE_V_ONE'; const mpScenario1v2Spec = 'ONE_V_TWO'; const mpScenario1v2 = 'ONE_V_TWO_TWO_LEGAL_REP'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const caseWorkerUser = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const caseWorkerUser = config.hearingCenterAdminWithRegionId1; // To use on local because the idam images are different // const judgeUser = config.judgeUserWithRegionId1Local; // const caseWorkerUser = config.tribunalCaseworkerWithRegionId1Local; diff --git a/e2e/tests/api_tests/sdo/sdo_test.js b/e2e/tests/api_tests/sdo/sdo_test.js index 5b701d4435..aec6a0a619 100644 --- a/e2e/tests/api_tests/sdo/sdo_test.js +++ b/e2e/tests/api_tests/sdo/sdo_test.js @@ -1,8 +1,8 @@ const config = require('../../../config.js'); const mpScenario = 'ONE_V_ONE'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; const legalAdvUser = config.tribunalCaseworkerWithRegionId4; // to use on local because the idam images are different @@ -180,28 +180,19 @@ Scenario('1v1 full defence unspecified - judge draws disposal order - hearing sc if (config.runWAApiTest) { api.completeTaskByUser(judgeUser, taskId); } - if (config.testEarlyAdopterCourts) { - await api.evidenceUploadApplicant(config.applicantSolicitorUser); - await api.evidenceUploadRespondent(config.defendantSolicitorUser, mpScenario); - if (config.runWAApiTest) { - const hearingTask = await api.retrieveTaskDetails(hearingCenterAdminToBeUsed, caseId, config.waTaskIds.scheduleAHearing); - WA.validateTaskInfo(hearingTask, scheduleAHearingTask); - taskId = hearingTask['id']; - } - await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); - if (config.runWAApiTest) { - api.completeTaskByUser(hearingCenterAdminToBeUsed, taskId); - } - await api.amendHearingDueDate(config.systemupdate); - await api.hearingFeeUnpaid(hearingCenterAdminToBeUsed); - } else { - if (config.runWAApiTest) { - const caseProgressionTakeCaseOfflineTask = await api.retrieveTaskDetails(hearingCenterAdminToBeUsed, caseId, config.waTaskIds.listingOfficerCaseProgressionTask); - console.log('caseProgressionTakeCaseOfflineTask...' , caseProgressionTakeCaseOfflineTask); - taskId = caseProgressionTakeCaseOfflineTask['id']; - } - console.log('Transfer case offline task is created'); + await api.evidenceUploadApplicant(config.applicantSolicitorUser); + await api.evidenceUploadRespondent(config.defendantSolicitorUser, mpScenario); + if (config.runWAApiTest) { + const hearingTask = await api.retrieveTaskDetails(hearingCenterAdminToBeUsed, caseId, config.waTaskIds.scheduleAHearing); + WA.validateTaskInfo(hearingTask, scheduleAHearingTask); + taskId = hearingTask['id']; + } + await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); + if (config.runWAApiTest) { + api.completeTaskByUser(hearingCenterAdminToBeUsed, taskId); } + await api.amendHearingDueDate(config.systemupdate); + await api.hearingFeeUnpaid(hearingCenterAdminToBeUsed); }); Scenario('1v1 full defence specified - legal advisor draws disposal order - hearing scheduled @wa-r4 @sdo-spec @api-sdo', async ({api_spec_small, WA}) => { diff --git a/e2e/tests/api_tests/sdo_R2/api_dispute_resolution_hearing_test.js b/e2e/tests/api_tests/sdo_R2/api_dispute_resolution_hearing_test.js index 595367c617..e28b472089 100644 --- a/e2e/tests/api_tests/sdo_R2/api_dispute_resolution_hearing_test.js +++ b/e2e/tests/api_tests/sdo_R2/api_dispute_resolution_hearing_test.js @@ -1,8 +1,8 @@ const config = require('../../../config.js'); const mpScenario1v1 = 'ONE_V_ONE'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; // To use on local because the idam images are different //const judgeUser = config.judgeUserWithRegionId1Local; //const hearingCenterAdminToBeUsed = config.hearingCenterAdminLocal; diff --git a/e2e/tests/api_tests/sdo_R2/api_noise_induced_hearing_loss_test.js b/e2e/tests/api_tests/sdo_R2/api_noise_induced_hearing_loss_test.js index 72784482cb..253c9cc2b8 100644 --- a/e2e/tests/api_tests/sdo_R2/api_noise_induced_hearing_loss_test.js +++ b/e2e/tests/api_tests/sdo_R2/api_noise_induced_hearing_loss_test.js @@ -3,8 +3,8 @@ const config = require('../../../config.js'); const mpScenario1v1 = 'ONE_V_ONE'; const mpScenario1v1Nihl = 'ONE_V_ONE_NIHL'; const claimAmount = '11000'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; // To use on local because the idam images are different //const judgeUser = config.judgeUserWithRegionId1Local; //const hearingCenterAdminToBeUsed = config.hearingCenterAdminLocal; diff --git a/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js b/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js index a123fa3d35..1206ee17dc 100644 --- a/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js +++ b/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js @@ -1,8 +1,7 @@ const config = require('../../../config.js'); const legalAdvUser = config.tribunalCaseworkerWithRegionId4; // To use on local because the idam images are different -const judgeUserReg1 = config.judgeUserWithRegionId1; -const judgeUserForFastClaim = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; async function prepareClaimSpec(api_spec_small) { await api_spec_small.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_ONE', false, false); @@ -16,23 +15,23 @@ Scenario('1v1 spec request for reconsideration for uphold previous order', async await prepareClaimSpec(api_spec_small); await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM'); await api_spec_small.requestForReconsideration(config.applicantSolicitorUser, 'Applicant'); - await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg1, 'YES'); + await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'YES'); }); Scenario('1v1 spec request for reconsideration for create new SDO', async ({api_spec_small}) => { await prepareClaimSpec(api_spec_small); await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM'); await api_spec_small.requestForReconsideration(config.defendantSolicitorUser, 'Respondent1'); - await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg1, 'CREATE_SDO'); + await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'CREATE_SDO'); // Create a new SDO again - await api_spec_small.createSDO(judgeUserReg1, 'CREATE_SMALL_NO_SUM'); + await api_spec_small.createSDO(judgeUser, 'CREATE_SMALL_NO_SUM'); }); Scenario('1v1 spec request for reconsideration for create general order', async ({api_spec_small}) => { await prepareClaimSpec(api_spec_small); await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM'); await api_spec_small.requestForReconsideration(config.defendantSolicitorUser,'Respondent1'); - await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg1, 'CREATE_GENERAL_ORDER'); + await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'CREATE_GENERAL_ORDER'); }); Scenario('1v2 spec request for reconsideration by defendant2 for create general order', async ({api_spec_small}) => { @@ -42,7 +41,7 @@ Scenario('1v2 spec request for reconsideration by defendant2 for create general await api_spec_small.claimantResponse(config.applicantSolicitorUser, true); await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM'); await api_spec_small.requestForReconsideration(config.secondDefendantSolicitorUser,'Respondent2'); - await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg1, 'CREATE_GENERAL_ORDER'); + await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'CREATE_GENERAL_ORDER'); }); Scenario.skip('1v1 spec request for reconsideration when claim amount is greater than 1000', async ({api_spec}) => { @@ -50,7 +49,7 @@ Scenario.skip('1v1 spec request for reconsideration when claim amount is greater await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_ONE'); await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_ONE', 'JUDICIAL_REFERRAL'); - await api_spec.createSDO(judgeUserForFastClaim, 'CREATE_FAST'); + await api_spec.createSDO(judgeUser, 'CREATE_FAST'); //should throw 422 error as this event is not allowed for claim amount more than 1000 await api_spec.requestForReconsideration(config.defendantSolicitorUser); }); @@ -59,8 +58,8 @@ Scenario('1v1 spec request for reconsideration for create a new SDO ', async ({a await prepareClaimSpec(api_spec_small); await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM'); await api_spec_small.requestForReconsideration(config.defendantSolicitorUser,'Respondent1'); - await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg1, 'CREATE_SDO'); - await api_spec_small.notSuitableSdoChangeLocation(judgeUserReg1, 'CHANGE_LOCATION'); + await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'CREATE_SDO'); + await api_spec_small.notSuitableSdoChangeLocation(judgeUser, 'CHANGE_LOCATION'); }); AfterSuite(async ({api_spec_small, api_spec}) => { diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js index a55a005bd2..aad85165c8 100644 --- a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -1,4 +1,4 @@ - + const config = require('../../../config.js'); const solicitorUser = config.applicantSolicitorUser; diff --git a/e2e/tests/ui_tests/carm/spec_claim_upload_mediation_doc_test.js b/e2e/tests/ui_tests/carm/spec_claim_upload_mediation_doc_test.js index f54cf8cf27..0442fee897 100644 --- a/e2e/tests/ui_tests/carm/spec_claim_upload_mediation_doc_test.js +++ b/e2e/tests/ui_tests/carm/spec_claim_upload_mediation_doc_test.js @@ -1,8 +1,8 @@ - + const config = require('../../../config.js'); -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let civilCaseReference; diff --git a/e2e/tests/ui_tests/damages/1v2CreateClaim_DiffSol_fast_track_test.js b/e2e/tests/ui_tests/damages/1v2CreateClaim_DiffSol_fast_track_test.js index 2f6bee3946..a3d5741577 100644 --- a/e2e/tests/ui_tests/damages/1v2CreateClaim_DiffSol_fast_track_test.js +++ b/e2e/tests/ui_tests/damages/1v2CreateClaim_DiffSol_fast_track_test.js @@ -135,7 +135,7 @@ Scenario('Make a general application', async ({api}) => { Scenario('Create a Hearing Request', async ({I}) => { if (['demo'].includes(config.runningEnv)) { - await I.login(config.hearingCenterAdminWithRegionId2); + await I.login(config.hearingCenterAdminWithRegionId1); await I.amOnPage(config.url.manageCase + '/cases/case-details/' + caseNumber); await I.requestNewHearing(); await I.updateHearing(); diff --git a/e2e/tests/ui_tests/default_judgement/1v1UnspecDJ_test.js b/e2e/tests/ui_tests/default_judgement/1v1UnspecDJ_test.js index 7a0690f44a..136104704f 100644 --- a/e2e/tests/ui_tests/default_judgement/1v1UnspecDJ_test.js +++ b/e2e/tests/ui_tests/default_judgement/1v1UnspecDJ_test.js @@ -1,12 +1,12 @@ - + const config = require('../../../config.js'); let caseId, taskId, hearingDateIsLessThan3Weeks, validSummaryJudgmentDirectionsTask, validScheduleAHearingTask; const serviceRequest = require('../../../pages/createClaim/serviceRequest.page'); const { checkToggleEnabled } = require('../../../api/testingSupport'); const {PBAv3} = require('../../../fixtures/featureKeys'); -const judgeUserToBeUsed = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUserToBeUsed = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; if (config.runWAApiTest) { validSummaryJudgmentDirectionsTask = require('../../../../wa/tasks/summaryJudgmentDirectionsTask.js'); @@ -59,50 +59,30 @@ Scenario.skip('Judge perform direction order @create-claim @e2e-1v1-dj @e2e-wa @ }).retry(3); Scenario.skip('Hearing schedule @create-claim @e2e-1v1-dj @e2e-wa @master-e2e-ft @wa-r4', async ({I, api, WA}) => { - if (config.testEarlyAdopterCourts) { - if (config.runWAApiTest) { - const scheduleAHearingTask = await api.retrieveTaskDetails(hearingCenterAdminToBeUsed, caseId, config.waTaskIds.scheduleAHearing); - console.log('Schedule a hearing task...' , scheduleAHearingTask); - WA.validateTaskInfo(scheduleAHearingTask, validScheduleAHearingTask); - taskId = scheduleAHearingTask['id']; - } - await createHearingScheduled(I); - } else { - await I.login(hearingCenterAdminToBeUsed); - if (config.runWAApiTest) { - const caseProgressionTakeCaseOfflineTask = await api.retrieveTaskDetails(hearingCenterAdminToBeUsed, caseId, config.waTaskIds.listingOfficerCaseProgressionTask); - console.log('caseProgressionTakeCaseOfflineTask...' , caseProgressionTakeCaseOfflineTask); - taskId = caseProgressionTakeCaseOfflineTask['id']; - await api.assignTaskToUser(hearingCenterAdminToBeUsed, taskId); - } - await I.staffPerformDJCaseTransferCaseOffline(caseId); - if (config.runWAApiTest) { - await api.completeTaskByUser(judgeUserToBeUsed, taskId); - } + if (config.runWAApiTest) { + const scheduleAHearingTask = await api.retrieveTaskDetails(hearingCenterAdminToBeUsed, caseId, config.waTaskIds.scheduleAHearing); + console.log('Schedule a hearing task...' , scheduleAHearingTask); + WA.validateTaskInfo(scheduleAHearingTask, validScheduleAHearingTask); + taskId = scheduleAHearingTask['id']; } + await createHearingScheduled(I); }).retry(3); Scenario.skip ('Verify error on trial readiness @create-claim @e2e-1v1-dj @e2e-wa @master-e2e-ft @wa-r4', async ({I, api}) => { - if (config.testEarlyAdopterCourts) { - await api.amendHearingDate(config.systemupdate, '2022-01-10'); - hearingDateIsLessThan3Weeks = true; - await performConfirmTrialReadiness(I, config.defendantSolicitorUser, 'yes'); - } + await api.amendHearingDate(config.systemupdate, '2022-01-10'); + hearingDateIsLessThan3Weeks = true; + await performConfirmTrialReadiness(I, config.defendantSolicitorUser, 'yes'); }).retry(3); Scenario.skip('Confirm trial readiness @create-claim @e2e-1v1-dj @e2e-wa @master-e2e-ft @wa-r4', async ({I, api}) => { - if (config.testEarlyAdopterCourts) { - await api.amendHearingDate(config.systemupdate, '2025-01-10'); - hearingDateIsLessThan3Weeks = false; - await performConfirmTrialReadiness(I, config.applicantSolicitorUser, hearingDateIsLessThan3Weeks, 'no'); - await performConfirmTrialReadiness(I, config.defendantSolicitorUser, hearingDateIsLessThan3Weeks, 'yes'); - } + await api.amendHearingDate(config.systemupdate, '2025-01-10'); + hearingDateIsLessThan3Weeks = false; + await performConfirmTrialReadiness(I, config.applicantSolicitorUser, hearingDateIsLessThan3Weeks, 'no'); + await performConfirmTrialReadiness(I, config.defendantSolicitorUser, hearingDateIsLessThan3Weeks, 'yes'); }).retry(3); Scenario.skip('Pay hearing fee @create-claim @e2e-1v1-dj @e2e-wa @master-e2e-ft @wa-r4', async ({I}) => { - if (config.testEarlyAdopterCourts) { - await payHearingFee(I); - } + await payHearingFee(I); }).retry(3); async function createHearingScheduled(I) { diff --git a/e2e/tests/ui_tests/default_judgement/1v2UnspecDJ_test.js b/e2e/tests/ui_tests/default_judgement/1v2UnspecDJ_test.js index 99626e20c0..2aece9619f 100644 --- a/e2e/tests/ui_tests/default_judgement/1v2UnspecDJ_test.js +++ b/e2e/tests/ui_tests/default_judgement/1v2UnspecDJ_test.js @@ -1,4 +1,4 @@ - + const config = require('../../../config.js'); diff --git a/e2e/tests/ui_tests/hearings/1v2_Diff_Sols_Create_fast_track_With_Hearing_Request_test.js b/e2e/tests/ui_tests/hearings/1v2_Diff_Sols_Create_fast_track_With_Hearing_Request_test.js index bb60e2feef..cade43f315 100644 --- a/e2e/tests/ui_tests/hearings/1v2_Diff_Sols_Create_fast_track_With_Hearing_Request_test.js +++ b/e2e/tests/ui_tests/hearings/1v2_Diff_Sols_Create_fast_track_With_Hearing_Request_test.js @@ -1,8 +1,8 @@ const config = require('../../../config.js'); const {unAssignAllUsers} = require('../../../api/caseRoleAssignmentHelper'); const mpScenario = 'ONE_V_TWO_TWO_LEGAL_REP'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingUser = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingUser = config.hearingCenterAdminWithRegionId1; const claimAmountJudge = '11000'; let caseNumber; diff --git a/e2e/tests/ui_tests/sdo/minti_cp_test.js b/e2e/tests/ui_tests/sdo/minti_cp_test.js index 6d25ea8b00..5a691c305f 100644 --- a/e2e/tests/ui_tests/sdo/minti_cp_test.js +++ b/e2e/tests/ui_tests/sdo/minti_cp_test.js @@ -7,7 +7,7 @@ const mintiEnabled = true; const claimAmountMulti = '200001'; const track = 'INTERMEDIATE_CLAIM'; -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; let civilCaseReference; Feature('Intermediate and Multi tracks - Download order template Journey - Upload Bundle @non-prod-e2e-ft'); diff --git a/e2e/tests/ui_tests/settle_discontinue/1v1DiscontinueThisClaim_test.js b/e2e/tests/ui_tests/settle_discontinue/1v1DiscontinueThisClaim_test.js index 7b941d8c2c..1a0fe26ba6 100644 --- a/e2e/tests/ui_tests/settle_discontinue/1v1DiscontinueThisClaim_test.js +++ b/e2e/tests/ui_tests/settle_discontinue/1v1DiscontinueThisClaim_test.js @@ -1,8 +1,8 @@ const config = require('../../../config.js'); const {addUserCaseMapping} = require('../../../api/caseRoleAssignmentHelper'); const {unAssignAllUsers} = require('../../../api/caseRoleAssignmentHelper'); -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let caseNumber; const claimAmountJudge = '11000'; const mpScenario = 'ONE_V_ONE'; diff --git a/e2e/tests/ui_tests/settle_discontinue/1v1SettleThisClaim_test.js b/e2e/tests/ui_tests/settle_discontinue/1v1SettleThisClaim_test.js index f4da0b0803..44522ec2bb 100644 --- a/e2e/tests/ui_tests/settle_discontinue/1v1SettleThisClaim_test.js +++ b/e2e/tests/ui_tests/settle_discontinue/1v1SettleThisClaim_test.js @@ -47,7 +47,7 @@ Scenario('1v1 spec Reason for settlement - judges order', async ({api_spec_small Scenario('Reason for settlement - judges order', async ({LRspec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { - await LRspec.login(config.hearingCenterAdminWithRegionId2); + await LRspec.login(config.hearingCenterAdminWithRegionId1); await LRspec.requestSettleThisClaimJudgesOrderForUI(); } }).retry(3); @@ -71,7 +71,7 @@ Scenario('1v1 spec Reason for settlement - Consent order', async ({api_spec_smal Scenario('Reason for settlement - Consent order', async ({LRspec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { - await LRspec.login(config.hearingCenterAdminWithRegionId2); + await LRspec.login(config.hearingCenterAdminWithRegionId1); await LRspec.requestSettleThisClaimConsentOrderForUI(); } }).retry(3); diff --git a/e2e/tests/ui_tests/settle_discontinue/1v2DiscontinueThisClaim_test.js b/e2e/tests/ui_tests/settle_discontinue/1v2DiscontinueThisClaim_test.js index bb1d0eb0e9..53e8c53aab 100644 --- a/e2e/tests/ui_tests/settle_discontinue/1v2DiscontinueThisClaim_test.js +++ b/e2e/tests/ui_tests/settle_discontinue/1v2DiscontinueThisClaim_test.js @@ -1,8 +1,8 @@ const config = require('../../../config.js'); const {addUserCaseMapping} = require('../../../api/caseRoleAssignmentHelper'); const {unAssignAllUsers} = require('../../../api/caseRoleAssignmentHelper'); -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let caseNumber; const mpScenario = 'ONE_V_TWO_TWO_LEGAL_REP'; async function prepareClaimSpec1v2(api_spec_small) { diff --git a/e2e/tests/ui_tests/settle_discontinue/2v1DiscontinueThisClaim_test.js b/e2e/tests/ui_tests/settle_discontinue/2v1DiscontinueThisClaim_test.js index 7687459606..8812234247 100644 --- a/e2e/tests/ui_tests/settle_discontinue/2v1DiscontinueThisClaim_test.js +++ b/e2e/tests/ui_tests/settle_discontinue/2v1DiscontinueThisClaim_test.js @@ -1,8 +1,8 @@ const config = require('../../../config.js'); const {addUserCaseMapping} = require('../../../api/caseRoleAssignmentHelper'); const {unAssignAllUsers} = require('../../../api/caseRoleAssignmentHelper'); -const judgeUser = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1; -const hearingCenterAdminToBeUsed = config.testEarlyAdopterCourts ? config.hearingCenterAdminWithRegionId2 : config.hearingCenterAdminWithRegionId1; +const judgeUser = config.judgeUserWithRegionId1; +const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let caseNumber; const mpScenario = 'TWO_V_ONE'; async function prepareClaimSpec2v1(api_spec_small) { diff --git a/e2e/tests/ui_tests/settle_discontinue/2v1SettleThisClaim_test.js b/e2e/tests/ui_tests/settle_discontinue/2v1SettleThisClaim_test.js index d4ebdadf75..8435410b13 100644 --- a/e2e/tests/ui_tests/settle_discontinue/2v1SettleThisClaim_test.js +++ b/e2e/tests/ui_tests/settle_discontinue/2v1SettleThisClaim_test.js @@ -42,7 +42,7 @@ Scenario('2v1 spec Reason for settlement - judges order', async ({api_spec_small Scenario('Reason for settlement - judges order', async ({LRspec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { - await LRspec.login(config.hearingCenterAdminWithRegionId2); + await LRspec.login(config.hearingCenterAdminWithRegionId1); await LRspec.requestSettleThisClaimJudgesOrderForUI(); } }).retry(3); @@ -65,7 +65,7 @@ Scenario('2v1 spec Reason for settlement - Consent order', async ({api_spec_smal Scenario('Reason for settlement - Consent order', async ({LRspec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { - await LRspec.login(config.hearingCenterAdminWithRegionId2); + await LRspec.login(config.hearingCenterAdminWithRegionId1); await LRspec.requestSettleThisClaimConsentOrderForUI(); } }).retry(3);