diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-03 03:29:26 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-03 03:29:26 +0800 |
| commit | 9b0bc67066d76aca886377ac34c83e6de1c56ccd (patch) | |
| tree | 707f28e5d3976452afde09017e602eb1053789d2 /test | |
| parent | f19ffaf08d49f33c395a25faf3eeb6b08d5285a4 (diff) | |
| parent | 4c86f25f5bc4fa18847ca1b77e005afc3f37eddc (diff) | |
| download | tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.gz tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.bz2 tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.lz tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.xz tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.zst tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.zip | |
fix merge conflicts
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/beta/metamask-beta-ui.spec.js | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js index 387d8c348..0f424abcc 100644 --- a/test/e2e/beta/metamask-beta-ui.spec.js +++ b/test/e2e/beta/metamask-beta-ui.spec.js @@ -100,15 +100,21 @@ describe('MetaMask', function () { await delay(regularDelayMs) // Close all other tabs - let [oldUi, infoPage, newUi] = await driver.getAllWindowHandles() - newUi = newUi || infoPage + let [oldUi, tab1, tab2] = await driver.getAllWindowHandles() await driver.switchTo().window(oldUi) await driver.close() - if (infoPage !== newUi) { - await driver.switchTo().window(infoPage) + + await driver.switchTo().window(tab1) + const tab1Url = await driver.getCurrentUrl() + if (tab1Url.match(/metamask.io/)) { + await driver.switchTo().window(tab1) + await driver.close() + await driver.switchTo().window(tab2) + } else if (tab2) { + await driver.switchTo().window(tab2) await driver.close() + await driver.switchTo().window(tab1) } - await driver.switchTo().window(newUi) await delay(regularDelayMs) const continueBtn = await findElement(driver, By.css('.welcome-screen__button')) |