[Snaps E2E] Remove / Replace superflous arbitrary delays in snaps E2E tests

test/e2e/snaps/test-snap-bip-32.spec.js

@@ -21,17 +21,25 @@ describe('Test Snap bip-32', function () {
 
         // navigate to test snaps page and connect
         await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
 
         // find and scroll to the bip32 test and connect
         const snapButton1 = await driver.findElement('#connectbip32');
         await driver.scrollToElement(snapButton1);
-        await driver.delay(1000);
+        await driver.waitForSelector('#connectbip32');
         await driver.clickElement('#connectbip32');
-        await driver.delay(1000);
 
         // switch to metamask extension and click connect
         await switchToNotificationWindow(driver, 2);
+        await driver.waitForSelector({
+          text: 'Connect',
+          tag: 'button',
+        });
         await driver.clickElement({
           text: 'Connect',
           tag: 'button',
@@ -47,7 +55,7 @@ describe('Test Snap bip-32', function () {
         });
 
         // wait for permissions popover, click checkboxes and confirm
-        await driver.delay(500);
+        await driver.waitForSelector('.mm-checkbox__input');
         await driver.clickElement('.mm-checkbox__input');
         await driver.clickElement({
           text: 'Confirm',
@@ -70,7 +78,6 @@ describe('Test Snap bip-32', function () {
         });
 
         // scroll to and click get public key
-        await driver.delay(1000);
         await driver.waitForSelector({ text: 'Get Public Key' });
         await driver.clickElement('#bip32GetPublic');
 
@@ -120,7 +127,7 @@ describe('Test Snap bip-32', function () {
         await driver.scrollToElement(snapButton4);
 
         // wait then run ed25519 test
-        await driver.delay(500);
+        await driver.waitForSelector('#bip32Message-ed25519');
         await driver.fill('#bip32Message-ed25519', 'foo bar');
         await driver.clickElement('#sendBip32-ed25519');
 

test/e2e/snaps/test-snap-bip-44.spec.js

@@ -21,14 +21,18 @@ describe('Test Snap bip-44', function () {
 
         // navigate to test snaps page and connect
         await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
 
         // find and scroll to the bip44 test and connect
         const snapButton1 = await driver.findElement('#connectbip44');
         await driver.scrollToElement(snapButton1);
-        await driver.delay(1000);
+        await driver.waitForSelector('#connectbip44');
         await driver.clickElement('#connectbip44');
-        await driver.delay(1000);
 
         // switch to metamask extension and click connect and approve
         await switchToNotificationWindow(driver, 2);
@@ -46,7 +50,7 @@ describe('Test Snap bip-44', function () {
         });
 
         // deal with permissions popover
-        await driver.delay(500);
+        await driver.waitForSelector('.mm-checkbox__input');
         await driver.clickElement('.mm-checkbox__input');
         await driver.clickElement({
           text: 'Confirm',
@@ -78,10 +82,9 @@ describe('Test Snap bip-44', function () {
 
         // enter a message to sign
         await driver.pasteIntoField('#bip44Message', '1234');
-        await driver.delay(500);
         const snapButton3 = await driver.findElement('#signBip44Message');
         await driver.scrollToElement(snapButton3);
-        await driver.delay(500);
+        await driver.waitForSelector('#signBip44Message');
         await driver.clickElement('#signBip44Message');
 
         // Switch to approve signature message window and approve

test/e2e/snaps/test-snap-cronjob.spec.js

@@ -20,12 +20,17 @@ describe('Test Snap Cronjob', function () {
 
         // navigate to test snaps page and connect to cronjobs snap
         await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
+
         const snapButton = await driver.findElement('#connectcronjobs');
         await driver.scrollToElement(snapButton);
-        await driver.delay(1000);
+        await driver.delay(500);
         await driver.clickElement('#connectcronjobs');
-        await driver.delay(1000);
 
         // switch to metamask extension and click connect
         let windowHandles = await driver.waitUntilXWindowHandles(
@@ -71,10 +76,9 @@ describe('Test Snap Cronjob', function () {
           WINDOW_TITLES.Dialog,
           windowHandles,
         );
-        await driver.delay(1000);
 
         // look for the dialog popup to verify cronjob fired
-        await driver.findElement({
+        await driver.waitForSelector({
           css: '.snap-delineator__content',
           text: 'This dialog was triggered by a cronjob',
         });

test/e2e/snaps/test-snap-dialog.spec.js

@@ -20,12 +20,17 @@ describe('Test Snap Dialog', function () {
 
         // navigate to test snaps page and connect to dialog snap
         await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
+
         const dialogButton = await driver.findElement('#connectdialogs');
         await driver.scrollToElement(dialogButton);
-        await driver.delay(1000);
+        await driver.delay(500);
         await driver.clickElement('#connectdialogs');
-        await driver.delay(1000);
 
         // switch to metamask extension and click connect
         let windowHandles = await driver.waitUntilXWindowHandles(
@@ -67,15 +72,13 @@ describe('Test Snap Dialog', function () {
 
         // click on alert dialog
         await driver.clickElement('#sendAlertButton');
-        await driver.delay(500);
 
         // switch to dialog popup
         windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
         await driver.switchToWindowWithTitle(
           WINDOW_TITLES.Dialog,
           windowHandles,
         );
-        await driver.delay(500);
 
         // check dialog contents
         const result = await driver.findElement('.snap-ui-renderer__panel');
@@ -103,15 +106,13 @@ describe('Test Snap Dialog', function () {
 
         // click conf button
         await driver.clickElement('#sendConfirmationButton');
-        await driver.delay(500);
 
         // switch to dialog popup
         windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
         await driver.switchToWindowWithTitle(
           WINDOW_TITLES.Dialog,
           windowHandles,
         );
-        await driver.delay(500);
 
         // click reject
         await driver.clickElement({
@@ -131,15 +132,13 @@ describe('Test Snap Dialog', function () {
 
         // click conf button again
         await driver.clickElement('#sendConfirmationButton');
-        await driver.delay(500);
 
         // switch to dialog popup
         windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
         await driver.switchToWindowWithTitle(
           WINDOW_TITLES.Dialog,
           windowHandles,
         );
-        await driver.delay(500);
 
         // click accept
         await driver.clickElement({
@@ -159,15 +158,13 @@ describe('Test Snap Dialog', function () {
 
         // click prompt button
         await driver.clickElement('#sendPromptButton');
-        await driver.delay(500);
 
         // switch to dialog popup
         windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
         await driver.switchToWindowWithTitle(
           WINDOW_TITLES.Dialog,
           windowHandles,
         );
-        await driver.delay(500);
 
         // click cancel button
         await driver.clickElement({
@@ -187,15 +184,13 @@ describe('Test Snap Dialog', function () {
 
         // click prompt button
         await driver.clickElement('#sendPromptButton');
-        await driver.delay(500);
 
         // switch to dialog popup
         windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
         await driver.switchToWindowWithTitle(
           WINDOW_TITLES.Dialog,
           windowHandles,
         );
-        await driver.delay(500);
 
         // fill '2323' in form field
         await driver.pasteIntoField('.MuiInput-input', '2323');

test/e2e/snaps/test-snap-ethprovider.spec.js

@@ -20,14 +20,19 @@ describe('Test Snap ethereum_provider', function () {
 
         // navigate to test snaps page and connect to ethereum-provider snap
         await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
+
         const snapButton = await driver.findElement(
           '#connectethereum-provider',
         );
         await driver.scrollToElement(snapButton);
         await driver.delay(1000);
         await driver.clickElement('#connectethereum-provider');
-        await driver.delay(1000);
 
         // switch to metamask extension and click connect
         const windowHandles = await driver.waitUntilXWindowHandles(
@@ -101,7 +106,10 @@ describe('Test Snap ethereum_provider', function () {
           text: 'Next',
           tag: 'button',
         });
-        await driver.delay(500);
+        await driver.waitForSelector({
+          text: 'Connect',
+          tag: 'button',
+        });
         await driver.clickElement({
           text: 'Connect',
           tag: 'button',

test/e2e/snaps/test-snap-get-file.spec.js

@@ -20,12 +20,17 @@ describe('Test Snap Get File', function () {
 
         // navigate to test snaps page and connect to get-file snap
         await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
+
         const dialogButton = await driver.findElement('#connectgetfile');
         await driver.scrollToElement(dialogButton);
         await driver.delay(1000);
         await driver.clickElement('#connectgetfile');
-        await driver.delay(1000);
 
         // switch to metamask extension and click connect
         const windowHandles = await driver.waitUntilXWindowHandles(
@@ -68,10 +73,7 @@ describe('Test Snap Get File', function () {
         // click on get text
         await driver.clickElement('#sendGetFileTextButton');
 
-        // short delay
-        await driver.delay(500);
-
-        // assert that the get text result is correct
+        // check that the get text result is correct
         await driver.waitForSelector({
           css: '#getFileResult',
           text: '"foo": "bar"',

test/e2e/snaps/test-snap-get-locale.spec.js

@@ -20,12 +20,17 @@ describe('Test Snap Get Locale', function () {
 
         // navigate to test snaps page and connect to get-locale snap
         await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
+
         const dialogButton = await driver.findElement('#connectgetlocale');
         await driver.scrollToElement(dialogButton);
         await driver.delay(1000);
         await driver.clickElement('#connectgetlocale');
-        await driver.delay(1000);
 
         // switch to metamask extension and click connect
         let windowHandles = await driver.waitUntilXWindowHandles(
@@ -81,25 +86,30 @@ describe('Test Snap Get Locale', function () {
         // switch to the original MM tab
         const extensionPage = windowHandles[0];
         await driver.switchToWindow(extensionPage);
-        await driver.delay(1000);
 
         // click on the global action menu
+        await driver.waitForSelector(
+          '[data-testid="account-options-menu-button"]',
+        );
         await driver.clickElement(
           '[data-testid="account-options-menu-button"]',
         );
 
         // try to click on the notification item
         await driver.clickElement({ text: 'Settings', tag: 'div' });
-        await driver.delay(1000);
 
         // try to click on the snaps item
+        await driver.waitForSelector({
+          text: 'General',
+          tag: 'div',
+        });
         await driver.clickElement({
           text: 'General',
           tag: 'div',
         });
-        await driver.delay(1000);
 
         // try to click on locale-select
+        await driver.waitForSelector('[data-testid="locale-select"]');
         await driver.clickElement('[data-testid="locale-select"]');
 
         // try to select dansk from the list

test/e2e/snaps/test-snap-getentropy.spec.js

@@ -20,12 +20,17 @@ describe('Test Snap getEntropy', function () {
 
         // navigate to test snaps page and connect to get-entropy snap
         await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
+
         const snapButton = await driver.findElement('#connectGetEntropySnap');
         await driver.scrollToElement(snapButton);
         await driver.delay(1000);
         await driver.clickElement('#connectGetEntropySnap');
-        await driver.delay(1000);
 
         // switch to metamask extension and click connect
         let windowHandles = await driver.waitUntilXWindowHandles(
@@ -69,7 +74,6 @@ describe('Test Snap getEntropy', function () {
 
         // find and click on send test
         await driver.pasteIntoField('#entropyMessage', '1234');
-        await driver.delay(500);
         const snapButton2 = await driver.findElement('#signEntropyMessage');
         await driver.scrollToElement(snapButton2);
         await driver.delay(500);