Merge pull request #581 from OasisDEX/daily-improvements-22-oct

Daily improvements - 22 October
OasisDEX · Oct 22, 2024 · 12c4967 · 12c4967
2 parents 0c60837 + 5257495
commit 12c4967
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 10 deletions.
diff --git a/tests/noWallet/openExistingPositionPages/AaveV3/arbitrum.spec.ts b/tests/noWallet/openExistingPositionPages/AaveV3/arbitrum.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Aave v3 Arbitrum', async () => {
 	test('It should open an existing Aave V3 Arbitrum Earn yield multiple RETH/ETH position page @regression', async ({
@@ -31,6 +31,7 @@ test.describe('Open exisiting position pages - Aave v3 Arbitrum', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '[1-2],[0-9]{3}.[0-9]{2}',
 			token: 'ETH/DAI',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('[3-9][0-9].[0-9]{2}');
 		await app.position.overview.shouldHaveNetValue({ value: '\\$[0-9]{1,2}.[0-9]{1,2}' });
@@ -64,6 +65,7 @@ test.describe('Open exisiting position pages - Aave v3 Arbitrum', async () => {
 		await app.position.shouldHaveHeader('DAI/WBTC Multiply #2');
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 	});

diff --git a/tests/noWallet/openExistingPositionPages/AaveV3/base.spec.ts b/tests/noWallet/openExistingPositionPages/AaveV3/base.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Aave v3 Base', async () => {
 	test('It should open an existing Aave V3 Base Earn yield loop CBETH/ETH position page @regression', async ({
@@ -26,6 +26,7 @@ test.describe('Open exisiting position pages - Aave v3 Base', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
 			token: 'ETH/USDBC',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 	});
@@ -41,6 +42,7 @@ test.describe('Open exisiting position pages - Aave v3 Base', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '([0-9],)[0-9]{2,3}.[0-9]{2}',
 			token: 'ETH/USDC',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('[0-9]{2}.[0-9]{2}');
 	});

diff --git a/tests/noWallet/openExistingPositionPages/AaveV3/ethereum.spec.ts b/tests/noWallet/openExistingPositionPages/AaveV3/ethereum.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Aave v3 Ethereum', async () => {
 	test('It should open an existing Aave V3 Ethereum Earn yield multiple WSTETH/ETH position page @regression', async ({
@@ -26,6 +26,7 @@ test.describe('Open exisiting position pages - Aave v3 Ethereum', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.[0-9]{4}',
 			token: 'CBETH/ETH',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('[0-9]{1,2}.[0-9]{2}');
 	});
@@ -41,6 +42,7 @@ test.describe('Open exisiting position pages - Aave v3 Ethereum', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '([1-3],)?[0-9]{3}.[0-9]{2}',
 			token: 'ETH/USDC',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('[1-8][0-9].[0-9]{2}');
 		await app.position.overview.shouldHaveNetValue({ value: '\\$[0-9]{1,2}.[0-9]{2}' });

diff --git a/tests/noWallet/openExistingPositionPages/AaveV3/optimism.spec.ts b/tests/noWallet/openExistingPositionPages/AaveV3/optimism.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Aave v3 Optimism', async () => {
 	test('It should open an existing Aave V3 Optimism Earn yield loop USDC.E/SUSD position page @regression', async ({
@@ -31,6 +31,7 @@ test.describe('Open exisiting position pages - Aave v3 Optimism', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '<0.001',
 			token: 'WBTC/DAI',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('>110.00');
 		await app.position.overview.shouldHaveCollateralDeposited({
@@ -56,6 +57,7 @@ test.describe('Open exisiting position pages - Aave v3 Optimism', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '[0-9]{1,2},[0-9]{3}.[0-9]{2}',
 			token: 'WBTC/USDC.E',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('[0-9]{1,2}.[0-9]{2}');
 	});

diff --git a/tests/noWallet/openExistingPositionPages/ajna/base.spec.ts b/tests/noWallet/openExistingPositionPages/ajna/base.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Ajna Base', async () => {
 	test('It should open an existing Ajna Base Earn active lending WSTETH/ETH position page @regression', async ({
@@ -26,6 +26,7 @@ test.describe('Open exisiting position pages - Ajna Base', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
 			token: 'PRIME/USDC',
+			timeout: positionTimeout,
 		});
 	});
 
@@ -40,6 +41,7 @@ test.describe('Open exisiting position pages - Ajna Base', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '([0-9],)?[0-9]{3}.[0-9]{2}',
 			token: 'ETH/USDC',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('[0-9]{1,2}.[0-9]{2}');
 	});

diff --git a/tests/noWallet/openExistingPositionPages/ajna/ethereum.spec.ts b/tests/noWallet/openExistingPositionPages/ajna/ethereum.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Ajna Ethereum', async () => {
 	test('It should open an existing Ajna Ethereum Earn active lending ETH/USDC position page @regression', async ({
@@ -28,6 +28,7 @@ test.describe('Open exisiting position pages - Ajna Ethereum', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '[0-9].[0-9]{4}',
 			token: 'APXETH/ETH',
+			timeout: positionTimeout,
 		});
 	});
 
@@ -41,6 +42,7 @@ test.describe('Open exisiting position pages - Ajna Ethereum', async () => {
 		await app.position.shouldHaveHeader('USDC/ETH Multiply #1467');
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
+			timeout: positionTimeout,
 		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 	});

diff --git a/tests/noWallet/openExistingPositionPages/maker.spec.ts b/tests/noWallet/openExistingPositionPages/maker.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Maker', async () => {
 	test('It should open an existing Maker Earn DSR position page @regression', async ({ app }) => {
@@ -25,6 +25,7 @@ test.describe('Open exisiting position pages - Maker', async () => {
 		await app.position.shouldHaveHeader('ETH-C Vault 30640');
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
+			timeout: positionTimeout,
 		});
 	});
 
@@ -38,6 +39,7 @@ test.describe('Open exisiting position pages - Maker', async () => {
 		await app.position.shouldHaveHeader('ETH-C Vault 30639');
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
+			timeout: positionTimeout,
 		});
 	});
 });
diff --git a/tests/noWallet/openExistingPositionPages/morpho/base.spec.ts b/tests/noWallet/openExistingPositionPages/morpho/base.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Morpho Base', async () => {
 	test('It should open an existing Morpho Base Earn yield multiple WEETH-ETH position page @regression', async ({
@@ -26,6 +26,7 @@ test.describe('Open exisiting position pages - Morpho Base', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
 			token: 'CBETH/USDC',
+			timeout: positionTimeout,
 		});
 	});
 
@@ -40,6 +41,7 @@ test.describe('Open exisiting position pages - Morpho Base', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
 			token: 'ETH/USDC',
+			timeout: positionTimeout,
 		});
 	});
 });
diff --git a/tests/noWallet/openExistingPositionPages/morpho/ethereum.spec.ts b/tests/noWallet/openExistingPositionPages/morpho/ethereum.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Morpho Ethereum', async () => {
 	test('It should open an existing Morpho Ethereum Earn Steakhouse USDC position page @regression', async ({
@@ -25,6 +25,7 @@ test.describe('Open exisiting position pages - Morpho Ethereum', async () => {
 		await app.position.shouldHaveHeader('WSTETH/ETH 94.50% Borrow #1478');
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
+			timeout: positionTimeout,
 		});
 	});
 
@@ -38,6 +39,7 @@ test.describe('Open exisiting position pages - Morpho Ethereum', async () => {
 		await app.position.shouldHaveHeader('WBTC/USDC Multiply #1467');
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '0.00',
+			timeout: positionTimeout,
 		});
 	});
 });
diff --git a/tests/noWallet/openExistingPositionPages/spark.spec.ts b/tests/noWallet/openExistingPositionPages/spark.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '#noWalletFixtures';
-import { longTestTimeout } from 'utils/config';
+import { longTestTimeout, positionTimeout } from 'utils/config';
 
 test.describe('Open exisiting position pages - Spark', async () => {
 	test('It should open an existing Spark Earn WSTETH/ETH position page @regression', async ({
@@ -26,6 +26,7 @@ test.describe('Open exisiting position pages - Spark', async () => {
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '([0-9]{1,2},)?[0-9]{3}.[0-9]{2}',
 			token: 'ETH/DAI',
+			timeout: positionTimeout,
 		});
 	});
 
@@ -39,6 +40,7 @@ test.describe('Open exisiting position pages - Spark', async () => {
 		await app.position.shouldHaveHeader('SDAI/ETH Multiply #1448');
 		await app.position.overview.shouldHaveLiquidationPrice({
 			price: '([0-9]{1,2},)?[0-9]{3}.[0-9]{2}',
+			timeout: positionTimeout,
 		});
 	});
 });