aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2018-08-22 01:56:23 +0800
committerGitHub <noreply@github.com>2018-08-22 01:56:23 +0800
commit4704f3598e3a570b536b3d334d72fcc06d2d15c0 (patch)
tree18332f6f37964aff2f61f2d11215819516ad73f9 /test
parent282820c93a00176dc3b0e5c3b9c06256a10a443e (diff)
parent9bd0ce46e8e5c6535a59b7f9f3e9c89ff2a33dbc (diff)
downloadtangerine-wallet-browser-4704f3598e3a570b536b3d334d72fcc06d2d15c0.tar
tangerine-wallet-browser-4704f3598e3a570b536b3d334d72fcc06d2d15c0.tar.gz
tangerine-wallet-browser-4704f3598e3a570b536b3d334d72fcc06d2d15c0.tar.bz2
tangerine-wallet-browser-4704f3598e3a570b536b3d334d72fcc06d2d15c0.tar.lz
tangerine-wallet-browser-4704f3598e3a570b536b3d334d72fcc06d2d15c0.tar.xz
tangerine-wallet-browser-4704f3598e3a570b536b3d334d72fcc06d2d15c0.tar.zst
tangerine-wallet-browser-4704f3598e3a570b536b3d334d72fcc06d2d15c0.zip
Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flag
Fix e2e tests: adapt ganache flags and remove unnecessary checks
Diffstat (limited to 'test')
-rw-r--r--test/e2e/beta/metamask-beta-ui.spec.js13
-rwxr-xr-xtest/e2e/beta/run-all.sh4
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'