m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00
Code

feature(17901): fix test/e2e/tests/add-account.spec.js (#19280)

Browse Source
This commit is contained in:
Danica Shen 2023-05-24 18:50:31 +01:00 committed by GitHub
parent ba4f56fbf7
commit 9ea6f8ee12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 105 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/e2e/helpers.js
View File

@ -481,6 +481,30 @@ const defaultGanacheOptions = {
const SERVICE_WORKER_URL = 'chrome://inspect/#service-workers';
const sendTransaction = async (driver, recipientAddress, quantity) => {
await driver.clickElement('[data-testid="eth-overview-send"]');
await driver.fill('[data-testid="ens-input"]', recipientAddress);
await driver.fill('.unit-input__input', quantity);
await driver.clickElement('[data-testid="page-container-footer-next"]');
await driver.clickElement('[data-testid="page-container-footer-next"]');
await driver.clickElement('[data-testid="home__activity-tab"]');
await driver.findElement('.transaction-list-item');
};
const findAnotherAccountFromAccountList = async (
driver,
itemNumber,
accountName,
) => {
await driver.clickElement('.account-menu__icon');
const accountMenuItemSelector = `.account-menu__account:nth-child(${itemNumber})`;
const fourthAccountName = await driver.findElement(
`${accountMenuItemSelector} .account-menu__name`,
);
assert.equal(await fourthAccountName.getText(), accountName);
return accountMenuItemSelector;
};
module.exports = {
DAPP_URL,
DAPP_ONE_URL,
@ -503,4 +527,6 @@ module.exports = {
mockPhishingDetection,
setupPhishingDetectionMocks,
defaultGanacheOptions,
sendTransaction,
findAnotherAccountFromAccountList,
};

160
test/e2e/tests/add-account.spec.js
View File

@ -4,6 +4,8 @@ const {
withFixtures,
regularDelayMs,
completeImportSRPOnboardingFlow,
sendTransaction,
findAnotherAccountFromAccountList,
} = require('../helpers');
const enLocaleMessages = require('../../../app/_locales/en/messages.json');
const FixtureBuilder = require('../fixture-builder');
@ -21,8 +23,8 @@ describe('Add account', function () {
},
],
};
const firstAccount = '0x0Cc5261AB8cE458dc977078A3623E2BaDD27afD3';
const secondAccount = '0x3ED0eE22E0685Ebbf07b2360A8331693c413CC59';
const thirdAccount = '0xD38d853771Fb546bd8B18b2F3638491bC0B0E906';
it('should display correct new account name after create', async function () {
await withFixtures(
@ -50,7 +52,7 @@ describe('Add account', function () {
);
});
it('should add the same account addresses when a secret recovery phrase is imported, the account is locked, and the same secret recovery phrase is imported again', async function () {
it('should not affect public address when using secret recovery phrase to recover account with non-zero balance', async function () {
await withFixtures(
{
fixtures: new FixtureBuilder({ onboarding: true }).build(),
@ -61,64 +63,40 @@ describe('Add account', function () {
async ({ driver }) => {
await driver.navigate();
// On boarding with 1st account
await completeImportSRPOnboardingFlow(
driver,
testSeedPhrase,
testPassword,
);
await driver.clickElement('.account-menu__icon');
// Check address of 1st account
const firstAccountPublicAddress = await checkAccountDetails(driver);
assert.equal(firstAccountPublicAddress, firstAccount);
await driver.delay(regularDelayMs);
// Create a new account
await driver.findClickableElement('.account-menu__icon');
await driver.clickElement('[data-testid="account-menu-icon"]');
await driver.clickElement({ text: 'Create account', tag: 'div' });
await driver.fill('.new-account-create-form input', '2nd account');
await driver.clickElement({ text: 'Create', tag: 'button' });
await driver.clickElement(
'[data-testid="account-options-menu-button"]',
);
await driver.clickElement(
'[data-testid="account-options-menu__account-details"]',
// Check address of 2nd account
const secondAccountPublicAddress = await checkAccountDetails(driver);
assert.strictEqual(secondAccountPublicAddress, secondAccount);
await driver.delay(regularDelayMs);
// Give 2nd locally account some balance so it will not be removed after recovering SRP
const accountOneSelector = await findAnotherAccountFromAccountList(
driver,
1,
'Account 1',
);
await driver.clickElement(accountOneSelector);
await sendTransaction(driver, secondAccount, '2.8');
const detailsModal = await driver.findVisibleElement('span .modal');
// get the public address for the "second account"
await driver.waitForSelector('.qr-code__address');
const secondAccountAddress = await driver.findElement({
text: secondAccount,
tag: 'div',
});
const secondAccountPublicAddress = await secondAccountAddress.getText();
await driver.clickElement('.account-modal__close');
await detailsModal.waitForElementState('hidden');
// generate a third accound
await driver.clickElement('.account-menu__icon');
await driver.clickElement({ text: 'Create account', tag: 'div' });
await driver.fill('.new-account-create-form input', '3rd account');
await driver.clickElement({ text: 'Create', tag: 'button' });
await driver.clickElement(
'[data-testid="account-options-menu-button"]',
);
await driver.clickElement(
'[data-testid="account-options-menu__account-details"]',
);
// get the public address for the "third account"
const secondDetailsModal = await driver.findVisibleElement(
'span .modal',
);
await driver.waitForSelector('.qr-code__address');
const thirdAccountAddress = await driver.findElement({
text: thirdAccount,
tag: 'div',
});
const thirdAccountPublicAddress = await thirdAccountAddress.getText();
await driver.clickElement('.account-modal__close');
await secondDetailsModal.waitForElementState('hidden');
// lock account
// Lock the account
await driver.clickElement('.account-menu__icon');
await driver.delay(regularDelayMs);
@ -128,7 +106,7 @@ describe('Add account', function () {
await lockButton.click();
await driver.delay(regularDelayMs);
// restore same seed phrase
// Recover via SRP in "forget password" option
const restoreSeedLink = await driver.findClickableElement(
'.unlock-page__link',
);
@ -147,59 +125,27 @@ describe('Add account', function () {
text: enLocaleMessages.restore.message,
tag: 'button',
});
// Land in 1st account home page
await driver.findElement('.home__main-view');
// Check address of 1st account
const restoredFirstAccountPublicAddress = await checkAccountDetails(
driver,
);
assert.equal(restoredFirstAccountPublicAddress, firstAccount);
await driver.delay(regularDelayMs);
// recreate a "2nd account"
await driver.clickElement('.account-menu__icon');
await driver.clickElement({ text: 'Create account', tag: 'div' });
await driver.fill('.new-account-create-form input', '2nd account');
await driver.clickElement({ text: 'Create', tag: 'button' });
await driver.clickElement(
'[data-testid="account-options-menu-button"]',
// Check address of 2nd account
const accountTwoSelector = await findAnotherAccountFromAccountList(
driver,
2,
'Account 2',
);
await driver.clickElement(
'[data-testid="account-options-menu__account-details"]',
);
const thirdDetailsModal = await driver.findVisibleElement(
'span .modal',
);
// get the public address for the "second account"
await driver.waitForSelector('.qr-code__address');
const recreatedSecondAccountAddress = await driver.findElement({
text: secondAccount,
tag: 'div',
});
assert.equal(
await recreatedSecondAccountAddress.getText(),
secondAccountPublicAddress,
);
await driver.clickElement('.account-modal__close');
await thirdDetailsModal.waitForElementState('hidden');
// re-generate a third accound
await driver.clickElement('.account-menu__icon');
await driver.clickElement({ text: 'Create account', tag: 'div' });
await driver.fill('.new-account-create-form input', '3rd account');
await driver.clickElement({ text: 'Create', tag: 'button' });
await driver.clickElement(
'[data-testid="account-options-menu-button"]',
);
await driver.clickElement(
'[data-testid="account-options-menu__account-details"]',
);
// get the public address for the "third account"
const recreatedThirdAccountAddress = await driver.findElement({
text: thirdAccount,
tag: 'div',
});
assert.strictEqual(
await recreatedThirdAccountAddress.getText(),
thirdAccountPublicAddress,
await driver.clickElement(accountTwoSelector);
const restoredSecondAccountPublicAddress = await checkAccountDetails(
driver,
);
assert.equal(restoredSecondAccountPublicAddress, secondAccount);
},
);
});
@ -264,3 +210,19 @@ describe('Add account', function () {
);
});
});
async function checkAccountDetails(driver) {
await driver.clickElement('[data-testid="account-options-menu-button"]');
await driver.clickElement(
'[data-testid="account-options-menu__account-details"]',
);
await driver.findVisibleElement('.account-details-modal');
// get the public address for the "second account"
const accountDOM = await driver.findElement('.qr-code__address');
const accountAddress = await accountDOM.getText();
await driver.clickElement('.account-modal__close');
await driver.waitForElementNotPresent('.account-details-modal ');
return accountAddress;
}

20
test/e2e/tests/from-import-ui.spec.js
View File

@ -7,6 +7,7 @@ const {
largeDelayMs,
completeImportSRPOnboardingFlow,
completeImportSRPOnboardingFlowWordByWord,
findAnotherAccountFromAccountList,
} = require('../helpers');
const FixtureBuilder = require('../fixture-builder');
@ -221,13 +222,12 @@ describe('MetaMask Import UI', function () {
assert.equal(await importedAccountName.getText(), 'Account 4');
// should show the imported label
await driver.clickElement('.account-menu__icon');
// confirm 4th account is account 4, as expected
const accountMenuItemSelector = '.account-menu__account:nth-child(4)';
const fourthAccountName = await driver.findElement(
`${accountMenuItemSelector} .account-menu__name`,
const accountMenuItemSelector = await findAnotherAccountFromAccountList(
driver,
4,
'Account 4',
);
assert.equal(await fourthAccountName.getText(), 'Account 4');
// confirm label is present on the same menu item
const importedLabel = await driver.findElement(
`${accountMenuItemSelector} .keyring-label`,
@ -336,13 +336,13 @@ describe('MetaMask Import UI', function () {
assert.equal(await importedAccountName.getText(), 'Account 4');
// should show the imported label
await driver.clickElement('.account-menu__icon');
// confirm 4th account is account 4, as expected
const accountMenuItemSelector = '.account-menu__account:nth-child(4)';
const fourthAccountName = await driver.findElement(
`${accountMenuItemSelector} .account-menu__name`,
const accountMenuItemSelector = await findAnotherAccountFromAccountList(
driver,
4,
'Account 4',
);
assert.equal(await fourthAccountName.getText(), 'Account 4');
// confirm label is present on the same menu item
const importedLabel = await driver.findElement(
`${accountMenuItemSelector} .keyring-label`,

17
test/e2e/tests/simple-send.spec.js
View File

@ -1,4 +1,8 @@
const { convertToHexValue, withFixtures } = require('../helpers');
const {
convertToHexValue,
withFixtures,
sendTransaction,
} = require('../helpers');
const FixtureBuilder = require('../fixture-builder');
describe('Simple send', function () {
@ -22,16 +26,11 @@ describe('Simple send', function () {
await driver.navigate();
await driver.fill('#password', 'correct horse battery staple');
await driver.press('#password', driver.Key.ENTER);
await driver.clickElement('[data-testid="eth-overview-send"]');
await driver.fill(
'[data-testid="ens-input"]',
await sendTransaction(
driver,
'0x985c30949c92df7a0bd42e0f3e3d539ece98db24',
'1',
);
await driver.fill('.unit-input__input', '1');
await driver.clickElement('[data-testid="page-container-footer-next"]');
await driver.clickElement('[data-testid="page-container-footer-next"]');
await driver.clickElement('[data-testid="home__activity-tab"]');
await driver.findElement('.transaction-list-item');
},
);
});