resolve merge conflict

This commit is contained in:
dennistikhomirov 2018-10-03 07:46:21 -07:00
parent 113f9be143
commit de658ea073
1 changed files with 2 additions and 2 deletions

View File

@ -955,8 +955,8 @@ describe('Metamask popup page', async function () {
const addTokenScreen = await waitUntilShowUp(screens.addToken.title)
assert.equal(await addTokenScreen.getText(), screens.addToken.titleText)
})
it('open \'Add token\' tab', async function () {
const tab = await waitUntilShowUp(screens.addToken.tab.custom)
it('adds token parameters', async function () {
const tab = await waitUntilShowUp(screens.addToken.tab.custom, 30)
if (!await waitUntilShowUp(screens.addToken.custom.fields.contractAddress)) await tab.click()
})
it('address input is displayed and has correct placeholder', async function () {