aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-05-29 09:25:51 +0800
committerkumavis <aaron@kumavis.me>2018-05-29 09:25:51 +0800
commite2a9b9e2aed514d935c48cfbdbc274771b4ee671 (patch)
treee2b4fe33125244a0c8064325326f0bda53228084 /package.json
parent31f47a7a426fc623a9b760127f802983b497ff77 (diff)
parent12492aae60b96bc439d8a7e0272b1a41924cbf1e (diff)
downloadtangerine-wallet-browser-e2a9b9e2aed514d935c48cfbdbc274771b4ee671.tar
tangerine-wallet-browser-e2a9b9e2aed514d935c48cfbdbc274771b4ee671.tar.gz
tangerine-wallet-browser-e2a9b9e2aed514d935c48cfbdbc274771b4ee671.tar.bz2
tangerine-wallet-browser-e2a9b9e2aed514d935c48cfbdbc274771b4ee671.tar.lz
tangerine-wallet-browser-e2a9b9e2aed514d935c48cfbdbc274771b4ee671.tar.xz
tangerine-wallet-browser-e2a9b9e2aed514d935c48cfbdbc274771b4ee671.tar.zst
tangerine-wallet-browser-e2a9b9e2aed514d935c48cfbdbc274771b4ee671.zip
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
Diffstat (limited to 'package.json')
-rw-r--r--package.json4
1 files changed, 3 insertions, 1 deletions
diff --git a/package.json b/package.json
index 1c4d64cc9..91bf60014 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,9 @@
"test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara",
"test:integration:build": "gulp build:scss",
"test:e2e:chrome": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:chrome'",
+ "test:e2e:chrome:beta": "SELENIUM_BROWSER=chrome test/e2e/beta/run-all.sh",
"test:e2e:firefox": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:firefox'",
+ "test:e2e:firefox:beta": "SELENIUM_BROWSER=firefox test/e2e/beta/run-all.sh",
"test:e2e:run:chrome": "SELENIUM_BROWSER=chrome mocha test/e2e/metamask.spec --bail --recursive",
"test:e2e:run:firefox": "SELENIUM_BROWSER=firefox mocha test/e2e/metamask.spec --bail --recursive",
"test:screens": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:screens:run'",
@@ -108,7 +110,7 @@
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
"ethereumjs-wallet": "^0.6.0",
"etherscan-link": "^1.0.2",
- "ethjs": "^0.3.4",
+ "ethjs": "^0.4.0",
"ethjs-contract": "^0.2.0",
"ethjs-ens": "^2.0.0",
"ethjs-query": "^0.3.4",