From bec2b146a192c0902163f97da2f308f0b246b0a3 Mon Sep 17 00:00:00 2001 From: drummondjm Date: Wed, 26 Feb 2025 15:42:44 +0000 Subject: [PATCH 01/13] test removing minti date change --- e2e/api/steps.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 811e8a643f..22788976d9 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -255,12 +255,6 @@ module.exports = { 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; - if (isMintiEnabled) { - addSubmittedDateInCaseData(createClaimData); - } - //============================================================== await apiRequest.setupTokens(user); @@ -306,7 +300,6 @@ module.exports = { deleteCaseFields('applicantSolicitor1CheckEmail'); deleteCaseFields('applicantSolicitor1ClaimStatementOfTruth'); - await adjustCaseSubmittedDateForMinti(caseId, isMintiEnabled); await assertTrackAfterClaimCreation(config.adminUser, caseId, claimAmount, isMintiEnabled); return caseId; }, From 282794cb79c9f4b5ed9b7bbdfddf1bcf83ea4ff3 Mon Sep 17 00:00:00 2001 From: drummondjm Date: Wed, 26 Feb 2025 15:51:43 +0000 Subject: [PATCH 02/13] test removing minti date change --- e2e/api/steps.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 22788976d9..0180b6e3a0 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -26,8 +26,7 @@ const trialReadiness = require('../fixtures/events/trialReadiness.js'); const createFinalOrder = require('../fixtures/events/finalOrder.js'); const transferOnlineCase = require('../fixtures/events/transferOnlineCase.js'); const manageContactInformation = require('../fixtures/events/manageContactInformation.js'); -const {checkToggleEnabled, checkCaseFlagsEnabled, checkFastTrackUpliftsEnabled, checkManageContactInformationEnabled, - checkMintiToggleEnabled} = require('./testingSupport'); +const {checkToggleEnabled, checkCaseFlagsEnabled, checkFastTrackUpliftsEnabled, checkManageContactInformationEnabled} = require('./testingSupport'); const {cloneDeep} = require('lodash'); const {assertCaseFlags, assertFlagsInitialisedAfterCreateClaim, assertFlagsInitialisedAfterAddLitigationFriend} = require('../helpers/assertions/caseFlagsAssertions'); const {CASE_FLAGS} = require('../fixtures/caseFlags'); @@ -36,13 +35,11 @@ const {updateApplicant, updateLROrganisation} = require('./manageContactInformat const {fetchCaseDetails} = require('./apiRequest'); const {removeFlagsFieldsFromFixture, addFlagsToFixture} = require('../helpers/caseFlagsFeatureHelper'); const {removeFixedRecoveryCostFieldsFromUnspecDefendantResponseData, removeFastTrackAllocationFromSdoData} = require('../helpers/fastTrackUpliftsHelper'); -const {adjustCaseSubmittedDateForMinti, assertTrackAfterClaimCreation, addSubmittedDateInCaseData} = require('../helpers/mintiHelper'); const stayCase = require('../fixtures/events/stayCase'); const manageStay = require('../fixtures/events/manageStay'); const dismissCase = require('../fixtures/events/dismissCase'); const sendAndReplyMessage = require('../fixtures/events/sendAndReplyMessages'); - const data = { CREATE_CLAIM: (mpScenario, claimAmount, pbaV3, sdoR2, hmcTest) => claimData.createClaim(mpScenario, claimAmount, pbaV3, sdoR2, hmcTest), CREATE_CLAIM_RESPONDENT_LIP: claimData.createClaimLitigantInPerson, @@ -300,7 +297,6 @@ module.exports = { deleteCaseFields('applicantSolicitor1CheckEmail'); deleteCaseFields('applicantSolicitor1ClaimStatementOfTruth'); - await assertTrackAfterClaimCreation(config.adminUser, caseId, claimAmount, isMintiEnabled); return caseId; }, From 82edbb3af0fb7f815ec4fe669002428a48a4ec90 Mon Sep 17 00:00:00 2001 From: drummondjm <93932689+drummondjm@users.noreply.github.com> Date: Wed, 26 Feb 2025 18:09:51 +0000 Subject: [PATCH 03/13] Update values.preview.template.yaml --- charts/civil-ccd/values.preview.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml index 037ad99a1a..c83bf0acaf 100644 --- a/charts/civil-ccd/values.preview.template.yaml +++ b/charts/civil-ccd/values.preview.template.yaml @@ -3,7 +3,7 @@ civil-wa: civil-service: java: - image: 'hmctspublic.azurecr.io/civil/service:latest' + image: 'hmctspublic.azurecr.io/civil/service:pr-6208' keyVaults: civil: resourceGroup: civil From 05d1e03df95ff4e8ba0b25296af87fbef679e723 Mon Sep 17 00:00:00 2001 From: drummondjm Date: Thu, 27 Feb 2025 10:53:04 +0000 Subject: [PATCH 04/13] https://tools.hmcts.net/jira/browse/CIV-16556 move minti tests to prod clean up minti date logic --- e2e/api/steps.js | 2 +- e2e/api/steps_LRspec.js | 20 +++++-------------- e2e/api/steps_LRspecCui.js | 10 +--------- e2e/api/steps_LRspecFast.js | 2 -- e2e/fixtures/events/createClaimSpec.js | 4 ---- e2e/helpers/carmHelper.js | 4 ++-- e2e/helpers/mintiHelper.js | 20 ------------------- .../caseworkerEvents/api_caseworker_test.js | 3 +-- .../api_1v2DS_unspec_fast_hearings_test.js | 2 +- .../lrspec_cui/api_1v1_spec_cui_test.js | 2 +- .../api_intermediate_lrvlip_spec_test.js | 2 +- .../api_intermediate_spec_test.js | 4 ++-- .../api_intermediate_unspec_test.js | 5 ++--- .../api_multi_lrvlip_spec_test.js | 2 +- .../api_multi_spec_test.js | 2 +- .../api_multi_unspec_test.js | 5 ++--- .../minti/spec_intTrack_upload_bundle_test.js | 2 +- .../minti/spec_minti_LRResponse_test.js | 2 +- .../spec_multiTrack_upload_bundle_test.js | 2 +- ...pec_minti_finalOrder_upload_bundle_test.js | 7 +++---- 20 files changed, 27 insertions(+), 75 deletions(-) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 0180b6e3a0..7a17f447d5 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -242,7 +242,7 @@ let mpScenario = 'ONE_V_ONE'; module.exports = { - createClaimWithRepresentedRespondent: async (user, multipartyScenario, claimAmount = '11000', isMintiCaseEnabled = false, hmcTest = false) => { + createClaimWithRepresentedRespondent: async (user, multipartyScenario, claimAmount = '11000', hmcTest = false) => { eventName = 'CREATE_CLAIM'; caseId = null; caseData = {}; diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 9e23d4861b..cc608029b9 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -15,7 +15,7 @@ const claimData = require('../fixtures/events/createClaimSpec.js'); const expectedEvents = require('../fixtures/ccd/expectedEventsLRSpec.js'); const nonProdExpectedEvents = require('../fixtures/ccd/nonProdExpectedEventsLRSpec.js'); const testingSupport = require('./testingSupport'); -const {checkCaseFlagsEnabled, checkMintiToggleEnabled} = require('./testingSupport'); +const {checkCaseFlagsEnabled} = require('./testingSupport'); const {checkToggleEnabled} = require('./testingSupport'); const {fetchCaseDetails} = require('./apiRequest'); const {assertCaseFlags, assertFlagsInitialisedAfterCreateClaim} = require('../helpers/assertions/caseFlagsAssertions'); @@ -39,7 +39,7 @@ const settleClaim1v1Spec = require('../fixtures/events/settleClaim1v1Spec'); const discontinueClaimSpec = require('../fixtures/events/discontinueClaimSpec'); const validateDiscontinueClaimClaimantSpec = require('../fixtures/events/validateDiscontinueClaimClaimantSpec'); const {cloneDeep} = require('lodash'); -const {adjustCaseSubmittedDateForMinti, getMintiTrackByClaimAmount, assertTrackAfterClaimCreation} = require('../helpers/mintiHelper'); +const {getMintiTrackByClaimAmount} = require('../helpers/mintiHelper'); const stayCase = require('../fixtures/events/stayCase'); const manageStay = require('../fixtures/events/manageStay'); const dismissCase = require('../fixtures/events/dismissCase'); @@ -819,8 +819,8 @@ module.exports = { * @param user user to create the claim * @return {Promise} */ - createClaimWithRepresentedRespondent: async (user, scenario = 'ONE_V_ONE', carmEnabled = false, - isMintiCase = false, mintiClaimAmount = '00000') => { + createClaimWithRepresentedRespondent: async (user, scenario = 'ONE_V_ONE', isMintiCase = false, + mintiClaimAmount = '00000') => { const pbaV3 = await checkToggleEnabled(PBAv3); eventName = 'CREATE_CLAIM_SPEC'; caseId = null; @@ -871,10 +871,6 @@ module.exports = { //field is deleted in about to submit callback deleteCaseFields('applicantSolicitor1CheckEmail'); - await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); - const isMintiToggleEnabled = await checkMintiToggleEnabled(); - await adjustCaseSubmittedDateForMinti(caseId, (isMintiToggleEnabled && isMintiCase), carmEnabled); - return caseId; }, @@ -949,7 +945,6 @@ module.exports = { expectedEvent = 'AWAITING_APPLICANT_INTENTION', carmEnabled = false, isMintiCase = false, claimAmountMinti, djSetaside=false) => { - await adjustCaseSubmittedDateForCarm(caseId, carmEnabled, isMintiCase); await apiRequest.setupTokens(user); eventName = 'DEFENDANT_RESPONSE_SPEC'; @@ -1013,11 +1008,6 @@ module.exports = { await assertCaseFlags(caseId, user, response); } deleteCaseFields('respondent1Copy'); - const isMintiToggleEnabled = await checkMintiToggleEnabled(); - let claimAmount = caseData.totalClaimAmount; - if (!response.includes('COUNTER_CLAIM')) { - await assertTrackAfterClaimCreation(config.adminUser, caseId, claimAmount, (isMintiCase && isMintiToggleEnabled), true); - } }, claimantResponse: async (user, response = 'FULL_DEFENCE', scenario = 'ONE_V_ONE', @@ -1026,7 +1016,7 @@ module.exports = { deleteCaseFields('applicantSolicitor1ClaimStatementOfTruth'); deleteCaseFields('respondentResponseIsSame'); - await adjustCaseSubmittedDateForCarm(caseId, carmEnabled, isMintiCase); + await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); await apiRequest.setupTokens(user); diff --git a/e2e/api/steps_LRspecCui.js b/e2e/api/steps_LRspecCui.js index 1ef3f53419..7865b785b1 100644 --- a/e2e/api/steps_LRspecCui.js +++ b/e2e/api/steps_LRspecCui.js @@ -36,7 +36,6 @@ const trialReadiness = require('../fixtures/events/trialReadiness.js'); const lodash = require('lodash'); const createFinalOrder = require('../fixtures/events/finalOrder.js'); const judgeDecisionToReconsiderationRequest = require('../fixtures/events/judgeDecisionOnReconsiderationRequest'); -const {adjustCaseSubmittedDateForMinti} = require('../helpers/mintiHelper'); const stayCase = require('../fixtures/events/stayCase'); const manageStay = require('../fixtures/events/manageStay'); const dismissCase = require('../fixtures/events/dismissCase'); @@ -155,7 +154,7 @@ module.exports = { deleteCaseFields('applicantSolicitor1CheckEmail'); }, - createClaimWithUnrepresentedClaimant: async (user, claimType = 'SmallClaims', carmEnabled = false, typeOfData = '', isMintiCase = false) => { + createClaimWithUnrepresentedClaimant: async (user, claimType = 'SmallClaims', carmEnabled = false, typeOfData = '') => { console.log('Starting to create claim'); let payload = {}; await apiRequest.setupTokens(user); @@ -189,10 +188,6 @@ module.exports = { console.log('Claim issued'); await assignCaseRoleToUser(caseId, 'DEFENDANT', config.defendantCitizenUser2); await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); - if (isMintiCase) { - const isMintiToggleEnabled = await checkMintiToggleEnabled(); - await adjustCaseSubmittedDateForMinti(caseId, (isMintiToggleEnabled && isMintiCase), carmEnabled); - } return caseId; }, @@ -240,9 +235,6 @@ module.exports = { deleteCaseFields('applicantSolicitor1CheckEmail'); await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); - const isMintiToggleEnabled = await checkMintiToggleEnabled(); - await adjustCaseSubmittedDateForMinti(caseId, (isMintiToggleEnabled && (claimType === 'INTERMEDIATE' || claimType === 'MULTI')), carmEnabled); - return caseId; }, diff --git a/e2e/api/steps_LRspecFast.js b/e2e/api/steps_LRspecFast.js index d06ec0742c..2d994484a4 100644 --- a/e2e/api/steps_LRspecFast.js +++ b/e2e/api/steps_LRspecFast.js @@ -21,11 +21,9 @@ const {CASE_FLAGS} = require('../fixtures/caseFlags'); const {dateNoWeekends} = require('./dataHelper'); const {removeFixedRecoveryCostFieldsFromSpecClaimantResponseData, removeFastTrackAllocationFromSdoData} = require('../helpers/fastTrackUpliftsHelper'); const {addFlagsToFixture} = require('../helpers/caseFlagsFeatureHelper'); -const {adjustCaseSubmittedDateForCarm} = require('../helpers/carmHelper'); const sdoTracks = require('../fixtures/events/createSDO'); - let caseId, eventName; let caseData = {}; diff --git a/e2e/fixtures/events/createClaimSpec.js b/e2e/fixtures/events/createClaimSpec.js index cbc3b5a74d..def2e9de2d 100644 --- a/e2e/fixtures/events/createClaimSpec.js +++ b/e2e/fixtures/events/createClaimSpec.js @@ -88,10 +88,6 @@ module.exports = { applicantSolicitor1Reference: 'Applicant reference', respondentSolicitor1Reference: 'Respondent reference' }, - // Workaround, toggle is active after 27/02/2025, based on either submittedDate, or current localdatetime - ...(isMintiCaseEnabled) ? { - submittedDate:'2025-06-20T15:59:50' - }: {}, }, Claimant: { applicant1: applicant1WithPartyName diff --git a/e2e/helpers/carmHelper.js b/e2e/helpers/carmHelper.js index f3edea17cf..8954949cf1 100644 --- a/e2e/helpers/carmHelper.js +++ b/e2e/helpers/carmHelper.js @@ -3,8 +3,8 @@ const config = require('../config.js'); const testingSupport = require('./../api/testingSupport'); module.exports = { - adjustCaseSubmittedDateForCarm: async (caseId, carmEnabled = false, isMintiEnabled = false) => { - if (!carmEnabled && !isMintiEnabled) { + adjustCaseSubmittedDateForCarm: async (caseId, carmEnabled = false) => { + if (!carmEnabled) { console.log('carm not enabled, minti not enabled updating submitted date'); await apiRequest.setupTokens(config.systemupdate); const submittedDate = {'submittedDate':'2024-10-10T15:59:50'}; diff --git a/e2e/helpers/mintiHelper.js b/e2e/helpers/mintiHelper.js index d6001c5078..93bf03e3f7 100644 --- a/e2e/helpers/mintiHelper.js +++ b/e2e/helpers/mintiHelper.js @@ -48,26 +48,6 @@ function getCaseAllocatedTrack(case_data, isSpecCase) { } module.exports = { - addSubmittedDateInCaseData: (caseData) => { - caseData.valid.References.submittedDate = '2025-06-20T15:59:50'; - return caseData; - }, - adjustCaseSubmittedDateForMinti: async (caseId, isMintiEnabled = false, isCarmEnabled = false) => { - if (isMintiEnabled) { - console.log('multi Intermediate track is enabled'); - await apiRequest.setupTokens(config.systemupdate); - const submittedDate = {'submittedDate':'2025-06-20T15:59:50'}; - await testingSupport.updateCaseData(caseId, submittedDate); - console.log('submitted date update to after multi Intermediate track live date'); - } else if (!isMintiEnabled && !isCarmEnabled) { - console.log('multi Intermediate track not enabled, updating submitted date'); - await apiRequest.setupTokens(config.systemupdate); - const submittedDate = {'submittedDate':'2024-10-28T15:59:50'}; - await testingSupport.updateCaseData(caseId, submittedDate); - console.log('submitted date update to before multi Intermediate track live date'); - } - }, - getMintiTrackByClaimAmount(claimAmount) { if (claimAmount <= MintiMaxTrackAmounts.SMALL_CLAIM) { return 'SMALL_CLAIM'; diff --git a/e2e/tests/api_tests/caseworkerEvents/api_caseworker_test.js b/e2e/tests/api_tests/caseworkerEvents/api_caseworker_test.js index ecebea2888..7c2da18727 100644 --- a/e2e/tests/api_tests/caseworkerEvents/api_caseworker_test.js +++ b/e2e/tests/api_tests/caseworkerEvents/api_caseworker_test.js @@ -83,14 +83,13 @@ Scenario('1v1 LR LR v Lip In mediation', async ({api_spec_cui}) => { await api_spec_cui.dismissCase(config.hearingCenterAdminWithRegionId1); }); -const mintiEnabled = true; const claimAmountMulti = '200001'; Scenario('1v1 Multi Claim Stay Case Judicial Referral', async ({api}) => { const mpScenario = 'ONE_V_TWO_TWO_LEGAL_REP'; const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; - await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmountMulti, mintiEnabled); + await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmountMulti); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, 'solicitorOne'); 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 cb0e92291c..27a95b9390 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 @@ -22,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, false, hmcTest); + await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, fastClaimAmount, hmcTest); await api.notifyClaim(config.applicantSolicitorUser, mpScenario); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, 'solicitorOne'); diff --git a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js index 7b57e241c3..0641340d5b 100644 --- a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js +++ b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js @@ -20,7 +20,7 @@ async function prepareClaimLiPvLiP(api_spec_cui, carmEnabled, claimType = 'Small } async function prepareClaimLiPvLiPMintiTrack(api_spec_cui, carmEnabled, claimType = 'INTERMEDIATE') { - caseId = await api_spec_cui.createClaimWithUnrepresentedClaimant(config.applicantCitizenUser, claimType, carmEnabled, '', true); + caseId = await api_spec_cui.createClaimWithUnrepresentedClaimant(config.applicantCitizenUser, claimType, carmEnabled, '',); await api_spec_cui.performCitizenDefendantResponse(config.defendantCitizenUser2, caseId, claimType, carmEnabled); await api_spec_cui.performCitizenClaimantResponse(config.applicantCitizenUser, caseId, 'AWAITING_APPLICANT_INTENTION', carmEnabled); } diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_lrvlip_spec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_lrvlip_spec_test.js index d51007b638..5252f3f6f1 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_lrvlip_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_lrvlip_spec_test.js @@ -10,7 +10,7 @@ Before(async () => { await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); }); -Scenario('1v1 LR v LiP intermediate track @api-nonprod-specified', async ({api_spec_cui}) => { +Scenario('1v1 LR v LiP intermediate track @api-prod', async ({api_spec_cui}) => { let caseId = await api_spec_cui.createSpecifiedClaimWithUnrepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_ONE', claimType); await api_spec_cui.performCitizenDefendantResponse(config.defendantCitizenUser2, caseId, claimType); await api_spec_cui.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE_CITIZEN_DEFENDANT', 'ONE_V_ONE', 'No', 'AWAITING_APPLICANT_INTENTION', false, claimType); 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 4df62f17a6..76e9221f58 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js @@ -10,10 +10,10 @@ const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD 1v1 API test spec intermediate track @api-spec-multi-intermediate'); async function prepareClaim(api_spec, mpScenario) { - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesIntermediate); + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, true, claimAmountPenniesIntermediate); } -Scenario('1v1 FULL_DEFENCE Intermediate claim Specified @api-nonprod-specified', async ({api_spec}) => { +Scenario('1v1 FULL_DEFENCE Intermediate claim Specified @api-prod', async ({api_spec}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api_spec, mpScenario); await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'AWAITING_APPLICANT_INTENTION', false, true, claimAmountIntermediate); 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 32566f76e5..717deb83a6 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js @@ -2,7 +2,6 @@ const config = require('../../../config.js'); const intermediateTrackClaimAmount = '99000'; -const mintiEnabled = true; const track = 'INTERMEDIATE_CLAIM'; const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; @@ -10,7 +9,7 @@ const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD API test unspec intermediate @api-unspec-multi-intermediate'); async function prepareClaim(api, mpScenario, claimAmount) { - await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmount, mintiEnabled); + await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmount); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, null, track); @@ -20,7 +19,7 @@ async function prepareClaim(api, mpScenario, claimAmount) { await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); } -Scenario('1v1 Create Unspecified Intermediate Track claim @api-nonprod', async ({api}) => { +Scenario('1v1 Create Unspecified Intermediate Track claim @api-prod', async ({api}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api, mpScenario, intermediateTrackClaimAmount, track); }); diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_lrvlip_spec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_lrvlip_spec_test.js index 0bbb1625ba..804d25df44 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_lrvlip_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_lrvlip_spec_test.js @@ -11,7 +11,7 @@ Before(async () => { await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); }); -Scenario('1v1 LR v LiP multi track @api-nonprod-specified', async ({api_spec_cui}) => { +Scenario('1v1 LR v LiP multi track @api-prod', async ({api_spec_cui}) => { const mpScenario = 'ONE_V_ONE'; await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); let caseId = await api_spec_cui.createSpecifiedClaimWithUnrepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimType); 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 35aecb87c9..309fee6003 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js @@ -13,7 +13,7 @@ async function prepareClaim(api_spec, mpScenario) { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesMulti); } -Scenario('1v1 full defence Multi claim Specified @api-nonprod-specified', async ({api_spec}) => { +Scenario('1v1 full defence Multi claim Specified @api-prod', async ({api_spec}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api_spec, mpScenario); await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'AWAITING_APPLICANT_INTENTION', false, true, claimAmountMulti); 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 a11c9b3bbc..0c91153bf1 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js @@ -2,7 +2,6 @@ const config = require('../../../config.js'); const multiTrackClaimAmount = '200001'; -const mintiEnabled = true; const track = 'MULTI_CLAIM'; const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; @@ -10,7 +9,7 @@ const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD API test unspec multi track @api-unspec-multi-intermediate'); async function prepareClaim(api, mpScenario, claimAmount) { - await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmount, mintiEnabled); + await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmount); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await defendantResponse(api, mpScenario); @@ -20,7 +19,7 @@ async function prepareClaim(api, mpScenario, claimAmount) { await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); } -Scenario('1v1 Create Unspecified Multi Track claim @api-nonprod', async ({api}) => { +Scenario('1v1 Create Unspecified Multi Track claim @api-prod', async ({api}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api, mpScenario, multiTrackClaimAmount); }); diff --git a/e2e/tests/ui_tests/minti/spec_intTrack_upload_bundle_test.js b/e2e/tests/ui_tests/minti/spec_intTrack_upload_bundle_test.js index 87097b28cc..7bffd0b52d 100644 --- a/e2e/tests/ui_tests/minti/spec_intTrack_upload_bundle_test.js +++ b/e2e/tests/ui_tests/minti/spec_intTrack_upload_bundle_test.js @@ -5,7 +5,7 @@ let civilCaseReference; const claimAmountPenniesIntermediate = '9900000'; const claimAmountIntermediate = '99000'; -Feature('Intermediate track - Upload documents - Bundle @non-prod-e2e-ft'); +Feature('Intermediate track - Upload documents - Bundle @master-e2e-ft'); async function prepareSpecClaim(api_spec, mpScenario) { civilCaseReference = await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesIntermediate); diff --git a/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js b/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js index c23fa38e66..25637d0f2e 100644 --- a/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js +++ b/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js @@ -3,7 +3,7 @@ const { createAccount, deleteAccount } = require('../../../api/idamHelper'); const intermediateTrackClaimAmount = '99000'; const claimAmountMulti = '200001'; -Feature('Minti tracks - LR responses @non-prod-e2e-ft'); +Feature('Minti tracks - LR responses @master-e2e-ft'); Scenario('LR vs LIP Multi track - LR response', async ({api_spec_cui, I}) => { const mpScenario = 'ONE_V_ONE'; diff --git a/e2e/tests/ui_tests/minti/spec_multiTrack_upload_bundle_test.js b/e2e/tests/ui_tests/minti/spec_multiTrack_upload_bundle_test.js index 5567e4a93e..c9202430da 100644 --- a/e2e/tests/ui_tests/minti/spec_multiTrack_upload_bundle_test.js +++ b/e2e/tests/ui_tests/minti/spec_multiTrack_upload_bundle_test.js @@ -5,7 +5,7 @@ const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let civilCaseReference; -Feature('Multi track - Upload documents - Bundle @non-prod-e2e-ft'); +Feature('Multi track - Upload documents - Bundle @master-e2e-ft'); async function prepareSpecClaim(api_spec, mpScenario) { civilCaseReference = await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesMulti); diff --git a/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js b/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js index 52c44481c2..0b305d9ef4 100644 --- a/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js +++ b/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js @@ -3,7 +3,6 @@ const {unAssignAllUsers} = require('../../../api/caseRoleAssignmentHelper'); const intermediateTrackClaimAmount = '99000'; -const mintiEnabled = true; const claimAmountMulti = '200001'; const track = 'INTERMEDIATE_CLAIM'; @@ -11,11 +10,11 @@ const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let civilCaseReference; -Feature('Intermediate and Multi tracks - Download order template Journey - Upload Bundle @non-prod-e2e-ft'); +Feature('Intermediate and Multi tracks - Download order template Journey - Upload Bundle @master-e2e-ft'); Scenario('1v2 Same Solicitor Int Track - Download order template - Upload Bundle', async ({api, I}) => { const mpScenario = 'ONE_V_TWO_ONE_LEGAL_REP'; - civilCaseReference = await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, intermediateTrackClaimAmount, mintiEnabled); + civilCaseReference = await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, intermediateTrackClaimAmount); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, null, track); @@ -38,7 +37,7 @@ Scenario('1v2 Same Solicitor Int Track - Download order template - Upload Bundle Scenario('1v2 Different Solicitor Multi Track claim - Download order template - Upload Bundle', async ({api, I}) => { const mpScenario = 'ONE_V_TWO_TWO_LEGAL_REP'; - civilCaseReference = await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmountMulti, mintiEnabled); + civilCaseReference = await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmountMulti); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, 'solicitorOne'); From b32c00859c87d0e4eed13d729e0fff1f68a9ed32 Mon Sep 17 00:00:00 2001 From: drummondjm Date: Fri, 28 Feb 2025 12:14:39 +0000 Subject: [PATCH 05/13] update steps --- e2e/api/steps.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 7a17f447d5..241a0934d4 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -1208,9 +1208,7 @@ module.exports = { await assertValidData(scheduleData, pageId); } let expectedState = 'HEARING_READINESS'; - if (allocatedTrack === 'OTHER') { - expectedState = 'PREPARE_FOR_HEARING_CONDUCT_HEARING'; - } + await assertSubmittedEvent(expectedState, null, false); await waitForFinishedBusinessProcess(caseId); }, From cdca69047a099b3465278b0b96f182ccc6761dc7 Mon Sep 17 00:00:00 2001 From: drummondjm Date: Wed, 26 Feb 2025 15:42:44 +0000 Subject: [PATCH 06/13] test removing minti date change --- e2e/api/steps.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 811e8a643f..22788976d9 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -255,12 +255,6 @@ module.exports = { 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; - if (isMintiEnabled) { - addSubmittedDateInCaseData(createClaimData); - } - //============================================================== await apiRequest.setupTokens(user); @@ -306,7 +300,6 @@ module.exports = { deleteCaseFields('applicantSolicitor1CheckEmail'); deleteCaseFields('applicantSolicitor1ClaimStatementOfTruth'); - await adjustCaseSubmittedDateForMinti(caseId, isMintiEnabled); await assertTrackAfterClaimCreation(config.adminUser, caseId, claimAmount, isMintiEnabled); return caseId; }, From e67e445e390b6fac1e605a66b41a52729fa93578 Mon Sep 17 00:00:00 2001 From: drummondjm Date: Wed, 26 Feb 2025 15:51:43 +0000 Subject: [PATCH 07/13] test removing minti date change --- e2e/api/steps.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 22788976d9..0180b6e3a0 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -26,8 +26,7 @@ const trialReadiness = require('../fixtures/events/trialReadiness.js'); const createFinalOrder = require('../fixtures/events/finalOrder.js'); const transferOnlineCase = require('../fixtures/events/transferOnlineCase.js'); const manageContactInformation = require('../fixtures/events/manageContactInformation.js'); -const {checkToggleEnabled, checkCaseFlagsEnabled, checkFastTrackUpliftsEnabled, checkManageContactInformationEnabled, - checkMintiToggleEnabled} = require('./testingSupport'); +const {checkToggleEnabled, checkCaseFlagsEnabled, checkFastTrackUpliftsEnabled, checkManageContactInformationEnabled} = require('./testingSupport'); const {cloneDeep} = require('lodash'); const {assertCaseFlags, assertFlagsInitialisedAfterCreateClaim, assertFlagsInitialisedAfterAddLitigationFriend} = require('../helpers/assertions/caseFlagsAssertions'); const {CASE_FLAGS} = require('../fixtures/caseFlags'); @@ -36,13 +35,11 @@ const {updateApplicant, updateLROrganisation} = require('./manageContactInformat const {fetchCaseDetails} = require('./apiRequest'); const {removeFlagsFieldsFromFixture, addFlagsToFixture} = require('../helpers/caseFlagsFeatureHelper'); const {removeFixedRecoveryCostFieldsFromUnspecDefendantResponseData, removeFastTrackAllocationFromSdoData} = require('../helpers/fastTrackUpliftsHelper'); -const {adjustCaseSubmittedDateForMinti, assertTrackAfterClaimCreation, addSubmittedDateInCaseData} = require('../helpers/mintiHelper'); const stayCase = require('../fixtures/events/stayCase'); const manageStay = require('../fixtures/events/manageStay'); const dismissCase = require('../fixtures/events/dismissCase'); const sendAndReplyMessage = require('../fixtures/events/sendAndReplyMessages'); - const data = { CREATE_CLAIM: (mpScenario, claimAmount, pbaV3, sdoR2, hmcTest) => claimData.createClaim(mpScenario, claimAmount, pbaV3, sdoR2, hmcTest), CREATE_CLAIM_RESPONDENT_LIP: claimData.createClaimLitigantInPerson, @@ -300,7 +297,6 @@ module.exports = { deleteCaseFields('applicantSolicitor1CheckEmail'); deleteCaseFields('applicantSolicitor1ClaimStatementOfTruth'); - await assertTrackAfterClaimCreation(config.adminUser, caseId, claimAmount, isMintiEnabled); return caseId; }, From 94ee5e023533d9a336784fef9c99e3c2781172e0 Mon Sep 17 00:00:00 2001 From: drummondjm <93932689+drummondjm@users.noreply.github.com> Date: Wed, 26 Feb 2025 18:09:51 +0000 Subject: [PATCH 08/13] Update values.preview.template.yaml --- charts/civil-ccd/values.preview.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml index 037ad99a1a..c83bf0acaf 100644 --- a/charts/civil-ccd/values.preview.template.yaml +++ b/charts/civil-ccd/values.preview.template.yaml @@ -3,7 +3,7 @@ civil-wa: civil-service: java: - image: 'hmctspublic.azurecr.io/civil/service:latest' + image: 'hmctspublic.azurecr.io/civil/service:pr-6208' keyVaults: civil: resourceGroup: civil From b169b4261563d1061520314ac869d2a78cc984ac Mon Sep 17 00:00:00 2001 From: drummondjm Date: Thu, 27 Feb 2025 10:53:04 +0000 Subject: [PATCH 09/13] https://tools.hmcts.net/jira/browse/CIV-16556 move minti tests to prod clean up minti date logic --- e2e/api/steps.js | 2 +- e2e/api/steps_LRspec.js | 20 +++++-------------- e2e/api/steps_LRspecCui.js | 10 +--------- e2e/api/steps_LRspecFast.js | 2 -- e2e/fixtures/events/createClaimSpec.js | 4 ---- e2e/helpers/carmHelper.js | 4 ++-- e2e/helpers/mintiHelper.js | 20 ------------------- .../caseworkerEvents/api_caseworker_test.js | 3 +-- .../api_1v2DS_unspec_fast_hearings_test.js | 2 +- .../lrspec_cui/api_1v1_spec_cui_test.js | 2 +- .../api_intermediate_lrvlip_spec_test.js | 2 +- .../api_intermediate_spec_test.js | 4 ++-- .../api_intermediate_unspec_test.js | 5 ++--- .../api_multi_lrvlip_spec_test.js | 2 +- .../api_multi_spec_test.js | 2 +- .../api_multi_unspec_test.js | 5 ++--- .../minti/spec_intTrack_upload_bundle_test.js | 2 +- .../minti/spec_minti_LRResponse_test.js | 2 +- .../spec_multiTrack_upload_bundle_test.js | 2 +- ...pec_minti_finalOrder_upload_bundle_test.js | 7 +++---- 20 files changed, 27 insertions(+), 75 deletions(-) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 0180b6e3a0..7a17f447d5 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -242,7 +242,7 @@ let mpScenario = 'ONE_V_ONE'; module.exports = { - createClaimWithRepresentedRespondent: async (user, multipartyScenario, claimAmount = '11000', isMintiCaseEnabled = false, hmcTest = false) => { + createClaimWithRepresentedRespondent: async (user, multipartyScenario, claimAmount = '11000', hmcTest = false) => { eventName = 'CREATE_CLAIM'; caseId = null; caseData = {}; diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 9e23d4861b..cc608029b9 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -15,7 +15,7 @@ const claimData = require('../fixtures/events/createClaimSpec.js'); const expectedEvents = require('../fixtures/ccd/expectedEventsLRSpec.js'); const nonProdExpectedEvents = require('../fixtures/ccd/nonProdExpectedEventsLRSpec.js'); const testingSupport = require('./testingSupport'); -const {checkCaseFlagsEnabled, checkMintiToggleEnabled} = require('./testingSupport'); +const {checkCaseFlagsEnabled} = require('./testingSupport'); const {checkToggleEnabled} = require('./testingSupport'); const {fetchCaseDetails} = require('./apiRequest'); const {assertCaseFlags, assertFlagsInitialisedAfterCreateClaim} = require('../helpers/assertions/caseFlagsAssertions'); @@ -39,7 +39,7 @@ const settleClaim1v1Spec = require('../fixtures/events/settleClaim1v1Spec'); const discontinueClaimSpec = require('../fixtures/events/discontinueClaimSpec'); const validateDiscontinueClaimClaimantSpec = require('../fixtures/events/validateDiscontinueClaimClaimantSpec'); const {cloneDeep} = require('lodash'); -const {adjustCaseSubmittedDateForMinti, getMintiTrackByClaimAmount, assertTrackAfterClaimCreation} = require('../helpers/mintiHelper'); +const {getMintiTrackByClaimAmount} = require('../helpers/mintiHelper'); const stayCase = require('../fixtures/events/stayCase'); const manageStay = require('../fixtures/events/manageStay'); const dismissCase = require('../fixtures/events/dismissCase'); @@ -819,8 +819,8 @@ module.exports = { * @param user user to create the claim * @return {Promise} */ - createClaimWithRepresentedRespondent: async (user, scenario = 'ONE_V_ONE', carmEnabled = false, - isMintiCase = false, mintiClaimAmount = '00000') => { + createClaimWithRepresentedRespondent: async (user, scenario = 'ONE_V_ONE', isMintiCase = false, + mintiClaimAmount = '00000') => { const pbaV3 = await checkToggleEnabled(PBAv3); eventName = 'CREATE_CLAIM_SPEC'; caseId = null; @@ -871,10 +871,6 @@ module.exports = { //field is deleted in about to submit callback deleteCaseFields('applicantSolicitor1CheckEmail'); - await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); - const isMintiToggleEnabled = await checkMintiToggleEnabled(); - await adjustCaseSubmittedDateForMinti(caseId, (isMintiToggleEnabled && isMintiCase), carmEnabled); - return caseId; }, @@ -949,7 +945,6 @@ module.exports = { expectedEvent = 'AWAITING_APPLICANT_INTENTION', carmEnabled = false, isMintiCase = false, claimAmountMinti, djSetaside=false) => { - await adjustCaseSubmittedDateForCarm(caseId, carmEnabled, isMintiCase); await apiRequest.setupTokens(user); eventName = 'DEFENDANT_RESPONSE_SPEC'; @@ -1013,11 +1008,6 @@ module.exports = { await assertCaseFlags(caseId, user, response); } deleteCaseFields('respondent1Copy'); - const isMintiToggleEnabled = await checkMintiToggleEnabled(); - let claimAmount = caseData.totalClaimAmount; - if (!response.includes('COUNTER_CLAIM')) { - await assertTrackAfterClaimCreation(config.adminUser, caseId, claimAmount, (isMintiCase && isMintiToggleEnabled), true); - } }, claimantResponse: async (user, response = 'FULL_DEFENCE', scenario = 'ONE_V_ONE', @@ -1026,7 +1016,7 @@ module.exports = { deleteCaseFields('applicantSolicitor1ClaimStatementOfTruth'); deleteCaseFields('respondentResponseIsSame'); - await adjustCaseSubmittedDateForCarm(caseId, carmEnabled, isMintiCase); + await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); await apiRequest.setupTokens(user); diff --git a/e2e/api/steps_LRspecCui.js b/e2e/api/steps_LRspecCui.js index 1ef3f53419..7865b785b1 100644 --- a/e2e/api/steps_LRspecCui.js +++ b/e2e/api/steps_LRspecCui.js @@ -36,7 +36,6 @@ const trialReadiness = require('../fixtures/events/trialReadiness.js'); const lodash = require('lodash'); const createFinalOrder = require('../fixtures/events/finalOrder.js'); const judgeDecisionToReconsiderationRequest = require('../fixtures/events/judgeDecisionOnReconsiderationRequest'); -const {adjustCaseSubmittedDateForMinti} = require('../helpers/mintiHelper'); const stayCase = require('../fixtures/events/stayCase'); const manageStay = require('../fixtures/events/manageStay'); const dismissCase = require('../fixtures/events/dismissCase'); @@ -155,7 +154,7 @@ module.exports = { deleteCaseFields('applicantSolicitor1CheckEmail'); }, - createClaimWithUnrepresentedClaimant: async (user, claimType = 'SmallClaims', carmEnabled = false, typeOfData = '', isMintiCase = false) => { + createClaimWithUnrepresentedClaimant: async (user, claimType = 'SmallClaims', carmEnabled = false, typeOfData = '') => { console.log('Starting to create claim'); let payload = {}; await apiRequest.setupTokens(user); @@ -189,10 +188,6 @@ module.exports = { console.log('Claim issued'); await assignCaseRoleToUser(caseId, 'DEFENDANT', config.defendantCitizenUser2); await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); - if (isMintiCase) { - const isMintiToggleEnabled = await checkMintiToggleEnabled(); - await adjustCaseSubmittedDateForMinti(caseId, (isMintiToggleEnabled && isMintiCase), carmEnabled); - } return caseId; }, @@ -240,9 +235,6 @@ module.exports = { deleteCaseFields('applicantSolicitor1CheckEmail'); await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); - const isMintiToggleEnabled = await checkMintiToggleEnabled(); - await adjustCaseSubmittedDateForMinti(caseId, (isMintiToggleEnabled && (claimType === 'INTERMEDIATE' || claimType === 'MULTI')), carmEnabled); - return caseId; }, diff --git a/e2e/api/steps_LRspecFast.js b/e2e/api/steps_LRspecFast.js index d06ec0742c..2d994484a4 100644 --- a/e2e/api/steps_LRspecFast.js +++ b/e2e/api/steps_LRspecFast.js @@ -21,11 +21,9 @@ const {CASE_FLAGS} = require('../fixtures/caseFlags'); const {dateNoWeekends} = require('./dataHelper'); const {removeFixedRecoveryCostFieldsFromSpecClaimantResponseData, removeFastTrackAllocationFromSdoData} = require('../helpers/fastTrackUpliftsHelper'); const {addFlagsToFixture} = require('../helpers/caseFlagsFeatureHelper'); -const {adjustCaseSubmittedDateForCarm} = require('../helpers/carmHelper'); const sdoTracks = require('../fixtures/events/createSDO'); - let caseId, eventName; let caseData = {}; diff --git a/e2e/fixtures/events/createClaimSpec.js b/e2e/fixtures/events/createClaimSpec.js index cbc3b5a74d..def2e9de2d 100644 --- a/e2e/fixtures/events/createClaimSpec.js +++ b/e2e/fixtures/events/createClaimSpec.js @@ -88,10 +88,6 @@ module.exports = { applicantSolicitor1Reference: 'Applicant reference', respondentSolicitor1Reference: 'Respondent reference' }, - // Workaround, toggle is active after 27/02/2025, based on either submittedDate, or current localdatetime - ...(isMintiCaseEnabled) ? { - submittedDate:'2025-06-20T15:59:50' - }: {}, }, Claimant: { applicant1: applicant1WithPartyName diff --git a/e2e/helpers/carmHelper.js b/e2e/helpers/carmHelper.js index f3edea17cf..8954949cf1 100644 --- a/e2e/helpers/carmHelper.js +++ b/e2e/helpers/carmHelper.js @@ -3,8 +3,8 @@ const config = require('../config.js'); const testingSupport = require('./../api/testingSupport'); module.exports = { - adjustCaseSubmittedDateForCarm: async (caseId, carmEnabled = false, isMintiEnabled = false) => { - if (!carmEnabled && !isMintiEnabled) { + adjustCaseSubmittedDateForCarm: async (caseId, carmEnabled = false) => { + if (!carmEnabled) { console.log('carm not enabled, minti not enabled updating submitted date'); await apiRequest.setupTokens(config.systemupdate); const submittedDate = {'submittedDate':'2024-10-10T15:59:50'}; diff --git a/e2e/helpers/mintiHelper.js b/e2e/helpers/mintiHelper.js index d6001c5078..93bf03e3f7 100644 --- a/e2e/helpers/mintiHelper.js +++ b/e2e/helpers/mintiHelper.js @@ -48,26 +48,6 @@ function getCaseAllocatedTrack(case_data, isSpecCase) { } module.exports = { - addSubmittedDateInCaseData: (caseData) => { - caseData.valid.References.submittedDate = '2025-06-20T15:59:50'; - return caseData; - }, - adjustCaseSubmittedDateForMinti: async (caseId, isMintiEnabled = false, isCarmEnabled = false) => { - if (isMintiEnabled) { - console.log('multi Intermediate track is enabled'); - await apiRequest.setupTokens(config.systemupdate); - const submittedDate = {'submittedDate':'2025-06-20T15:59:50'}; - await testingSupport.updateCaseData(caseId, submittedDate); - console.log('submitted date update to after multi Intermediate track live date'); - } else if (!isMintiEnabled && !isCarmEnabled) { - console.log('multi Intermediate track not enabled, updating submitted date'); - await apiRequest.setupTokens(config.systemupdate); - const submittedDate = {'submittedDate':'2024-10-28T15:59:50'}; - await testingSupport.updateCaseData(caseId, submittedDate); - console.log('submitted date update to before multi Intermediate track live date'); - } - }, - getMintiTrackByClaimAmount(claimAmount) { if (claimAmount <= MintiMaxTrackAmounts.SMALL_CLAIM) { return 'SMALL_CLAIM'; diff --git a/e2e/tests/api_tests/caseworkerEvents/api_caseworker_test.js b/e2e/tests/api_tests/caseworkerEvents/api_caseworker_test.js index ecebea2888..7c2da18727 100644 --- a/e2e/tests/api_tests/caseworkerEvents/api_caseworker_test.js +++ b/e2e/tests/api_tests/caseworkerEvents/api_caseworker_test.js @@ -83,14 +83,13 @@ Scenario('1v1 LR LR v Lip In mediation', async ({api_spec_cui}) => { await api_spec_cui.dismissCase(config.hearingCenterAdminWithRegionId1); }); -const mintiEnabled = true; const claimAmountMulti = '200001'; Scenario('1v1 Multi Claim Stay Case Judicial Referral', async ({api}) => { const mpScenario = 'ONE_V_TWO_TWO_LEGAL_REP'; const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; - await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmountMulti, mintiEnabled); + await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmountMulti); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, 'solicitorOne'); 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 cb0e92291c..27a95b9390 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 @@ -22,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, false, hmcTest); + await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, fastClaimAmount, hmcTest); await api.notifyClaim(config.applicantSolicitorUser, mpScenario); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, 'solicitorOne'); diff --git a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js index 7b57e241c3..0641340d5b 100644 --- a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js +++ b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js @@ -20,7 +20,7 @@ async function prepareClaimLiPvLiP(api_spec_cui, carmEnabled, claimType = 'Small } async function prepareClaimLiPvLiPMintiTrack(api_spec_cui, carmEnabled, claimType = 'INTERMEDIATE') { - caseId = await api_spec_cui.createClaimWithUnrepresentedClaimant(config.applicantCitizenUser, claimType, carmEnabled, '', true); + caseId = await api_spec_cui.createClaimWithUnrepresentedClaimant(config.applicantCitizenUser, claimType, carmEnabled, '',); await api_spec_cui.performCitizenDefendantResponse(config.defendantCitizenUser2, caseId, claimType, carmEnabled); await api_spec_cui.performCitizenClaimantResponse(config.applicantCitizenUser, caseId, 'AWAITING_APPLICANT_INTENTION', carmEnabled); } diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_lrvlip_spec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_lrvlip_spec_test.js index d51007b638..5252f3f6f1 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_lrvlip_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_lrvlip_spec_test.js @@ -10,7 +10,7 @@ Before(async () => { await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); }); -Scenario('1v1 LR v LiP intermediate track @api-nonprod-specified', async ({api_spec_cui}) => { +Scenario('1v1 LR v LiP intermediate track @api-prod', async ({api_spec_cui}) => { let caseId = await api_spec_cui.createSpecifiedClaimWithUnrepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_ONE', claimType); await api_spec_cui.performCitizenDefendantResponse(config.defendantCitizenUser2, caseId, claimType); await api_spec_cui.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE_CITIZEN_DEFENDANT', 'ONE_V_ONE', 'No', 'AWAITING_APPLICANT_INTENTION', false, claimType); 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 4df62f17a6..76e9221f58 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js @@ -10,10 +10,10 @@ const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD 1v1 API test spec intermediate track @api-spec-multi-intermediate'); async function prepareClaim(api_spec, mpScenario) { - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesIntermediate); + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, true, claimAmountPenniesIntermediate); } -Scenario('1v1 FULL_DEFENCE Intermediate claim Specified @api-nonprod-specified', async ({api_spec}) => { +Scenario('1v1 FULL_DEFENCE Intermediate claim Specified @api-prod', async ({api_spec}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api_spec, mpScenario); await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'AWAITING_APPLICANT_INTENTION', false, true, claimAmountIntermediate); 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 32566f76e5..717deb83a6 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js @@ -2,7 +2,6 @@ const config = require('../../../config.js'); const intermediateTrackClaimAmount = '99000'; -const mintiEnabled = true; const track = 'INTERMEDIATE_CLAIM'; const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; @@ -10,7 +9,7 @@ const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD API test unspec intermediate @api-unspec-multi-intermediate'); async function prepareClaim(api, mpScenario, claimAmount) { - await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmount, mintiEnabled); + await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmount); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, null, track); @@ -20,7 +19,7 @@ async function prepareClaim(api, mpScenario, claimAmount) { await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); } -Scenario('1v1 Create Unspecified Intermediate Track claim @api-nonprod', async ({api}) => { +Scenario('1v1 Create Unspecified Intermediate Track claim @api-prod', async ({api}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api, mpScenario, intermediateTrackClaimAmount, track); }); diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_lrvlip_spec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_lrvlip_spec_test.js index 0bbb1625ba..804d25df44 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_lrvlip_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_lrvlip_spec_test.js @@ -11,7 +11,7 @@ Before(async () => { await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); }); -Scenario('1v1 LR v LiP multi track @api-nonprod-specified', async ({api_spec_cui}) => { +Scenario('1v1 LR v LiP multi track @api-prod', async ({api_spec_cui}) => { const mpScenario = 'ONE_V_ONE'; await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); let caseId = await api_spec_cui.createSpecifiedClaimWithUnrepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimType); 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 35aecb87c9..309fee6003 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js @@ -13,7 +13,7 @@ async function prepareClaim(api_spec, mpScenario) { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesMulti); } -Scenario('1v1 full defence Multi claim Specified @api-nonprod-specified', async ({api_spec}) => { +Scenario('1v1 full defence Multi claim Specified @api-prod', async ({api_spec}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api_spec, mpScenario); await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'AWAITING_APPLICANT_INTENTION', false, true, claimAmountMulti); 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 a11c9b3bbc..0c91153bf1 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js @@ -2,7 +2,6 @@ const config = require('../../../config.js'); const multiTrackClaimAmount = '200001'; -const mintiEnabled = true; const track = 'MULTI_CLAIM'; const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; @@ -10,7 +9,7 @@ const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD API test unspec multi track @api-unspec-multi-intermediate'); async function prepareClaim(api, mpScenario, claimAmount) { - await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmount, mintiEnabled); + await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmount); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await defendantResponse(api, mpScenario); @@ -20,7 +19,7 @@ async function prepareClaim(api, mpScenario, claimAmount) { await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); } -Scenario('1v1 Create Unspecified Multi Track claim @api-nonprod', async ({api}) => { +Scenario('1v1 Create Unspecified Multi Track claim @api-prod', async ({api}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api, mpScenario, multiTrackClaimAmount); }); diff --git a/e2e/tests/ui_tests/minti/spec_intTrack_upload_bundle_test.js b/e2e/tests/ui_tests/minti/spec_intTrack_upload_bundle_test.js index 87097b28cc..7bffd0b52d 100644 --- a/e2e/tests/ui_tests/minti/spec_intTrack_upload_bundle_test.js +++ b/e2e/tests/ui_tests/minti/spec_intTrack_upload_bundle_test.js @@ -5,7 +5,7 @@ let civilCaseReference; const claimAmountPenniesIntermediate = '9900000'; const claimAmountIntermediate = '99000'; -Feature('Intermediate track - Upload documents - Bundle @non-prod-e2e-ft'); +Feature('Intermediate track - Upload documents - Bundle @master-e2e-ft'); async function prepareSpecClaim(api_spec, mpScenario) { civilCaseReference = await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesIntermediate); diff --git a/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js b/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js index c23fa38e66..25637d0f2e 100644 --- a/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js +++ b/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js @@ -3,7 +3,7 @@ const { createAccount, deleteAccount } = require('../../../api/idamHelper'); const intermediateTrackClaimAmount = '99000'; const claimAmountMulti = '200001'; -Feature('Minti tracks - LR responses @non-prod-e2e-ft'); +Feature('Minti tracks - LR responses @master-e2e-ft'); Scenario('LR vs LIP Multi track - LR response', async ({api_spec_cui, I}) => { const mpScenario = 'ONE_V_ONE'; diff --git a/e2e/tests/ui_tests/minti/spec_multiTrack_upload_bundle_test.js b/e2e/tests/ui_tests/minti/spec_multiTrack_upload_bundle_test.js index 5567e4a93e..c9202430da 100644 --- a/e2e/tests/ui_tests/minti/spec_multiTrack_upload_bundle_test.js +++ b/e2e/tests/ui_tests/minti/spec_multiTrack_upload_bundle_test.js @@ -5,7 +5,7 @@ const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let civilCaseReference; -Feature('Multi track - Upload documents - Bundle @non-prod-e2e-ft'); +Feature('Multi track - Upload documents - Bundle @master-e2e-ft'); async function prepareSpecClaim(api_spec, mpScenario) { civilCaseReference = await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesMulti); diff --git a/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js b/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js index 52c44481c2..0b305d9ef4 100644 --- a/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js +++ b/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js @@ -3,7 +3,6 @@ const {unAssignAllUsers} = require('../../../api/caseRoleAssignmentHelper'); const intermediateTrackClaimAmount = '99000'; -const mintiEnabled = true; const claimAmountMulti = '200001'; const track = 'INTERMEDIATE_CLAIM'; @@ -11,11 +10,11 @@ const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let civilCaseReference; -Feature('Intermediate and Multi tracks - Download order template Journey - Upload Bundle @non-prod-e2e-ft'); +Feature('Intermediate and Multi tracks - Download order template Journey - Upload Bundle @master-e2e-ft'); Scenario('1v2 Same Solicitor Int Track - Download order template - Upload Bundle', async ({api, I}) => { const mpScenario = 'ONE_V_TWO_ONE_LEGAL_REP'; - civilCaseReference = await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, intermediateTrackClaimAmount, mintiEnabled); + civilCaseReference = await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, intermediateTrackClaimAmount); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, null, track); @@ -38,7 +37,7 @@ Scenario('1v2 Same Solicitor Int Track - Download order template - Upload Bundle Scenario('1v2 Different Solicitor Multi Track claim - Download order template - Upload Bundle', async ({api, I}) => { const mpScenario = 'ONE_V_TWO_TWO_LEGAL_REP'; - civilCaseReference = await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmountMulti, mintiEnabled); + civilCaseReference = await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, claimAmountMulti); await api.notifyClaim(config.applicantSolicitorUser); await api.notifyClaimDetails(config.applicantSolicitorUser); await api.defendantResponse(config.defendantSolicitorUser, mpScenario, 'solicitorOne'); From 1257a9f21b2bb68ed412511cdfd340420d604fa2 Mon Sep 17 00:00:00 2001 From: drummondjm Date: Fri, 28 Feb 2025 12:14:39 +0000 Subject: [PATCH 10/13] update steps --- e2e/api/steps.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 7a17f447d5..241a0934d4 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -1208,9 +1208,7 @@ module.exports = { await assertValidData(scheduleData, pageId); } let expectedState = 'HEARING_READINESS'; - if (allocatedTrack === 'OTHER') { - expectedState = 'PREPARE_FOR_HEARING_CONDUCT_HEARING'; - } + await assertSubmittedEvent(expectedState, null, false); await waitForFinishedBusinessProcess(caseId); }, From 576c7948faa32bc1678dddbac54aec45fd137847 Mon Sep 17 00:00:00 2001 From: drummondjm Date: Fri, 28 Feb 2025 16:16:15 +0000 Subject: [PATCH 11/13] update steps --- e2e/api/steps_LRspec.js | 4 ++-- .../multiIntermediateTrack/api_intermediate_spec_test.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index cc608029b9..5e07ca2ab3 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -819,8 +819,8 @@ module.exports = { * @param user user to create the claim * @return {Promise} */ - createClaimWithRepresentedRespondent: async (user, scenario = 'ONE_V_ONE', isMintiCase = false, - mintiClaimAmount = '00000') => { + createClaimWithRepresentedRespondent: async (user, scenario = 'ONE_V_ONE', carmEnabled = false, + isMintiCase = false, mintiClaimAmount = '00000') => { const pbaV3 = await checkToggleEnabled(PBAv3); eventName = 'CREATE_CLAIM_SPEC'; caseId = null; 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 76e9221f58..e105a50fb0 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js @@ -10,7 +10,7 @@ const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; Feature('CCD 1v1 API test spec intermediate track @api-spec-multi-intermediate'); async function prepareClaim(api_spec, mpScenario) { - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, true, claimAmountPenniesIntermediate); + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesIntermediate); } Scenario('1v1 FULL_DEFENCE Intermediate claim Specified @api-prod', async ({api_spec}) => { From da9d3f94af08d463149c1cb568e8353bbae475d8 Mon Sep 17 00:00:00 2001 From: drummondjm Date: Fri, 28 Feb 2025 17:39:11 +0000 Subject: [PATCH 12/13] move minti tests to prod --- e2e/api/steps_LRspec.js | 3 +-- e2e/helpers/carmHelper.js | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 1b3bbc0033..5d10aa7fc5 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -1015,8 +1015,7 @@ module.exports = { // workaround deleteCaseFields('applicantSolicitor1ClaimStatementOfTruth'); deleteCaseFields('respondentResponseIsSame'); - - await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); + await adjustCaseSubmittedDateForCarm(caseId, carmEnabled, isMintiCase); await apiRequest.setupTokens(user); diff --git a/e2e/helpers/carmHelper.js b/e2e/helpers/carmHelper.js index 8954949cf1..69a68861f9 100644 --- a/e2e/helpers/carmHelper.js +++ b/e2e/helpers/carmHelper.js @@ -3,8 +3,9 @@ const config = require('../config.js'); const testingSupport = require('./../api/testingSupport'); module.exports = { - adjustCaseSubmittedDateForCarm: async (caseId, carmEnabled = false) => { - if (!carmEnabled) { + adjustCaseSubmittedDateForCarm: async (caseId, carmEnabled = false, isMintiEnabled = false) => { + + if (!carmEnabled && !isMintiEnabled) { console.log('carm not enabled, minti not enabled updating submitted date'); await apiRequest.setupTokens(config.systemupdate); const submittedDate = {'submittedDate':'2024-10-10T15:59:50'}; From cacdc74ff4ad7734e15933530e5f84e3c2040adb Mon Sep 17 00:00:00 2001 From: drummondjm Date: Mon, 3 Mar 2025 09:17:09 +0000 Subject: [PATCH 13/13] https://tools.hmcts.net/jira/browse/CIV-16556 move minti tests to prod clean up minti date logic --- e2e/api/steps_LRspecCui.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/api/steps_LRspecCui.js b/e2e/api/steps_LRspecCui.js index 7865b785b1..f8ef5d1a3e 100644 --- a/e2e/api/steps_LRspecCui.js +++ b/e2e/api/steps_LRspecCui.js @@ -154,7 +154,7 @@ module.exports = { deleteCaseFields('applicantSolicitor1CheckEmail'); }, - createClaimWithUnrepresentedClaimant: async (user, claimType = 'SmallClaims', carmEnabled = false, typeOfData = '') => { + createClaimWithUnrepresentedClaimant: async (user, claimType = 'SmallClaims', carmEnabled = false, typeOfData = '', isMintiCase = false) => { console.log('Starting to create claim'); let payload = {}; await apiRequest.setupTokens(user); @@ -187,7 +187,7 @@ module.exports = { await waitForFinishedBusinessProcess(caseId); console.log('Claim issued'); await assignCaseRoleToUser(caseId, 'DEFENDANT', config.defendantCitizenUser2); - await adjustCaseSubmittedDateForCarm(caseId, carmEnabled); + await adjustCaseSubmittedDateForCarm(caseId, carmEnabled, isMintiCase); return caseId; },