Merge pull request #598 from OasisDEX/synpress-migration-temporary-fi…

…xes-8 Synpress migration temporary fixes 8
OasisDEX · Oct 31, 2024 · 8e26fea · 8e26fea
2 parents 838d3eb + 4418631
commit 8e26fea
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 22 deletions.
diff --git a/.github/workflows/z_Reusable_RegressionWithRealWallet.yml b/.github/workflows/z_Reusable_RegressionWithRealWallet.yml
@@ -41,7 +41,6 @@ jobs:
         run: |
           BASE_URL=${{ inputs.base_url }} \
           FLAGS_FEATURES=${{ inputs.flags_features}} \
-          VERY_OLD_TEST_WALLET_PK=${{ secrets.VERY_OLD_TEST_WALLET_PK }} \
           yarn ci:with-real-wallet
       - uses: actions/upload-artifact@v4
         if: always()

diff --git a/.github/workflows/z_Reusable_RegressionWithWallet.yml b/.github/workflows/z_Reusable_RegressionWithWallet.yml
@@ -50,6 +50,7 @@ jobs:
         run: |
           BASE_URL=${{ inputs.base_url }} \
           FLAGS_FEATURES=${{ inputs.flags_features}} \
+          EMPTY_TEST_WALLET_PK=${{ secrets.EMPTY_TEST_WALLET_PK }} \
           yarn ci:synpress-build-cache:test-wallet
       - name: Run With wallet ${{ inputs.protocol }}-${{ inputs.network }} tests
         run: |

diff --git a/tests/withWallet/aaveV3/arbitrum/aavV3MultArbAutomations_1.spec.ts b/tests/withWallet/aaveV3/arbitrum/aavV3MultArbAutomations_1.spec.ts
@@ -15,7 +15,7 @@ const test = testWithSynpress(metaMaskFixtures(arbitrumSetup));
 
 test.describe.configure({ mode: 'serial' });
 
-test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
+test.describe('Aave V3 Multiply - Arbitrum - Wallet connected', async () => {
 	test.beforeEach(async ({ metamask, page }) => {
 		test.setTimeout(longTestTimeout);
 

diff --git a/tests/withWallet/aaveV3/arbitrum/aavV3MultArbAutomations_2.spec.ts b/tests/withWallet/aaveV3/arbitrum/aavV3MultArbAutomations_2.spec.ts
@@ -15,7 +15,7 @@ const test = testWithSynpress(metaMaskFixtures(arbitrumSetup));
 
 test.describe.configure({ mode: 'serial' });
 
-test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
+test.describe('Aave V3 Multiply - Arbitrum - Wallet connected', async () => {
 	test.beforeEach(async ({ metamask, page }) => {
 		test.setTimeout(longTestTimeout);
 

diff --git a/tests/withWallet/aaveV3/arbitrum/aaveV3BorrowArbitrum.spec.ts b/tests/withWallet/aaveV3/arbitrum/aaveV3BorrowArbitrum.spec.ts
@@ -12,8 +12,6 @@ let forkId: string;
 
 const test = testWithSynpress(metaMaskFixtures(arbitrumSetup));
 
-test.describe.configure({ mode: 'serial' });
-
 test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
 	test.beforeEach(async ({ metamask, page }) => {
 		test.setTimeout(longTestTimeout);
@@ -30,11 +28,6 @@ test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
 	test('It should open and manage an Aave V3 Borrow Arbitrum ETH/USDC position @regression', async ({
 		metamask,
 	}) => {
-		test.info().annotations.push({
-			type: 'Test case',
-			description: '12068',
-		});
-
 		test.setTimeout(extremelyLongTestTimeout);
 
 		await app.page.goto('/arbitrum/aave/v3/borrow/eth-usdc#setup');

diff --git a/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum1.spec.ts b/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum1.spec.ts
@@ -12,9 +12,7 @@ let forkId: string;
 
 const test = testWithSynpress(metaMaskFixtures(arbitrumSetup));
 
-test.describe.configure({ mode: 'serial' });
-
-test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
+test.describe('Aave V3 Multiply - Arbitrum - Wallet connected', async () => {
 	test.beforeEach(async ({ metamask, page }) => {
 		test.setTimeout(longTestTimeout);
 
@@ -30,14 +28,12 @@ test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
 	test('It should open and manage an Aave V3 Multiply Arbitrum ETH/USDC position @regression', async ({
 		metamask,
 	}) => {
-		test.info().annotations.push({
-			type: 'Test case',
-			description: '12068',
-		});
-
 		test.setTimeout(extremelyLongTestTimeout);
 
-		await app.page.goto('/arbitrum/aave/v3/multiply/eth-usdc');
+		await app.page.goto('/arbitrum/aave/v3/multiply/ETH-USDC#setup');
+
+		// Pause to avoid random fails
+		await app.page.waitForTimeout(2_000);
 
 		await test.step('It should Open a position', async () => {
 			await openPosition({
@@ -59,8 +55,6 @@ test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
 		});
 
 		await test.step('It should Adjust risk - Down', async () => {
-			await app.position.manage.withdrawCollateral();
-
 			await adjustRisk({
 				metamask,
 				forkId,

diff --git a/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum2.spec.ts b/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum2.spec.ts
@@ -15,7 +15,7 @@ const test = testWithSynpress(metaMaskFixtures(arbitrumSetup));
 
 test.describe.configure({ mode: 'serial' });
 
-test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
+test.describe('Aave V3 Multiply - Arbitrum - Wallet connected', async () => {
 	test.beforeEach(async ({ metamask, page }) => {
 		test.setTimeout(longTestTimeout);
 
@@ -48,6 +48,9 @@ test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
 
 		await app.page.goto('/arbitrum/aave/v3/multiply/wsteth-dai');
 
+		// Pause to avoid random fails
+		await app.page.waitForTimeout(2_000);
+
 		await test.step('It should Open a position', async () => {
 			await openPosition({
 				metamask,

diff --git a/utils/synpress/test-wallet-setup/arbitrum.setup.ts b/utils/synpress/test-wallet-setup/arbitrum.setup.ts
@@ -1,8 +1,13 @@
 import { defineWalletSetup } from '@synthetixio/synpress';
 import { addNetwork, commonMetamaskSetup, PASSWORD } from '../commonWalletSetup';
+import 'dotenv/config';
+
+const walletPK = process.env.EMPTY_TEST_WALLET_PK as string;
 
 export default defineWalletSetup(PASSWORD, async (context, walletPage) => {
 	const metamask = await commonMetamaskSetup({ context, walletPage });
 
+	await metamask.importWalletFromPrivateKey(walletPK);
+
 	await addNetwork({ metamask, network: 'arbitrum' });
 });