Skip to content

Updates to normalise the locators for component tests #2409

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
TimGonella wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updates to normalise the locators for component tests #2409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66991a8
Updates to normalise the locators for component tests
TimGonella Apr 1, 2026
9eeb484
Merge branch 'master' into FAELocatorsRefactor
TimGonella Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions cypress/component/CommonIntercepts/CommonIntercept.mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,17 +887,16 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Cais am dynnu arian o fudd-daliadau',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
enforcement_override_result: true,
},
{
result_id: 'AEOC',
result_title: 'Attachment of Earnings Order - with Collection Order',
result_title_cy: 'Gorchymyn atafaelu enillion - cyfrif dirwy',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -906,7 +905,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Gwarant Mechniaeth - Gyda dyddiad',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -915,7 +914,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Gwarant Mechniaeth - Heb Ddyddiad',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -924,7 +923,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: null,
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -933,7 +932,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Rhybudd o Warant Traddodi',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -942,7 +941,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Gwarant Atafaelu',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -951,7 +950,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: null,
active: false,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -960,7 +959,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Gwarant dim mechniaeth',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -969,7 +968,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Rhybudd Cofrestru',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -978,7 +977,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Gwŷs Gorfodi',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -987,7 +986,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Trosglwyddo Gorchymyn Dirwy i Lys yng Nghymru neu Lloegr',
active: true,
result_type: 'Action',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
{
Expand All @@ -996,7 +995,7 @@ export const OPAL_FINES_ENF_OVERRIDE_RESULT_REF_DATA_MOCK: IOpalFinesResultsRefD
result_title_cy: 'Rhybudd o gamau pellach',
active: true,
result_type: 'Result',
imposition_creditor: null,
imposition_creditor: '',
imposition_allocation_order: null,
},
],
Expand Down
2 changes: 1 addition & 1 deletion cypress/component/fineAccountEnquiry/accountEnquiry/AccountEnquiriesAtGlance.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ACCOUNT_ENQUIRY_HEADER_ELEMENTS as DOM } from './constants/account_enquiry_header_elements';
import { ACCOUNT_ENQUIRY_HEADER_ELEMENTS as DOM } from '../../../shared/selectors/account-enquiry/account.enquiry.header.locators';
import { createDefendantHeaderMockWithName, DEFENDANT_HEADER_MOCK } from './mocks/defendant_details_mock';

import {
Expand Down
4 changes: 2 additions & 2 deletions .../component/fineAccountEnquiry/accountEnquiry/AccountEnquiriesAtGlanceParentGuardian.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ACCOUNT_ENQUIRY_HEADER_ELEMENTS as DOM } from './constants/account_enquiry_header_elements';
import { ACCOUNT_ENQUIRY_HEADER_ELEMENTS as DOM } from '../../../shared/selectors/account-enquiry/account.enquiry.header.locators';
import {
createParentGuardianHeaderMockWithName,
DEFENDANT_HEADER_PARENT_GUARDIAN_MOCK,
Expand All @@ -18,7 +18,7 @@ import { interceptAtAGlance, interceptDefendantHeader } from './intercept/defend
import { interceptAuthenticatedUser, interceptUserState } from 'cypress/component/CommonIntercepts/CommonIntercepts';
import { IComponentProperties } from './setup/setupComponent.interface';
import { setupAccountEnquiryComponent } from './setup/SetupComponent';
import { DEFENDANT_DETAILS } from './constants/defendant_details_elements';
import { DEFENDANT_DETAILS } from '../../../shared/selectors/account-enquiry/account.enquiry.defendant-details.locators';
import { setLanguagePref } from './Utils/SharedFunctions';

const ACCOUNT_ENQUIRY_JIRA_LABEL = '@JIRA-LABEL:account-enquiry';
Expand Down
23 changes: 15 additions & 8 deletions cypress/component/fineAccountEnquiry/accountEnquiry/AccountEnquiriesEnforcement.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ const ACCOUNT_ENQUIRY_JIRA_LABEL = '@JIRA-LABEL:account-enquiry';

const buildTags = (...tags: string[]): string[] => [...tags, ACCOUNT_ENQUIRY_JIRA_LABEL];

const clearEnforcementOverrideResult = (
enforcementMock: typeof OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_ENFORCEMENT_TAB_REF_DATA_MOCK,
) => {
if (!enforcementMock.enforcement_override) {
throw new Error('Expected enforcement override mock data to be present');
}

enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_id = null;
enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_name = null;
};

describe('Account Enquiry Enforcement Status', () => {
beforeEach(() => {
interceptAuthenticatedUser();
Expand Down Expand Up @@ -226,8 +237,7 @@ describe('Account Enquiry Enforcement Status', () => {
let headerMock = structuredClone(createDefendantHeaderMockWithName('Robert', 'Thomson'));
headerMock.debtor_type = 'individual';
let enforcementMock = structuredClone(OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_ENFORCEMENT_TAB_REF_DATA_MOCK);
enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_id = null;
enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_name = null;
clearEnforcementOverrideResult(enforcementMock);
let newUserState = structuredClone(USER_STATE_MOCK_NO_PERMISSION);
newUserState.business_unit_users[0].permissions.push({
permission_id: 7,
Expand Down Expand Up @@ -1881,8 +1891,7 @@ describe('Account Enquiry Enforcement Status', () => {
let headerMock = structuredClone(createDefendantHeaderMockWithName('Robert', 'Thomson'));
headerMock.debtor_type = 'individual';
let enforcementMock = structuredClone(OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_ENFORCEMENT_TAB_REF_DATA_MOCK);
enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_id = null;
enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_name = null;
clearEnforcementOverrideResult(enforcementMock);

const accountId = headerMock.defendant_account_party_id;
interceptAuthenticatedUser();
Expand Down Expand Up @@ -2094,8 +2103,7 @@ describe('Account Enquiry Enforcement Status', () => {
headerMock.debtor_type = 'Parent/Guardian';
headerMock.parent_guardian_party_id = '1770000001';
let enforcementMock = structuredClone(OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_ENFORCEMENT_TAB_REF_DATA_MOCK);
enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_id = null;
enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_name = null;
clearEnforcementOverrideResult(enforcementMock);

const accountId = headerMock.defendant_account_party_id;
interceptAuthenticatedUser();
Expand Down Expand Up @@ -2319,8 +2327,7 @@ describe('Account Enquiry Enforcement Status', () => {
organisation_aliases: [],
};
let enforcementMock = structuredClone(OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_ENFORCEMENT_TAB_REF_DATA_MOCK);
enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_id = null;
enforcementMock.enforcement_override.enforcement_override_result.enforcement_override_result_name = null;
clearEnforcementOverrideResult(enforcementMock);

const accountId = header.defendant_account_party_id;
interceptAuthenticatedUser();
Expand Down
2 changes: 1 addition & 1 deletion cypress/component/fineAccountEnquiry/accountEnquiry/AccountEnquiriesPaymentTerms.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from '../../CommonIntercepts/CommonUserState.mocks';

import { OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_PAYMENT_TERMS_LATEST_MOCK } from '@services/fines/opal-fines-service/mocks/opal-fines-account-defendant-details-payment-terms-latest.mock';
import { ACCOUNT_ENQUIRY_PAYMENT_TERMS_ELEMENTS as PAYMENT_TERMS_TAB } from './constants/account_enquiry_payment_terms_elements';
import { ACCOUNT_ENQUIRY_PAYMENT_TERMS_ELEMENTS as PAYMENT_TERMS_TAB } from '../../../shared/selectors/account-enquiry/account.enquiry.payment-terms.locators';
import { interceptDefendantHeader, interceptPaymentTerms } from './intercept/defendantAccountIntercepts';
import {
interceptAuthenticatedUser,
Expand Down
4 changes: 2 additions & 2 deletions cypress/component/fineAccountEnquiry/accountEnquiry/AccountEnquiryDefendantDetails.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { interceptAuthenticatedUser, interceptUserState } from 'cypress/component/CommonIntercepts/CommonIntercepts';
import { DEFENDANT_HEADER_MOCK } from './mocks/defendant_details_mock';
import { ACCOUNT_ENQUIRY_HEADER_ELEMENTS as HEADER } from '../../../shared/selectors/account-enquiry/account.enquiry.header.locators';
import { DEFENDANT_DETAILS } from '../../../shared/selectors/account-enquiry/account.enquiry.defendant-details.locators';

import {
USER_STATE_MOCK_NO_PERMISSION,
Expand All @@ -9,8 +11,6 @@ import {

import { interceptDefendantHeader, interceptDefendantDetails } from './intercept/defendantAccountIntercepts';
import { OPAL_FINES_ACCOUNT_DEFENDANT_ACCOUNT_PARTY_MOCK } from '@services/fines/opal-fines-service/mocks/opal-fines-account-defendant-account-party.mock';
import { ACCOUNT_ENQUIRY_HEADER_ELEMENTS as HEADER } from './constants/account_enquiry_header_elements';
import { DEFENDANT_DETAILS } from './constants/defendant_details_elements';
import { IComponentProperties } from './setup/setupComponent.interface';
import { setupAccountEnquiryComponent } from './setup/SetupComponent';
import { setLanguagePref } from './Utils/SharedFunctions';
Expand Down
2 changes: 1 addition & 1 deletion ...ss/component/fineAccountEnquiry/accountEnquiry/AccountEnquiryFixedPenaltyDetailsTab.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { USER_STATE_MOCK_PERMISSION_BU77 } from '../../CommonIntercepts/CommonUs

import { interceptDefendantHeader, interceptFixedPenaltyDetails } from './intercept/defendantAccountIntercepts';
import { OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_FIXED_PENALTY_MOCK } from '@services/fines/opal-fines-service/mocks/opal-fines-account-defendant-details-fixed-penalty.mock';
import { ACCOUNT_ENQUIRY_FIXED_PENALTY_ELEMENTS as FIXED_PENALTY_TAB } from './constants/account_enquiry_fixed_penalty_elements';
import { ACCOUNT_ENQUIRY_FIXED_PENALTY_ELEMENTS as FIXED_PENALTY_TAB } from '../../../shared/selectors/account-enquiry/account.enquiry.fixed-penalty.locators';
import { setupAccountEnquiryComponent } from './setup/SetupComponent';
import { IComponentProperties } from './setup/setupComponent.interface';

Expand Down
2 changes: 1 addition & 1 deletion cypress/component/fineAccountEnquiry/accountEnquiry/AccountEnquiryHeader.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from './intercept/defendantAccountIntercepts';

// constants + mocks
import { ACCOUNT_ENQUIRY_HEADER_ELEMENTS as DOM } from './constants/account_enquiry_header_elements';
import { ACCOUNT_ENQUIRY_HEADER_ELEMENTS as DOM } from '../../../shared/selectors/account-enquiry/account.enquiry.header.locators';
import {
DEFENDANT_HEADER_MOCK,
DEFENDANT_HEADER_YOUTH_MOCK,
Expand Down
2 changes: 1 addition & 1 deletion ...omponent/fineAccountEnquiry/accountEnquiry/AccountEnquiryParentOrGuardianDetailsTab.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from './intercept/defendantAccountIntercepts';
import { OPAL_FINES_ACCOUNT_DEFENDANT_ACCOUNT_PARTY_MOCK } from '@services/fines/opal-fines-service/mocks/opal-fines-account-defendant-account-party.mock';
import { OPAL_FINES_ACCOUNT_PARENT_GUARDIAN_PARTY_MOCK } from './mocks/parentGuardianDebtor.mock';
import { DOM_ELEMENTS as DOM } from './constants/defendant_parent_or_guardian_elements';
import { DOM_ELEMENTS as DOM } from '../../../shared/selectors/account-enquiry/account.enquiry.parent-guardian-details.locators';
import { setupAccountEnquiryComponent } from './setup/SetupComponent';
import { IComponentProperties } from './setup/setupComponent.interface';

Expand Down
2 changes: 1 addition & 1 deletion cypress/component/fineAccountEnquiry/accountEnquiry/AccountEnquiryVersionControl.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { OPAL_FINES_ACCOUNT_DEFENDANT_AT_A_GLANCE_MOCK } from '@services/fines/opal-fines-service/mocks/opal-fines-account-defendant-at-a-glance.mock';
import { OPAL_FINES_ACCOUNT_DEFENDANT_ACCOUNT_PARTY_MOCK } from '@services/fines/opal-fines-service/mocks/opal-fines-account-defendant-account-party.mock';
import { DOM_ELEMENTS } from './constants/global_version_control_elements';
import { DOM_ELEMENTS } from '../../../shared/selectors/account-enquiry/account.enquiry.version-control.locators';
import { setupAccountEnquiryComponent } from './setup/SetupComponent';
import { IComponentProperties } from './setup/setupComponent.interface';
import {
Expand Down
45 changes: 0 additions & 45 deletions ...ineAccountEnquiry/accountEnquiry/constants/account_enquiry_enforcement_status_elements.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...nt/fineAccountEnquiry/accountEnquiry/paymentTerms/AccountEnquiriesAmendPaymentTerms.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
DEFENDANT_HEADER_YOUTH_MOCK,
} from '../mocks/defendant_details_mock';
import { OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_PAYMENT_TERMS_LATEST_MOCK } from '@services/fines/opal-fines-service/mocks/opal-fines-account-defendant-details-payment-terms-latest.mock';
import { ACCOUNT_ENQUIRY_PAYMENT_TERMS_ELEMENTS as PAYMENT_TERMS_TAB } from '../constants/account_enquiry_payment_terms_elements';
import { ACCOUNT_ENQUIRY_PAYMENT_TERMS_ELEMENTS as PAYMENT_TERMS_TAB } from '../../../../shared/selectors/account-enquiry/account.enquiry.payment-terms.locators';
import { interceptDefendantHeader, interceptPaymentTerms } from '../intercept/defendantAccountIntercepts';
import {
interceptAuthenticatedUser,
Expand Down
2 changes: 1 addition & 1 deletion ...eAccountEnquiry/accountEnquiry/paymentTerms/AccountEnquiriesCannotAmendPaymentTerms.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from 'cypress/component/CommonIntercepts/CommonUserState.mocks';

import { OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_PAYMENT_TERMS_LATEST_MOCK } from '@services/fines/opal-fines-service/mocks/opal-fines-account-defendant-details-payment-terms-latest.mock';
import { ACCOUNT_ENQUIRY_PAYMENT_TERMS_ELEMENTS as PAYMENT_TERMS_TAB } from '.././constants/account_enquiry_payment_terms_elements';
import { ACCOUNT_ENQUIRY_PAYMENT_TERMS_ELEMENTS as PAYMENT_TERMS_TAB } from '../../../../shared/selectors/account-enquiry/account.enquiry.payment-terms.locators';
import { interceptDefendantHeader, interceptPaymentTerms } from '.././intercept/defendantAccountIntercepts';
import {
interceptAuthenticatedUser,
Expand Down
2 changes: 1 addition & 1 deletion ...t/fineAccountEnquiry/accountEnquiry/paymentTerms/AccountEnquiriesRequestPaymentCard.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from 'cypress/component/CommonIntercepts/CommonUserState.mocks';

import { OPAL_FINES_ACCOUNT_DEFENDANT_DETAILS_PAYMENT_TERMS_LATEST_MOCK } from '@services/fines/opal-fines-service/mocks/opal-fines-account-defendant-details-payment-terms-latest.mock';
import { ACCOUNT_ENQUIRY_PAYMENT_TERMS_ELEMENTS as PAYMENT_TERMS_TAB } from '../constants/account_enquiry_payment_terms_elements';
import { ACCOUNT_ENQUIRY_PAYMENT_TERMS_ELEMENTS as PAYMENT_TERMS_TAB } from '../../../../shared/selectors/account-enquiry/account.enquiry.payment-terms.locators';
import { interceptDefendantHeader, interceptPaymentTerms } from '../intercept/defendantAccountIntercepts';
import {
interceptAuthenticatedUser,
Expand Down
2 changes: 1 addition & 1 deletion cypress/component/fineAccountEnquiry/amendDefendantEnforcement/addEnforcementOverride.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { DOM_ELEMENTS as ENF_OVR } from '../../../shared/selectors/account-enquiry/account.enquiry.enforcement-override-add.locators';
import { ACCOUNT_ENQUIRY_ENFORCEMENT_STATUS_ELEMENTS as ENF } from '../../../shared/selectors/account-enquiry/account.enquiry.enforcement.locators';
import { DOM_ELEMENTS as VERSION_CONTROL } from '../../../shared/selectors/account-enquiry/account.enquiry.version-control.locators';
import { setupAccountEnquiryComponent } from '../accountEnquiry/setup/SetupComponent';
import { IComponentProperties } from '../accountEnquiry/setup/setupComponent.interface';
import { DOM_ELEMENTS as VERSION_CONTROL } from '../accountEnquiry/constants/global_version_control_elements';
import {
interceptAuthenticatedUser,
interceptUserState,
Expand Down
12 changes: 0 additions & 12 deletions ...neAccountEnquiry/amendDefendantEnforcement/constants/add_enforcement_override_elements.ts
View file
Open in desktop

This file was deleted.

Loading
Loading