From 961d254396639ab7c4ae86f2f45bfb130966a057 Mon Sep 17 00:00:00 2001 From: dennistikhomirov Date: Wed, 31 Oct 2018 10:20:56 -0700 Subject: [PATCH 1/4] e2e:autodetect token in MAINNET --- test/e2e/metamask.spec.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/metamask.spec.js b/test/e2e/metamask.spec.js index c47ae05cb..bff51f5c6 100644 --- a/test/e2e/metamask.spec.js +++ b/test/e2e/metamask.spec.js @@ -270,8 +270,10 @@ describe('Metamask popup page', async function () { assert.equal(await balance.getText(), '1 DOPR', 'token isnt\' auto-detected') }) - it.skip('Auto-detect tokens for MAIN core network ', async function () { + it('Auto-detect tokens for MAIN core network ', async function () { await setProvider(NETWORKS.MAINNET) + await waitUntilShowUp(elements.loader) + await waitUntilDisappear(elements.loader, 25) const balance = await waitUntilShowUp(screens.main.tokens.balance) console.log(await balance.getText()) assert.equal(await balance.getText(), '0.001 WETH', 'token isnt\' auto-detected') From 655fd5f455356813ff2b35771fbc3724e974197a Mon Sep 17 00:00:00 2001 From: dennistikhomirov Date: Wed, 31 Oct 2018 10:41:53 -0700 Subject: [PATCH 2/4] e2e:improve stability --- test/e2e/metamask.spec.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/e2e/metamask.spec.js b/test/e2e/metamask.spec.js index bff51f5c6..de1346250 100644 --- a/test/e2e/metamask.spec.js +++ b/test/e2e/metamask.spec.js @@ -1402,7 +1402,6 @@ describe('Metamask popup page', async function () { }) it('token should not be displayed in LOCALHOST network', async function () { - console.log('https://github.com/poanetwork/metamask-extension/issues/131') await setProvider(NETWORKS.LOCALHOST) assert.equal(await assertTokensNotDisplayed(), true, 'tokens are displayed') }) @@ -1425,12 +1424,15 @@ describe('Metamask popup page', async function () { describe('remove Mainnet\'s tokens', function () { it('remove tokens', async function () { - await setProvider(NETWORKS.MAINNET) + let menu let button let counter let buttonYes + await setProvider(NETWORKS.MAINNET) + await waitUntilShowUp(elements.loader,25) + await waitUntilDisappear(elements.loader, 25) menu = await waitUntilShowUp(menus.token.menu) await menu.click() button = await waitUntilShowUp(menus.token.remove) From 7a1b6f65f78805a0e3a1743de7a7554b96bbc6bd Mon Sep 17 00:00:00 2001 From: dennistikhomirov Date: Wed, 31 Oct 2018 10:54:04 -0700 Subject: [PATCH 3/4] e2e:lint fix --- test/e2e/metamask.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/metamask.spec.js b/test/e2e/metamask.spec.js index de1346250..bd7ffbd7f 100644 --- a/test/e2e/metamask.spec.js +++ b/test/e2e/metamask.spec.js @@ -1431,7 +1431,7 @@ describe('Metamask popup page', async function () { let buttonYes await setProvider(NETWORKS.MAINNET) - await waitUntilShowUp(elements.loader,25) + await waitUntilShowUp(elements.loader, 25) await waitUntilDisappear(elements.loader, 25) menu = await waitUntilShowUp(menus.token.menu) await menu.click() From 8ac8549d0c493792b3a200fb5fc2abc34795aba8 Mon Sep 17 00:00:00 2001 From: dennistikhomirov Date: Wed, 31 Oct 2018 11:14:02 -0700 Subject: [PATCH 4/4] e2e: improve stability#2 --- test/e2e/metamask.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/metamask.spec.js b/test/e2e/metamask.spec.js index bd7ffbd7f..9273990f4 100644 --- a/test/e2e/metamask.spec.js +++ b/test/e2e/metamask.spec.js @@ -272,7 +272,7 @@ describe('Metamask popup page', async function () { it('Auto-detect tokens for MAIN core network ', async function () { await setProvider(NETWORKS.MAINNET) - await waitUntilShowUp(elements.loader) + await waitUntilShowUp(elements.loader, 25) await waitUntilDisappear(elements.loader, 25) const balance = await waitUntilShowUp(screens.main.tokens.balance) console.log(await balance.getText()) @@ -1432,7 +1432,7 @@ describe('Metamask popup page', async function () { await setProvider(NETWORKS.MAINNET) await waitUntilShowUp(elements.loader, 25) - await waitUntilDisappear(elements.loader, 25) + await waitUntilDisappear(elements.loader, 50) menu = await waitUntilShowUp(menus.token.menu) await menu.click() button = await waitUntilShowUp(menus.token.remove)