m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

[FLASK] Improve Snaps E2E stability (#16597)

Browse Source 
* Improve Snaps E2E stability

* Simplify

* Fix lint
This commit is contained in:
Frederik Bolding 2022-11-21 14:38:05 +01:00 committed by GitHub
parent ad4db57a4a
commit 8a529bca47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 68 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/snaps/test-snap-bip-32.spec.js
View File

@ -38,8 +38,11 @@ describe('Test Snap bip-32', function () {
await driver.clickElement('#connectBip32'); await driver.clickElement('#connectBip32');
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(2, 5000, 10000); let windowHandles = await driver.waitUntilXWindowHandles(
let windowHandles = await driver.getAllWindowHandles(); 2,
1000,
10000,
);
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -55,8 +58,7 @@ describe('Test Snap bip-32', function () {
await driver.delay(2000); await driver.delay(2000);
// switch to metamask extension // switch to metamask extension
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
// approve install of snap // approve install of snap
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
@ -78,8 +80,7 @@ describe('Test Snap bip-32', function () {
}); });
// switch back to test-snaps window // switch back to test-snaps window
await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
// scroll to and click get public key // scroll to and click get public key
@ -124,8 +125,7 @@ describe('Test Snap bip-32', function () {
await driver.clickElement('#sendBip32-secp256k1'); await driver.clickElement('#sendBip32-secp256k1');
// hit 'approve' on the custom confirm // hit 'approve' on the custom confirm
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -135,8 +135,7 @@ describe('Test Snap bip-32', function () {
tag: 'button', tag: 'button',
}); });
await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
// check result // check result
@ -161,8 +160,7 @@ describe('Test Snap bip-32', function () {
await driver.clickElement('#sendBip32-ed25519'); await driver.clickElement('#sendBip32-ed25519');
// hit 'approve' on the custom confirm // hit 'approve' on the custom confirm
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -172,8 +170,7 @@ describe('Test Snap bip-32', function () {
tag: 'button', tag: 'button',
}); });
await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
// check result // check result

19
test/e2e/snaps/test-snap-bip-44.spec.js
View File

@ -36,8 +36,11 @@ describe('Test Snap bip-44', function () {
await driver.clickElement('#connectBip44Snap'); await driver.clickElement('#connectBip44Snap');
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(2, 5000, 10000); let windowHandles = await driver.waitUntilXWindowHandles(
let windowHandles = await driver.getAllWindowHandles(); 2,
1000,
10000,
);
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -53,8 +56,7 @@ describe('Test Snap bip-44', function () {
await driver.delay(2000); await driver.delay(2000);
// switch to metamask extension // switch to metamask extension
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
// approve install of snap // approve install of snap
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
@ -75,8 +77,7 @@ describe('Test Snap bip-44', function () {
}); });
// click send inputs on test snap page // click send inputs on test snap page
await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
await driver.delay(1000); await driver.delay(1000);
await driver.clickElement('#sendBip44Test'); await driver.clickElement('#sendBip44Test');
@ -98,8 +99,7 @@ describe('Test Snap bip-44', function () {
await driver.clickElement('#signBip44Message'); await driver.clickElement('#signBip44Message');
// Switch to approve signature message window and approve // Switch to approve signature message window and approve
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -110,8 +110,7 @@ describe('Test Snap bip-44', function () {
}); });
// switch back to test-snaps page // switch back to test-snaps page
await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
await driver.delay(1000); await driver.delay(1000);

19
test/e2e/snaps/test-snap-confirm.spec.js
View File

@ -36,8 +36,11 @@ describe('Test Snap Confirm', function () {
await driver.clickElement('#connectConfirmSnap'); await driver.clickElement('#connectConfirmSnap');
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(2, 5000, 10000); let windowHandles = await driver.waitUntilXWindowHandles(
let windowHandles = await driver.getAllWindowHandles(); 2,
1000,
10000,
);
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -53,8 +56,7 @@ describe('Test Snap Confirm', function () {
await driver.delay(2000); await driver.delay(2000);
// approve install of snap // approve install of snap
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -65,8 +67,7 @@ describe('Test Snap Confirm', function () {
}); });
// switch back to test snaps page // switch back to test snaps page
await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
// click send inputs on test snap page // click send inputs on test snap page
@ -76,8 +77,7 @@ describe('Test Snap Confirm', function () {
await driver.clickElement('#sendConfirmButton'); await driver.clickElement('#sendConfirmButton');
// hit 'approve' on the custom confirm // hit 'approve' on the custom confirm
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -88,8 +88,7 @@ describe('Test Snap Confirm', function () {
}); });
// check the results of the custom confirm // check the results of the custom confirm
await driver.waitUntilXWindowHandles(1, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
const confirmResult = await driver.findElement('#confirmResult'); const confirmResult = await driver.findElement('#confirmResult');
assert.equal(await confirmResult.getText(), 'true'); assert.equal(await confirmResult.getText(), 'true');

11
test/e2e/snaps/test-snap-error.spec.js
View File

@ -36,8 +36,11 @@ describe('Test Snap Error', function () {
await driver.clickElement('#connectErrorSnap'); await driver.clickElement('#connectErrorSnap');
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(3, 5000, 10000); let windowHandles = await driver.waitUntilXWindowHandles(
let windowHandles = await driver.getAllWindowHandles(); 3,
1000,
10000,
);
const extensionPage = windowHandles[0]; const extensionPage = windowHandles[0];
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
@ -54,6 +57,7 @@ describe('Test Snap Error', function () {
await driver.delay(2000); await driver.delay(2000);
// approve install of snap // approve install of snap
windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -64,8 +68,7 @@ describe('Test Snap Error', function () {
}); });
// click send inputs on test snap page // click send inputs on test snap page
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
await driver.delay(1000); await driver.delay(1000);

19
test/e2e/snaps/test-snap-installed.spec.js
View File

@ -36,8 +36,11 @@ describe('Test Snap Installed', function () {
await driver.clickElement('#connectConfirmSnap'); await driver.clickElement('#connectConfirmSnap');
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(3, 5000, 10000); let windowHandles = await driver.waitUntilXWindowHandles(
let windowHandles = await driver.getAllWindowHandles(); 3,
1000,
10000,
);
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -53,8 +56,7 @@ describe('Test Snap Installed', function () {
await driver.delay(2000); await driver.delay(2000);
// approve install of snap // approve install of snap
await driver.waitUntilXWindowHandles(3, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -65,8 +67,7 @@ describe('Test Snap Installed', function () {
}); });
// click send inputs on test snap page // click send inputs on test snap page
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
const errorButton = await driver.findElement('#connectErrorSnap'); const errorButton = await driver.findElement('#connectErrorSnap');
@ -75,8 +76,7 @@ describe('Test Snap Installed', function () {
await driver.clickElement('#connectErrorSnap'); await driver.clickElement('#connectErrorSnap');
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(3, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -102,8 +102,7 @@ describe('Test Snap Installed', function () {
tag: 'button', tag: 'button',
}); });
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
const result = await driver.findElement('#installedSnapsResult'); const result = await driver.findElement('#installedSnapsResult');

13
test/e2e/snaps/test-snap-managestate.spec.js
View File

@ -40,8 +40,11 @@ describe('Test Snap manageState', function () {
await driver.clickElement('#connectManageState'); await driver.clickElement('#connectManageState');
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(3, 5000, 10000); let windowHandles = await driver.waitUntilXWindowHandles(
let windowHandles = await driver.getAllWindowHandles(); 3,
1000,
10000,
);
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -56,8 +59,7 @@ describe('Test Snap manageState', function () {
await driver.delay(2000); await driver.delay(2000);
// approve install of snap // approve install of snap
await driver.waitUntilXWindowHandles(3, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -68,8 +70,7 @@ describe('Test Snap manageState', function () {
}); });
// fill and click send inputs on test snap page // fill and click send inputs on test snap page
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
await driver.fill('#dataManageState', '23'); await driver.fill('#dataManageState', '23');
await driver.delay(1000); await driver.delay(1000);

13
test/e2e/snaps/test-snap-notification.spec.js
View File

@ -39,8 +39,11 @@ describe('Test Snap Notification', function () {
await driver.clickElement('#connectNotification'); await driver.clickElement('#connectNotification');
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(3, 5000, 10000); let windowHandles = await driver.waitUntilXWindowHandles(
let windowHandles = await driver.getAllWindowHandles(); 3,
1000,
10000,
);
const extensionPage = windowHandles[0]; const extensionPage = windowHandles[0];
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
@ -56,8 +59,7 @@ describe('Test Snap Notification', function () {
await driver.delay(2000); await driver.delay(2000);
// approve install of snap // approve install of snap
await driver.waitUntilXWindowHandles(3, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -68,8 +70,7 @@ describe('Test Snap Notification', function () {
}); });
// click send inputs on test snap page // click send inputs on test snap page
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
await driver.delay(1000); await driver.delay(1000);
await driver.clickElement('#sendInAppNotification'); await driver.clickElement('#sendInAppNotification');

18
test/e2e/snaps/test-snap-update.spec.js
View File

@ -40,8 +40,11 @@ describe('Test Snap update', function () {
await driver.delay(2000); await driver.delay(2000);
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(3, 5000, 10000); let windowHandles = await driver.waitUntilXWindowHandles(
let windowHandles = await driver.getAllWindowHandles(); 3,
1000,
10000,
);
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -56,8 +59,7 @@ describe('Test Snap update', function () {
await driver.delay(2000); await driver.delay(2000);
// approve install of snap // approve install of snap
await driver.waitUntilXWindowHandles(3, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle( await driver.switchToWindowWithTitle(
'MetaMask Notification', 'MetaMask Notification',
windowHandles, windowHandles,
@ -68,8 +70,7 @@ describe('Test Snap update', function () {
}); });
// navigate to test snap page // navigate to test snap page
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
await driver.delay(1000); await driver.delay(1000);
@ -80,7 +81,7 @@ describe('Test Snap update', function () {
await driver.clickElement('#connectUpdateNew'); await driver.clickElement('#connectUpdateNew');
// switch to metamask extension and click connect // switch to metamask extension and click connect
await driver.waitUntilXWindowHandles(3, 5000, 10000); await driver.waitUntilXWindowHandles(3, 1000, 10000);
await driver.delay(1000); await driver.delay(1000);
// approve update of snap // approve update of snap
@ -95,8 +96,7 @@ describe('Test Snap update', function () {
}); });
// navigate to test snap page // navigate to test snap page
await driver.waitUntilXWindowHandles(2, 5000, 10000); windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
windowHandles = await driver.getAllWindowHandles();
await driver.switchToWindowWithTitle('Test Snaps', windowHandles); await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
// look for the correct version text // look for the correct version text