aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package.json7
-rw-r--r--test/e2e/func.js1
-rw-r--r--test/e2e/metamask.spec.js2
3 files changed, 6 insertions, 4 deletions
diff --git a/package.json b/package.json
index 29fc4aa5a..c811c6bec 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"mascara": "METAMASK_DEBUG=true node ./mascara/example/server",
"dist": "npm run dist:clear && npm install && gulp dist",
"dist:clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect",
- "test": "npm run lint && npm run test:coverage && npm run test:integration",
+ "test": "npm run lint && npm run test:coverage && npm run test:e2e",
"test:unit": "METAMASK_ENV=test mocha --exit --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
"test:single": "METAMASK_ENV=test mocha --require test/helper.js",
"test:integration": "npm run test:flat && npm run test:mascara",
@@ -169,6 +169,7 @@
"brfs": "^1.4.3",
"browserify": "^14.4.0",
"chai": "^4.1.0",
+ "chromedriver": "^2.34.1",
"coveralls": "^3.0.0",
"deep-freeze-strict": "^1.1.1",
"del": "^3.0.0",
@@ -179,6 +180,7 @@
"eth-json-rpc-middleware": "^1.2.7",
"fs-promise": "^2.0.3",
"gulp": "github:gulpjs/gulp#4.0",
+ "gulp-eslint": "^4.0.0",
"gulp-if": "^2.0.1",
"gulp-json-editor": "^2.2.1",
"gulp-livereload": "^3.8.1",
@@ -187,7 +189,6 @@
"gulp-util": "^3.0.7",
"gulp-watch": "^4.3.5",
"gulp-zip": "^4.0.0",
- "gulp-eslint": "^4.0.0",
"isomorphic-fetch": "^2.2.1",
"jsdom": "^11.2.0",
"jsdom-global": "^3.0.2",
@@ -211,8 +212,8 @@
"react-addons-test-utils": "^15.5.1",
"react-test-renderer": "^15.6.2",
"react-testutils-additions": "^15.2.0",
- "sinon": "^4.0.0",
"selenium-webdriver": "^3.5.0",
+ "sinon": "^4.0.0",
"tape": "^4.5.1",
"testem": "^1.10.3",
"uglifyify": "^4.0.2",
diff --git a/test/e2e/func.js b/test/e2e/func.js
index 50363ade3..733225565 100644
--- a/test/e2e/func.js
+++ b/test/e2e/func.js
@@ -1,3 +1,4 @@
+require('chromedriver')
const webdriver = require('selenium-webdriver')
exports.delay = function delay (time) {
diff --git a/test/e2e/metamask.spec.js b/test/e2e/metamask.spec.js
index fc748fe18..cf4cd0b52 100644
--- a/test/e2e/metamask.spec.js
+++ b/test/e2e/metamask.spec.js
@@ -15,7 +15,7 @@ describe('Metamask popup page', function () {
driver = buildWebDriver(extPath)
await driver.get('chrome://extensions-frame')
const elems = await driver.findElements(By.xpath(
- '//*[@id="jepnlelaaflcpibhckpebdcijgfdfleo"]'
+ '//*[@id="fmmjaglpijbgopejlfapbkhhbnaagbpj"]'
))
const extensionId = await elems[0].getAttribute('id')
await driver.get(`chrome-extension://${extensionId}/popup.html`)