Skip to content

Commit

Permalink
Sorting seed phrase confirmation buttons alphabetically (MetaMask#7933)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryanml @yqrashawn
ryanml authored and yqrashawn committed Feb 10, 2020
1 parent 3d1b35c commit 1518719
Show file tree
Hide file tree
Showing 7 changed files with 113 additions and 242 deletions.
143 changes: 36 additions & 107 deletions test/e2e/address-book.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
const assert = require('assert')
const { By, until } = require('selenium-webdriver')

const { tinyDelayMs, regularDelayMs, largeDelayMs } = require('./helpers')
const {
tinyDelayMs,
regularDelayMs,
largeDelayMs,
} = require('./helpers')
const { buildWebDriver } = require('./webdriver')
const Ganache = require('./ganache')
const enLocaleMessages = require('../../app/_locales/en/messages.json')
Expand All @@ -11,8 +15,7 @@ const ganacheServer = new Ganache()
describe('MetaMask', function () {
let driver

const testSeedPhrase =
'forum vessel pink push lonely enact gentle tail admit parrot grunt dress'
const testSeedPhrase = 'forum vessel pink push lonely enact gentle tail admit parrot grunt dress'

this.timeout(0)
this.bail(true)
Expand All @@ -21,8 +24,7 @@ describe('MetaMask', function () {
await ganacheServer.start({
accounts: [
{
secretKey:
'0x53CB0AB5226EEBF4D872113D98332C1555DC304443BEE1CF759D15798D3C55A9',
secretKey: '0x53CB0AB5226EEBF4D872113D98332C1555DC304443BEE1CF759D15798D3C55A9',
balance: 25000000000000000000,
},
],
Expand All @@ -36,9 +38,7 @@ describe('MetaMask', function () {
const errors = await driver.checkBrowserForConsoleErrors()
if (errors.length) {
const errorReports = errors.map(err => err.message)
const errorMessage = `Errors found in browser console:\n${errorReports.join(
'\n'
)}`
const errorMessage = `Errors found in browser console:\n${errorReports.join('\n')}`
console.error(new Error(errorMessage))
}
}
Expand All @@ -55,18 +55,12 @@ describe('MetaMask', function () {
describe('Going through the first time flow', () => {
it('clicks the continue button on the welcome screen', async () => {
await driver.findElement(By.css('.welcome-page__header'))
await driver.clickElement(
By.xpath(
`//button[contains(text(), '${enLocaleMessages.getStarted.message}')]`
)
)
await driver.clickElement(By.xpath(`//button[contains(text(), '${enLocaleMessages.getStarted.message}')]`))
await driver.delay(largeDelayMs)
})

it('clicks the "Create New Wallet" option', async () => {
await driver.clickElement(
By.xpath(`//button[contains(text(), 'Create a Wallet')]`)
)
await driver.clickElement(By.xpath(`//button[contains(text(), 'Create a Wallet')]`))
await driver.delay(largeDelayMs)
})

Expand All @@ -76,12 +70,8 @@ describe('MetaMask', function () {
})

it('accepts a secure password', async () => {
const passwordBox = await driver.findElement(
By.css('.first-time-flow__form #create-password')
)
const passwordBoxConfirm = await driver.findElement(
By.css('.first-time-flow__form #confirm-password')
)
const passwordBox = await driver.findElement(By.css('.first-time-flow__form #create-password'))
const passwordBoxConfirm = await driver.findElement(By.css('.first-time-flow__form #confirm-password'))

await passwordBox.sendKeys('correct horse battery staple')
await passwordBoxConfirm.sendKeys('correct horse battery staple')
Expand All @@ -94,33 +84,21 @@ describe('MetaMask', function () {
let seedPhrase

it('reveals the seed phrase', async () => {
const byRevealButton = By.css(
'.reveal-seed-phrase__secret-blocker .reveal-seed-phrase__reveal-button'
)
const byRevealButton = By.css('.reveal-seed-phrase__secret-blocker .reveal-seed-phrase__reveal-button')
await driver.clickElement(byRevealButton)
await driver.delay(regularDelayMs)

const revealedSeedPhrase = await driver.findElement(
By.css('.reveal-seed-phrase__secret-words')
)
const revealedSeedPhrase = await driver.findElement(By.css('.reveal-seed-phrase__secret-words'))
seedPhrase = await revealedSeedPhrase.getText()
assert.equal(seedPhrase.split(' ').length, 12)
await driver.delay(regularDelayMs)

await driver.clickElement(
By.xpath(
`//button[contains(text(), '${enLocaleMessages.next.message}')]`
)
)
await driver.clickElement(By.xpath(`//button[contains(text(), '${enLocaleMessages.next.message}')]`))
await driver.delay(regularDelayMs)
})

async function clickWordAndWait (word) {
await driver.clickElement(
By.css(
`[data-testid="seed-phrase-shuffled"] [data-testid="draggable-seed-${word}"]`
)
)
await driver.clickElement(By.css(`[data-testid="seed-phrase-sorted"] [data-testid="draggable-seed-${word}"]`))
await driver.delay(tinyDelayMs)
}

Expand All @@ -131,21 +109,13 @@ describe('MetaMask', function () {
await clickWordAndWait(word)
}

await driver.clickElement(
By.xpath(`//button[contains(text(), 'Confirm')]`)
)
await driver.clickElement(By.xpath(`//button[contains(text(), 'Confirm')]`))
await driver.delay(regularDelayMs)
})

it('clicks through the success screen', async () => {
await driver.findElement(
By.xpath(`//div[contains(text(), 'Congratulations')]`)
)
await driver.clickElement(
By.xpath(
`//button[contains(text(), '${enLocaleMessages.endOfFlowMessage10.message}')]`
)
)
await driver.findElement(By.xpath(`//div[contains(text(), 'Congratulations')]`))
await driver.clickElement(By.xpath(`//button[contains(text(), '${enLocaleMessages.endOfFlowMessage10.message}')]`))
await driver.delay(regularDelayMs)
})
})
Expand All @@ -155,22 +125,15 @@ describe('MetaMask', function () {
await driver.clickElement(By.css('.account-menu__icon'))
await driver.delay(regularDelayMs)

const lockButton = await driver.findClickableElement(
By.css('.account-menu__lock-button')
)
const lockButton = await driver.findClickableElement(By.css('.account-menu__lock-button'))
assert.equal(await lockButton.getText(), 'Lock')
await lockButton.click()
await driver.delay(regularDelayMs)
})

it('imports seed phrase', async () => {
const restoreSeedLink = await driver.findClickableElement(
By.css('.unlock-page__link--import')
)
assert.equal(
await restoreSeedLink.getText(),
'Import using account seed phrase'
)
const restoreSeedLink = await driver.findClickableElement(By.css('.unlock-page__link--import'))
assert.equal(await restoreSeedLink.getText(), 'Import using account seed phrase')
await restoreSeedLink.click()
await driver.delay(regularDelayMs)

Expand All @@ -183,18 +146,12 @@ describe('MetaMask', function () {

await passwordInputs[0].sendKeys('correct horse battery staple')
await passwordInputs[1].sendKeys('correct horse battery staple')
await driver.clickElement(
By.xpath(
`//button[contains(text(), '${enLocaleMessages.restore.message}')]`
)
)
await driver.clickElement(By.xpath(`//button[contains(text(), '${enLocaleMessages.restore.message}')]`))
await driver.delay(regularDelayMs)
})

it('balance renders', async () => {
const balance = await driver.findElement(
By.css('.balance-display .token-amount')
)
const balance = await driver.findElement(By.css('.balance-display .token-amount'))
await driver.wait(until.elementTextMatches(balance, /25\s*ETH/))
await driver.delay(regularDelayMs)
})
Expand All @@ -205,26 +162,18 @@ describe('MetaMask', function () {
await driver.clickElement(By.xpath(`//button[contains(text(), 'Send')]`))
await driver.delay(regularDelayMs)

const inputAddress = await driver.findElement(
By.css('input[placeholder="Search, public address (0x), or ENS"]')
)
const inputAddress = await driver.findElement(By.css('input[placeholder="Search, public address (0x), or ENS"]'))
await inputAddress.sendKeys('0x2f318C334780961FB129D2a6c30D0763d9a5C970')
await driver.delay(regularDelayMs)

await driver.clickElement(By.css('.dialog.send__dialog.dialog--message'))

const addressBookAddModal = await driver.findElement(
By.css('span .modal')
)
const addressBookAddModal = await driver.findElement(By.css('span .modal'))
await driver.findElement(By.css('.add-to-address-book-modal'))
const addressBookInput = await driver.findElement(
By.css('.add-to-address-book-modal__input')
)
const addressBookInput = await driver.findElement(By.css('.add-to-address-book-modal__input'))
await addressBookInput.sendKeys('Test Name 1')
await driver.delay(tinyDelayMs)
await driver.clickElement(
By.css('.add-to-address-book-modal__footer .btn-primary')
)
await driver.clickElement(By.css('.add-to-address-book-modal__footer .btn-primary'))

await driver.wait(until.stalenessOf(addressBookAddModal))

Expand All @@ -241,25 +190,17 @@ describe('MetaMask', function () {
})

it('confirms the transaction', async function () {
await driver.clickElement(
By.xpath(`//button[contains(text(), 'Confirm')]`)
)
await driver.clickElement(By.xpath(`//button[contains(text(), 'Confirm')]`))
await driver.delay(largeDelayMs * 2)
})

it('finds the transaction in the transactions list', async function () {
await driver.wait(async () => {
const confirmedTxes = await driver.findElements(
By.css(
'.transaction-list__completed-transactions .transaction-list-item'
)
)
const confirmedTxes = await driver.findElements(By.css('.transaction-list__completed-transactions .transaction-list-item'))
return confirmedTxes.length === 1
}, 10000)

const txValues = await driver.findElement(
By.css('.transaction-list-item__amount--primary')
)
const txValues = await driver.findElement(By.css('.transaction-list-item__amount--primary'))
await driver.wait(until.elementTextMatches(txValues, /-1\s*ETH/), 10000)
})
})
Expand All @@ -269,15 +210,11 @@ describe('MetaMask', function () {
await driver.clickElement(By.xpath(`//button[contains(text(), 'Send')]`))
await driver.delay(regularDelayMs)

const recipientRowTitle = await driver.findElement(
By.css('.send__select-recipient-wrapper__group-item__title')
)
const recipientRowTitle = await driver.findElement(By.css('.send__select-recipient-wrapper__group-item__title'))
const recipientRowTitleString = await recipientRowTitle.getText()
assert.equal(recipientRowTitleString, 'Test Name 1')

await driver.clickElement(
By.css('.send__select-recipient-wrapper__group-item')
)
await driver.clickElement(By.css('.send__select-recipient-wrapper__group-item'))

await driver.delay(regularDelayMs)
const inputAmount = await driver.findElement(By.css('.unit-input__input'))
Expand All @@ -290,25 +227,17 @@ describe('MetaMask', function () {
})

it('confirms the transaction', async function () {
await driver.clickElement(
By.xpath(`//button[contains(text(), 'Confirm')]`)
)
await driver.clickElement(By.xpath(`//button[contains(text(), 'Confirm')]`))
await driver.delay(largeDelayMs * 2)
})

it('finds the transaction in the transactions list', async function () {
await driver.wait(async () => {
const confirmedTxes = await driver.findElements(
By.css(
'.transaction-list__completed-transactions .transaction-list-item'
)
)
const confirmedTxes = await driver.findElements(By.css('.transaction-list__completed-transactions .transaction-list-item'))
return confirmedTxes.length === 2
}, 10000)

const txValues = await driver.findElement(
By.css('.transaction-list-item__amount--primary')
)
const txValues = await driver.findElement(By.css('.transaction-list-item__amount--primary'))
await driver.wait(until.elementTextMatches(txValues, /-2\s*ETH/), 10000)
})
})
Expand Down
Loading

0 comments on commit 1518719

Please sign in to comment.