diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-08-22 03:58:29 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-08-22 03:58:29 +0800 |
commit | 90886c5e05469d2b8935ac9b744cf296107a2406 (patch) | |
tree | a4c03964d6607411b5b7bbff4e3f336959dd7134 /test/e2e | |
parent | 0e1605b0829373d087d87c7be83046125ecd9e1f (diff) | |
parent | 4704f3598e3a570b536b3d334d72fcc06d2d15c0 (diff) | |
download | tangerine-wallet-browser-90886c5e05469d2b8935ac9b744cf296107a2406.tar tangerine-wallet-browser-90886c5e05469d2b8935ac9b744cf296107a2406.tar.gz tangerine-wallet-browser-90886c5e05469d2b8935ac9b744cf296107a2406.tar.bz2 tangerine-wallet-browser-90886c5e05469d2b8935ac9b744cf296107a2406.tar.lz tangerine-wallet-browser-90886c5e05469d2b8935ac9b744cf296107a2406.tar.xz tangerine-wallet-browser-90886c5e05469d2b8935ac9b744cf296107a2406.tar.zst tangerine-wallet-browser-90886c5e05469d2b8935ac9b744cf296107a2406.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5
Diffstat (limited to 'test/e2e')
-rw-r--r-- | test/e2e/beta/metamask-beta-ui.spec.js | 13 | ||||
-rwxr-xr-x | test/e2e/beta/run-all.sh | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js index aab1dc87e..dd327accb 100644 --- a/test/e2e/beta/metamask-beta-ui.spec.js +++ b/test/e2e/beta/metamask-beta-ui.spec.js @@ -460,8 +460,6 @@ describe('MetaMask', function () { const transactions = await findElements(driver, By.css('.tx-list-item')) assert.equal(transactions.length, 2) - await findElement(driver, By.xpath(`//span[contains(text(), 'Submitted')]`)) - const txStatuses = await findElements(driver, By.css('.tx-list-status')) await driver.wait(until.elementTextMatches(txStatuses[0], /Confirmed/)) @@ -515,8 +513,6 @@ describe('MetaMask', function () { await confirmButton.click() await delay(regularDelayMs) - await findElement(driver, By.xpath(`//span[contains(text(), 'Submitted')]`)) - const txStatuses = await findElements(driver, By.css('.tx-list-status')) await driver.wait(until.elementTextMatches(txStatuses[0], /Confirmed/)) @@ -525,15 +521,6 @@ describe('MetaMask', function () { await delay(regularDelayMs) }) - it('confirms a deploy contract transaction in the popup', async () => { - const windowHandles = await driver.getAllWindowHandles() - const popup = windowHandles[2] - await driver.switchTo().window(popup) - const confirmButton = await findElement(driver, By.xpath(`//button[contains(text(), 'Confirm')]`)) - await confirmButton.click() - await delay(regularDelayMs) - }) - it('calls and confirms a contract method where ETH is sent', async () => { await driver.switchTo().window(dapp) await delay(regularDelayMs) diff --git a/test/e2e/beta/run-all.sh b/test/e2e/beta/run-all.sh index 7da61e504..cde46a2d3 100755 --- a/test/e2e/beta/run-all.sh +++ b/test/e2e/beta/run-all.sh @@ -6,5 +6,5 @@ set -o pipefail export PATH="$PATH:./node_modules/.bin" -shell-parallel -s 'npm run ganache:start' -x 'sleep 5 && static-server test/e2e/beta/contract-test/ --port 8080' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-ui.spec' -shell-parallel -s 'npm run ganache:start -- -d' -x 'sleep 5 && static-server test/e2e/beta/contract-test/ --port 8080' -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec' +shell-parallel -s 'npm run ganache:start -- -b 2' -x 'sleep 5 && static-server test/e2e/beta/contract-test/ --port 8080' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-ui.spec' +shell-parallel -s 'npm run ganache:start -- -d -b 2' -x 'sleep 5 && static-server test/e2e/beta/contract-test/ --port 8080' -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec' |