Skip to content

Commit da26099

Browse files
committed
resolved conflict
1 parent c4461b2 commit da26099

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

tests/actions/PolicyTest.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5731,7 +5731,9 @@ describe('actions/Policy', () => {
57315731
const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
57325732
const isIOUReportUsingReportSpy = jest.spyOn(ReportUtils, 'isIOUReportUsingReport').mockReturnValue(true);
57335733

5734-
Policy.createWorkspaceFromIOUPayment(iouReport, undefined, customAccountID, customEmail, iouReportOwnerEmail, undefined);
5734+
// eslint-disable-next-line @typescript-eslint/naming-convention
5735+
const mockTranslate = ((key: string) => key) as unknown as Parameters<typeof Policy.createWorkspaceFromIOUPayment>[7];
5736+
Policy.createWorkspaceFromIOUPayment(iouReport, undefined, customAccountID, customEmail, iouReportOwnerEmail, undefined, undefined, mockTranslate);
57355737
await waitForBatchedUpdates();
57365738

57375739
const writeOptions = apiWriteSpy.mock.calls.at(0)?.at(2) as {
@@ -5761,7 +5763,9 @@ describe('actions/Policy', () => {
57615763
type: CONST.REPORT.TYPE.EXPENSE,
57625764
};
57635765

5764-
const result = Policy.createWorkspaceFromIOUPayment(nonIOUReport, undefined, ESH_ACCOUNT_ID, ESH_EMAIL, 'owner@example.com', undefined);
5766+
// eslint-disable-next-line @typescript-eslint/naming-convention
5767+
const mockTranslate = ((key: string) => key) as unknown as Parameters<typeof Policy.createWorkspaceFromIOUPayment>[7];
5768+
const result = Policy.createWorkspaceFromIOUPayment(nonIOUReport, undefined, ESH_ACCOUNT_ID, ESH_EMAIL, 'owner@example.com', undefined, undefined, mockTranslate);
57655769
expect(result).toBeUndefined();
57665770
});
57675771
});

0 commit comments

Comments
 (0)