Skip to content

Commit 8de4030

Browse files
authored
fix: update snapshots and assertions for tests (#125)
1 parent 9a9a055 commit 8de4030

File tree

7 files changed

+40
-185
lines changed

7 files changed

+40
-185
lines changed

packages/spec/markets/__snapshots__/chains.spec.ts.snap

Lines changed: 0 additions & 159 deletions
This file was deleted.

packages/spec/markets/repay.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ describe('Given an Aave Market', () => {
192192
);
193193
assertOk(result);
194194
expect(result.value.length).toBe(1);
195-
expect(Number(result.value[0]?.debt.amount.value)).toBeCloseTo(
195+
expect(result.value[0]?.debt.amount.value).toBeBigDecimalCloseTo(
196196
Number(userBorrowsBefore.value[0]?.debt.amount.value) * 0.5,
197197
4,
198198
);

packages/spec/markets/withdraw.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ describe('Given an Aave Market', () => {
265265
evmAddress(anotherUser.account!.address),
266266
ETHEREUM_WETH_ADDRESS,
267267
);
268-
expect(balance).toBeCloseTo(Number(suppliedAmount), 3);
268+
expect(balance).toBeBigDecimalCloseTo(suppliedAmount, 3);
269269
});
270270
});
271271

packages/spec/misc/__snapshots__/chains.spec.ts.snap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@ exports[`Given the Aave Protocol > When listing all supported chains > Then it s
9292
"name": "Base",
9393
"nativeWrappedToken": "0x4200000000000000000000000000000000000006",
9494
},
95+
{
96+
"__typename": "Chain",
97+
"chainId": 9745,
98+
"explorerUrl": "https://plasmascan.to/",
99+
"icon": "https://statics.aave.com/plasma.svg",
100+
"isTestnet": false,
101+
"name": "Plasma",
102+
"nativeWrappedToken": "0x6100E367285b01F48D07953803A2d8dCA5D19873",
103+
},
95104
{
96105
"__typename": "Chain",
97106
"chainId": 42161,

packages/spec/vaults/vaults.spec.ts

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -397,13 +397,13 @@ describe('Given the Aave Vaults', () => {
397397
});
398398
assertOk(vaultInfoBefore);
399399
annotate(
400-
`totalFeeRevenue: ${Number(
401-
vaultInfoBefore.value?.totalFeeRevenue.amount.value,
402-
)}`,
400+
`totalFeeRevenue: ${
401+
vaultInfoBefore.value?.totalFeeRevenue.amount.value
402+
}`,
403403
);
404404
expect(
405-
Number(vaultInfoBefore.value?.totalFeeRevenue.amount.value),
406-
).toBeGreaterThan(0);
405+
vaultInfoBefore.value?.totalFeeRevenue.amount.value,
406+
).toBeBigDecimalGreaterThan('0');
407407
const balanceBefore = await getBalance(
408408
evmAddress(organization.account!.address),
409409
initialVault.value?.usedReserve.aToken.address,
@@ -425,9 +425,7 @@ describe('Given the Aave Vaults', () => {
425425
initialVault.value?.usedReserve.aToken.address,
426426
);
427427
annotate(`balance after: ${balanceAfter}`);
428-
expect(balanceAfter * 10 ** 18).toBeGreaterThan(
429-
balanceBefore * 10 ** 18,
430-
);
428+
expect(balanceAfter).toBeGreaterThan(balanceBefore);
431429
}, 60_000);
432430
});
433431

@@ -609,13 +607,9 @@ describe('Given the Aave Vaults', () => {
609607

610608
assertOk(listOfVaultsDesc);
611609
expect(
612-
Number(
613-
listOfVaultsDesc.value.items[0]!.userShares!.shares.amount.value,
614-
),
615-
).toBeGreaterThanOrEqual(
616-
Number(
617-
listOfVaultsDesc.value.items[1]!.userShares!.shares.amount.value,
618-
),
610+
listOfVaultsDesc.value.items[0]!.userShares!.shares.amount.raw,
611+
).toBeBigDecimalGreaterThan(
612+
listOfVaultsDesc.value.items[1]!.userShares!.shares.amount.raw,
619613
);
620614

621615
const listOfVaultsAsc = await userVaults(client, {
@@ -625,9 +619,9 @@ describe('Given the Aave Vaults', () => {
625619

626620
assertOk(listOfVaultsAsc);
627621
expect(
628-
Number(listOfVaultsAsc.value.items[0]!.userShares!.shares.amount.value),
629-
).toBeLessThanOrEqual(
630-
Number(listOfVaultsAsc.value.items[1]!.userShares!.shares.amount.value),
622+
listOfVaultsAsc.value.items[1]!.userShares!.shares.amount.raw,
623+
).toBeBigDecimalGreaterThan(
624+
listOfVaultsAsc.value.items[0]!.userShares!.shares.amount.raw,
631625
);
632626
});
633627

@@ -642,10 +636,8 @@ describe('Given the Aave Vaults', () => {
642636

643637
assertOk(listOfVaultsDesc);
644638
expect(
645-
Number(listOfVaultsDesc.value.items[0]?.fee.value),
646-
).toBeGreaterThanOrEqual(
647-
Number(listOfVaultsDesc.value.items[1]?.fee.value),
648-
);
639+
listOfVaultsDesc.value.items[0]?.fee.value,
640+
).toBeBigDecimalGreaterThan(listOfVaultsDesc.value.items[1]?.fee.value);
649641

650642
const listOfVaultsAsc = await userVaults(client, {
651643
user: evmAddress(user.account!.address),
@@ -654,8 +646,8 @@ describe('Given the Aave Vaults', () => {
654646

655647
assertOk(listOfVaultsAsc);
656648
expect(
657-
Number(listOfVaultsAsc.value.items[0]?.fee.value),
658-
).toBeLessThanOrEqual(Number(listOfVaultsAsc.value.items[1]?.fee.value));
649+
listOfVaultsAsc.value.items[1]?.fee.value,
650+
).toBeBigDecimalGreaterThan(listOfVaultsAsc.value.items[0]?.fee.value);
659651
});
660652

661653
it('Then it should be possible so filter them by underlying tokens', async ({

vitest.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ declare module 'vitest' {
44
interface AsymmetricMatchersContaining extends JestExtendedMatchers {
55
toBeBigDecimalCloseTo: (expected: number | string, precision?: number) => R;
66
toBeBigDecimalWithin: (start: number | string, end: number | string) => R;
7+
toBeBigDecimalGreaterThan: (expected: number | string) => R;
78
toBeBetweenDates: (start: Date, end: Date) => R;
89
toBeHexString: () => R;
910
}

vitest.setup.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,18 @@ expect.extend({
3838
};
3939
},
4040

41+
toBeBigDecimalGreaterThan(received: string, expected: number | string) {
42+
const numValue = Number(received);
43+
const pass = !Number.isNaN(numValue) && numValue > Number(expected);
44+
return {
45+
pass,
46+
message: () =>
47+
pass
48+
? `expected "${received}" not to be greater than ${expected}`
49+
: `expected "${received}" to be greater than ${expected}, but got ${numValue}`,
50+
};
51+
},
52+
4153
toBeBetweenDates(received: string, start: Date, end: Date) {
4254
const receivedDate = new Date(received);
4355
const pass =

0 commit comments

Comments
 (0)