diff --git a/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts b/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts index bc41a491708f..fd85c073a1d1 100644 --- a/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts +++ b/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts @@ -10,7 +10,6 @@ import { createDappTransaction } from '../../../page-objects/flows/transaction'; import Confirmation from '../../../page-objects/pages/confirmations/redesign/confirmation'; import ActivityListPage from '../../../page-objects/pages/home/activity-list'; import HomePage from '../../../page-objects/pages/home/homepage'; -import { SMART_CONTRACTS } from '../../../seeder/smart-contracts'; import { TestSuiteArguments } from './shared'; const { WINDOW_TITLES, withFixtures } = require('../../../helpers'); @@ -28,10 +27,9 @@ describe('Speed Up and Cancel Transaction Tests', function () { .withPermissionControllerConnectedToTestDapp() .build(), localNodeOptions: defaultGanacheOptionsForType2Transactions, - smartContract: SMART_CONTRACTS.PIGGYBANK, title: this.test?.fullTitle(), }, - async ({ driver }: TestSuiteArguments) => { + async ({ driver, ganacheServer }: TestSuiteArguments) => { await unlockWallet(driver); // Create initial stuck transaction @@ -43,7 +41,6 @@ describe('Speed Up and Cancel Transaction Tests', function () { }); // Wait for confirmation dialog and confirm initial transaction - await driver.waitUntilXWindowHandles(3); await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog); const confirmationPage = new Confirmation(driver); @@ -53,6 +50,7 @@ describe('Speed Up and Cancel Transaction Tests', function () { await driver.switchToWindowWithTitle( WINDOW_TITLES.ExtensionInFullScreenView, ); + await ganacheServer?.mineBlock(); const homePage = new HomePage(driver); await homePage.goToActivityList(); @@ -63,6 +61,7 @@ describe('Speed Up and Cancel Transaction Tests', function () { await activityListPage.click_transactionListItem(); await activityListPage.click_speedUpTransaction(); await activityListPage.click_confirmTransactionReplacement(); + await ganacheServer?.mineBlock(); await activityListPage.check_waitForTransactionStatus('confirmed'); }, @@ -79,10 +78,9 @@ describe('Speed Up and Cancel Transaction Tests', function () { .withPermissionControllerConnectedToTestDapp() .build(), localNodeOptions: defaultGanacheOptionsForType2Transactions, - smartContract: SMART_CONTRACTS.PIGGYBANK, title: this.test?.fullTitle(), }, - async ({ driver }: TestSuiteArguments) => { + async ({ driver, ganacheServer }: TestSuiteArguments) => { await unlockWallet(driver); // Create initial stuck transaction @@ -93,11 +91,11 @@ describe('Speed Up and Cancel Transaction Tests', function () { to: DEFAULT_FIXTURE_ACCOUNT, }); - await driver.waitUntilXWindowHandles(3); await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog); const confirmationPage = new Confirmation(driver); await confirmationPage.clickFooterConfirmButton(); + await ganacheServer?.mineBlock(); await driver.switchToWindowWithTitle( WINDOW_TITLES.ExtensionInFullScreenView, @@ -111,6 +109,7 @@ describe('Speed Up and Cancel Transaction Tests', function () { await activityListPage.click_cancelTransaction(); await activityListPage.click_confirmTransactionReplacement(); + await ganacheServer?.mineBlock(); await activityListPage.check_waitForTransactionStatus('cancelled'); },