Skip to content

Commit

Permalink
Merge pull request #637 from OasisDEX/daily-improvements-15-nov-2
Browse files Browse the repository at this point in the history 
Daily improvements 15 nov 2
  • Loading branch information
@juan-langa
juan-langa authored Nov 15, 2024
2 parents ddd6c68 + efb33d7 commit f96bf9f
Show file tree
Hide file tree
Showing 6 changed files with 172 additions and 131 deletions.
7 changes: 1 addition & 6 deletions tests/withWallet/aaveV3/base/aaveV3BorrowBase.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ test.describe('Aave V3 Borrow - Base - Wallet connected', async () => {
test('It should open and magage an Aave V3 Borrow Base position @regression', async ({
metamask,
}) => {
test.info().annotations.push({
type: 'Test case',
description: '12473',
});

test.setTimeout(extremelyLongTestTimeout);

await app.page.goto('/base/aave/v3/borrow/eth-usdbc#simulate');
Expand All @@ -53,7 +48,7 @@ test.describe('Aave V3 Borrow - Base - Wallet connected', async () => {
});
});

// Skip again if DB collision also happeningwith omni
// Skip again if DB collision also happening with omni
await test.step('It should Deposit and Borrow in a single tx', async () => {
await app.page.waitForTimeout(1_000);

Expand Down
106 changes: 59 additions & 47 deletions tests/withWallet/z_openPositions/aaveV3/ethereum/aavev3Borrow.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import {
aaveV3EthereumBorrowPools_1,
aaveV3EthereumBorrowPools_2,
aaveV3EthereumBorrowPools_3,
aaveV3EthereumBorrowPools_4,
aaveV3EthereumBorrowPools_5,
aaveV3EthereumBorrowPools_6,
aaveV3EthereumBorrowPools,
// aaveV3EthereumBorrowPools_1,
// aaveV3EthereumBorrowPools_2,
// aaveV3EthereumBorrowPools_3,
// aaveV3EthereumBorrowPools_4,
// aaveV3EthereumBorrowPools_5,
// aaveV3EthereumBorrowPools_6,
// aaveV3EthereumBorrowPools_7,
// aaveV3EthereumBorrowPools_8,
} from 'utils/testData';
import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition';

aaveV3EthereumBorrowPools_1.forEach(async (pool) => {
aaveV3EthereumBorrowPools.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'aave/v3',
Expand All @@ -19,50 +20,61 @@ aaveV3EthereumBorrowPools_1.forEach(async (pool) => {
});
});

aaveV3EthereumBorrowPools_2.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'aave/v3',
pool,
positionType: 'borrow',
});
});
// aaveV3EthereumBorrowPools_1.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'aave/v3',
// pool,
// positionType: 'borrow',
// });
// });

aaveV3EthereumBorrowPools_3.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'aave/v3',
pool,
positionType: 'borrow',
});
});
// aaveV3EthereumBorrowPools_2.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'aave/v3',
// pool,
// positionType: 'borrow',
// });
// });

aaveV3EthereumBorrowPools_4.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'aave/v3',
pool,
positionType: 'borrow',
});
});
// aaveV3EthereumBorrowPools_3.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'aave/v3',
// pool,
// positionType: 'borrow',
// });
// });

aaveV3EthereumBorrowPools_5.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'aave/v3',
pool,
positionType: 'borrow',
});
});
// aaveV3EthereumBorrowPools_4.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'aave/v3',
// pool,
// positionType: 'borrow',
// });
// });

aaveV3EthereumBorrowPools_6.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'aave/v3',
pool,
positionType: 'borrow',
});
});
// aaveV3EthereumBorrowPools_5.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'aave/v3',
// pool,
// positionType: 'borrow',
// });
// });

// aaveV3EthereumBorrowPools_6.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'aave/v3',
// pool,
// positionType: 'borrow',
// });
// });

// =======================

// aaveV3EthereumBorrowPools_7.forEach(async (pool) => {
// await openNewPosition({
Expand Down
4 changes: 2 additions & 2 deletions ...ns/morphoBlue/base/morphoBorrow_1.spec.ts → ...ions/morphoBlue/base/morphoBorrow.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { morphoBaseBorrowPools1 } from 'utils/testData';
import { morphoBaseBorrowPools } from 'utils/testData';
import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition';

morphoBaseBorrowPools1.forEach(async (pool) => {
morphoBaseBorrowPools.forEach(async (pool) => {
await openNewPosition({
network: 'base',
protocol: 'morphoblue',
Expand Down
11 changes: 0 additions & 11 deletions tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow_2.spec.ts
View file

This file was deleted.

68 changes: 39 additions & 29 deletions tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import {
morphoEthereumBorrowPools_1,
morphoEthereumBorrowPools_2,
morphoEthereumBorrowPools_3,
morphoEthereumBorrowPools_4,
morphoEthereumBorrowPools,
// morphoEthereumBorrowPools_1,
// morphoEthereumBorrowPools_2,
// morphoEthereumBorrowPools_3,
// morphoEthereumBorrowPools_4,
} from 'utils/testData';
import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition';

morphoEthereumBorrowPools_1.forEach(async (pool) => {
morphoEthereumBorrowPools.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'morphoblue',
Expand All @@ -15,29 +16,38 @@ morphoEthereumBorrowPools_1.forEach(async (pool) => {
});
});

morphoEthereumBorrowPools_2.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'morphoblue',
pool,
positionType: 'borrow',
});
});
// morphoEthereumBorrowPools_1.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'morphoblue',
// pool,
// positionType: 'borrow',
// });
// });

morphoEthereumBorrowPools_3.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'morphoblue',
pool,
positionType: 'borrow',
});
});
// morphoEthereumBorrowPools_2.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'morphoblue',
// pool,
// positionType: 'borrow',
// });
// });

morphoEthereumBorrowPools_4.forEach(async (pool) => {
await openNewPosition({
network: 'ethereum',
protocol: 'morphoblue',
pool,
positionType: 'borrow',
});
});
// morphoEthereumBorrowPools_3.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'morphoblue',
// pool,
// positionType: 'borrow',
// });
// });

// morphoEthereumBorrowPools_4.forEach(async (pool) => {
// await openNewPosition({
// network: 'ethereum',
// protocol: 'morphoblue',
// pool,
// positionType: 'borrow',
// });
// });
Loading

0 comments on commit f96bf9f

Please sign in to comment.