Skip to content

Commit 4bb7fe6

Browse files
committed
Fix C4052
1 parent 3bfbde2 commit 4bb7fe6

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

cypress/e2e/finance/funds/create-new-fund.cy.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ describe('Funds', () => {
3131
after('Clean up test data', () => {
3232
cy.getAdminToken();
3333
Funds.getFundsViaApi({ query: `code="${testData.fund.code}"` }).then((body) => {
34-
Funds.deleteFundViaApi(body.funds[0].id);
34+
const fundId = body.funds?.[0]?.id;
35+
36+
if (fundId) {
37+
Funds.deleteFundViaApi(fundId);
38+
}
3539
});
3640
cy.deleteLedgerApi(testData.ledger.id);
3741
FiscalYears.deleteFiscalYearViaApi(testData.fiscalYear.id);

cypress/support/fragments/finance/funds/funds.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ const tagsButton = Button({ id: 'clickable-show-tags' });
9393
const tagsPane = Pane('Tags');
9494
const tagsMultiSelect = MultiSelect({ id: 'input-tag' });
9595

96+
const clickNewFundButton = () => fundResultsPane.find(newButton).click();
97+
9698
export default {
9799
defaultUiFund: {
98100
name: `autotest_fund_${getRandomPostfix()}`,
@@ -145,14 +147,14 @@ export default {
145147
},
146148

147149
clickCreateNewFundButton() {
148-
cy.do(newButton.click());
150+
cy.do(clickNewFundButton());
149151
FundEditForm.waitLoading();
150152
FundEditForm.verifyFormView();
151153

152154
return FundEditForm;
153155
},
154156
createFund(fund) {
155-
cy.do([newButton.click()]);
157+
cy.do([clickNewFundButton()]);
156158
cy.wait(8000);
157159
cy.do([
158160
nameField.fillIn(fund.name),
@@ -182,7 +184,7 @@ export default {
182184

183185
newFund() {
184186
cy.wait(2000);
185-
cy.do(Section({ id: 'fund-results-pane' }).find(newButton).click());
187+
cy.do(clickNewFundButton());
186188
},
187189

188190
clickRestrictByLocationsCheckbox() {
@@ -317,7 +319,7 @@ export default {
317319
cancelCreatingFundWithTransfers(defaultFund, defaultLedger, firstFund, secondFund) {
318320
cy.wait(4000);
319321
cy.do([
320-
newButton.click(),
322+
clickNewFundButton(),
321323
nameField.fillIn(defaultFund.name),
322324
codeField.fillIn(defaultFund.code),
323325
ledgerSelection.open(),
@@ -342,7 +344,7 @@ export default {
342344

343345
createFundForWarningMessage(fund) {
344346
cy.do([
345-
newButton.click(),
347+
clickNewFundButton(),
346348
nameField.fillIn(fund.name),
347349
codeField.fillIn(fund.code),
348350
externalAccountField.fillIn(fund.externalAccountNo),
@@ -402,7 +404,7 @@ export default {
402404

403405
tryToCreateFundWithoutMandatoryFields: (fundName) => {
404406
cy.do([
405-
newButton.click(),
407+
clickNewFundButton(),
406408
nameField.fillIn(fundName),
407409
saveAndClose.click(),
408410
codeField.fillIn('some code'),
@@ -1306,7 +1308,7 @@ export default {
13061308
},
13071309
createFundWithAU(fund, ledger, AUName) {
13081310
cy.do([
1309-
newButton.click(),
1311+
clickNewFundButton(),
13101312
nameField.fillIn(fund.name),
13111313
codeField.fillIn(fund.code),
13121314
externalAccountField.fillIn(fund.externalAccountNo),

0 commit comments

Comments
 (0)