aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorEsteban MIno <efmino@uc.cl>2018-08-22 07:14:49 +0800
committerEsteban MIno <efmino@uc.cl>2018-08-22 07:14:49 +0800
commit4e6c71e969d9d681eb50d87502d765aa28959339 (patch)
treed00ac67ea84c6ece34eddea0ed257c007cdeb98a /test
parent6ccf2811e75924d7e92793df7e4ec915770cf6b4 (diff)
parentbabd59a2dc64e15ef2a415e349ef12d5b995e2e7 (diff)
downloadtangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.gz
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.bz2
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.lz
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.xz
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.zst
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.zip
Merge branch 'develop' into WatchTokenFeature
Diffstat (limited to 'test')
-rw-r--r--test/e2e/beta/metamask-beta-ui.spec.js13
-rwxr-xr-xtest/e2e/beta/run-all.sh4
-rw-r--r--test/unit/app/controllers/metamask-controller-test.js2
3 files changed, 3 insertions, 16 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'
diff --git a/test/unit/app/controllers/metamask-controller-test.js b/test/unit/app/controllers/metamask-controller-test.js
index 1fc604c9c..a798d41e2 100644
--- a/test/unit/app/controllers/metamask-controller-test.js
+++ b/test/unit/app/controllers/metamask-controller-test.js
@@ -573,7 +573,7 @@ describe('MetaMaskController', function () {
assert(metamaskController.preferencesController.removeAddress.calledWith(addressToRemove))
})
it('should call accountTracker.removeAccount', async function () {
- assert(metamaskController.accountTracker.removeAccount.calledWith(addressToRemove))
+ assert(metamaskController.accountTracker.removeAccount.calledWith([addressToRemove]))
})
it('should call keyringController.removeAccount', async function () {
assert(metamaskController.keyringController.removeAccount.calledWith(addressToRemove))