Merge pull request #108 from OasisDEX/tests-improvements-custom-timeo…

…ut-liq-price Improvements - Extending timeout for liq price only wheen needed
OasisDEX · Dec 20, 2023 · 69eb598 · 69eb598
2 parents e8bc053 + eafcf75
commit 69eb598
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 17 deletions.
diff --git a/src/pages/position/overview.ts b/src/pages/position/overview.ts
@@ -1,6 +1,6 @@
 import { step } from '#noWalletFixtures';
 import { expect, Page } from '@playwright/test';
-import { positionTimeout } from 'utils/config';
+import { expectDefaultTimeout, positionTimeout } from 'utils/config';
 
 export class Overview {
 	readonly page: Page;
@@ -72,11 +72,16 @@ export class Overview {
 	 	@param price - It must be regExp string representing the the whole amount
 	*/
 	@step
-	async shouldHaveLiquidationPrice({ price, token }: { price: string; token?: string }) {
+	async shouldHaveLiquidationPrice(
+		{ price, token, timeout }: { price: string; token?: string; timeout?: number } = {
+			price: '',
+			timeout: expectDefaultTimeout,
+		}
+	) {
 		const regExp = new RegExp(`${price}${token ? ` ${token}` : ''}`);
 		await expect(
 			this.page.getByText('Liquidation Price').locator('xpath=//following-sibling::p[1]')
-		).toContainText(regExp, { timeout: positionTimeout });
+		).toContainText(regExp, { timeout });
 	}
 
 	@step

diff --git a/tests/withWallet/aaveV2/aaveV2Multiply.spec.ts b/tests/withWallet/aaveV2/aaveV2Multiply.spec.ts
@@ -9,6 +9,7 @@ import {
 	baseUrl,
 	veryLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
 
@@ -178,7 +179,11 @@ test.describe('Aave v2 Multiply - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/ethereum/aave/v2/178#overview');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'USDC' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'USDC',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'USDC' });

diff --git a/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum.spec.ts b/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum.spec.ts
@@ -8,6 +8,7 @@ import {
 	baseUrl,
 	extremelyLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 	veryLongTestTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
@@ -228,7 +229,11 @@ test.describe('Aave v3 Multiply - Arbitrum - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/arbitrum/aave/v3/1#overview');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'DAI' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'DAI',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'DAI' });

diff --git a/tests/withWallet/aaveV3/base/aaveV3BorrowBase.spec.ts b/tests/withWallet/aaveV3/base/aaveV3BorrowBase.spec.ts
@@ -9,6 +9,7 @@ import {
 	baseUrl,
 	veryLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
 
@@ -181,7 +182,11 @@ test.describe('Aave V3 Borrow - Base - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/base/aave/v3/2#overview');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'USDBC' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'USDBC',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'USDBC' });

diff --git a/tests/withWallet/aaveV3/base/aaveV3EarnBase.spec.ts b/tests/withWallet/aaveV3/base/aaveV3EarnBase.spec.ts
@@ -9,6 +9,7 @@ import {
 	baseUrl,
 	veryLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
 
@@ -148,7 +149,11 @@ test.describe('Aave V3 Earn - Base - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/base/aave/v3/18#overview');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'CBETH' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'CBETH',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'CBETH' });

diff --git a/tests/withWallet/aaveV3/base/aaveV3MultiplyBase.spec.ts b/tests/withWallet/aaveV3/base/aaveV3MultiplyBase.spec.ts
@@ -4,7 +4,7 @@ import { resetState } from '@synthetixio/synpress/commands/synpress';
 import * as metamask from '@synthetixio/synpress/commands/metamask';
 import * as tenderly from 'utils/tenderly';
 import { setup } from 'utils/setup';
-import { baseUrl, extremelyLongTestTimeout, longTestTimeout } from 'utils/config';
+import { baseUrl, extremelyLongTestTimeout, longTestTimeout, positionTimeout } from 'utils/config';
 import { App } from 'src/app';
 
 let context: BrowserContext;
@@ -139,7 +139,11 @@ test.describe('Aave v3 Multiply - Base - Wallet connected', async () => {
 
 		await app.position.manage.ok();
 
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'USDBC' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'USDBC',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'USDBC' });

diff --git a/tests/withWallet/aaveV3/ethereum/aaveV3BorrowEthereum.spec.ts b/tests/withWallet/aaveV3/ethereum/aaveV3BorrowEthereum.spec.ts
@@ -8,6 +8,7 @@ import {
 	baseUrl,
 	extremelyLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 	veryLongTestTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
@@ -202,7 +203,11 @@ test.describe('Aave V3 Borrow - Ethereum - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/ethereum/aave/v3/1277#overview');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'ETH' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'ETH',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'ETH' });

diff --git a/tests/withWallet/aaveV3/ethereum/aaveV3MultiplyEthereum.spec.ts b/tests/withWallet/aaveV3/ethereum/aaveV3MultiplyEthereum.spec.ts
@@ -8,6 +8,7 @@ import {
 	baseUrl,
 	extremelyLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 	veryLongTestTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
@@ -240,7 +241,11 @@ test.describe('Aave v3 Multiply - Ethereum - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/ethereum/aave/v3/1218');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'USDC' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'USDC',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'USDC' });

diff --git a/tests/withWallet/aaveV3/optimism/aaveV3BorrowOptimism.spec.ts b/tests/withWallet/aaveV3/optimism/aaveV3BorrowOptimism.spec.ts
@@ -8,6 +8,7 @@ import {
 	baseUrl,
 	extremelyLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 	veryLongTestTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
@@ -202,7 +203,11 @@ test.describe('Aave V3 Borrow - Optimism - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/optimism/aave/v3/4#overview');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'DAI' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'DAI',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'DAI' });

diff --git a/tests/withWallet/aaveV3/optimism/aaveV3MultiplyOptimism.spec.ts b/tests/withWallet/aaveV3/optimism/aaveV3MultiplyOptimism.spec.ts
@@ -8,6 +8,7 @@ import {
 	baseUrl,
 	extremelyLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 	veryLongTestTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
@@ -227,7 +228,11 @@ test.describe('Aave v3 Multiply - Optimism - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/optimism/aave/v3/2#overview');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'USDC' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'USDC',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'USDC' });

diff --git a/tests/withWallet/spark/sparkBorrow.spec.ts b/tests/withWallet/spark/sparkBorrow.spec.ts
@@ -8,6 +8,7 @@ import {
 	baseUrl,
 	extremelyLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 	veryLongTestTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
@@ -287,7 +288,11 @@ test.describe('Spark Borrow - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/ethereum/spark/v3/1474#overview');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'DAI' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'DAI',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'DAI' });
@@ -337,7 +342,11 @@ test.describe('Spark Borrow - Wallet connected', async () => {
 		await app.position.manage.ok();
 
 		await app.page.goto('/ethereum/spark/v3/1474#overview');
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'DAI' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'DAI',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'DAI' });

diff --git a/tests/withWallet/spark/sparkEarn.spec.ts b/tests/withWallet/spark/sparkEarn.spec.ts
@@ -9,6 +9,7 @@ import {
 	veryLongTestTimeout,
 	baseUrl,
 	longTestTimeout,
+	positionTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
 
@@ -152,7 +153,11 @@ test.describe('Spark Earn - Wallet connected', async () => {
 
 		await app.position.manage.ok();
 
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'ETH' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'ETH',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'ETH' });

diff --git a/tests/withWallet/spark/sparkMultiply.spec.ts b/tests/withWallet/spark/sparkMultiply.spec.ts
@@ -8,6 +8,7 @@ import {
 	baseUrl,
 	extremelyLongTestTimeout,
 	longTestTimeout,
+	positionTimeout,
 	veryLongTestTimeout,
 } from 'utils/config';
 import { App } from 'src/app';
@@ -158,7 +159,11 @@ test.describe('Spark Multiply - Wallet connected', async () => {
 
 		await app.position.manage.ok();
 
-		await app.position.overview.shouldHaveLiquidationPrice({ price: '0.00', token: 'DAI' });
+		await app.position.overview.shouldHaveLiquidationPrice({
+			price: '0.00',
+			token: 'DAI',
+			timeout: positionTimeout,
+		});
 		await app.position.overview.shouldHaveLoanToValue('0.00');
 		await app.position.overview.shouldHaveBorrowCost('0.00');
 		await app.position.overview.shouldHaveNetValue({ value: '0.00', token: 'DAI' });