m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

fix merge conflicts

Browse Source
This commit is contained in:
brunobar79 2018-07-02 15:29:26 -04:00
commit 9b0bc67066
5 changed files with 2802 additions and 3675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.circleci/config.yml
View File

@ -97,7 +97,7 @@ workflows:
jobs: jobs:
prep-deps-npm: prep-deps-npm:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -116,7 +116,7 @@ jobs:
prep-deps-firefox: prep-deps-firefox:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- run: - run:
@ -129,7 +129,7 @@ jobs:
prep-build: prep-build:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -148,7 +148,7 @@ jobs:
prep-docs: prep-docs:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -163,7 +163,7 @@ jobs:
prep-scss: prep-scss:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -182,7 +182,7 @@ jobs:
test-lint: test-lint:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -193,7 +193,7 @@ jobs:
test-deps: test-deps:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -204,7 +204,7 @@ jobs:
test-e2e-chrome: test-e2e-chrome:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -220,7 +220,7 @@ jobs:
test-e2e-firefox: test-e2e-firefox:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -241,7 +241,7 @@ jobs:
test-e2e-beta-chrome: test-e2e-beta-chrome:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -257,7 +257,7 @@ jobs:
test-e2e-beta-firefox: test-e2e-beta-firefox:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -278,7 +278,7 @@ jobs:
job-screens: job-screens:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -295,7 +295,7 @@ jobs:
job-publish-prerelease: job-publish-prerelease:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -322,7 +322,7 @@ jobs:
job-publish-release: job-publish-release:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -345,7 +345,7 @@ jobs:
test-unit: test-unit:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -358,7 +358,7 @@ jobs:
environment: environment:
browsers: '["Firefox"]' browsers: '["Firefox"]'
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -382,7 +382,7 @@ jobs:
environment: environment:
browsers: '["Chrome"]' browsers: '["Chrome"]'
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -401,7 +401,7 @@ jobs:
environment: environment:
browsers: '["Firefox"]' browsers: '["Firefox"]'
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -425,7 +425,7 @@ jobs:
environment: environment:
browsers: '["Chrome"]' browsers: '["Chrome"]'
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -442,7 +442,7 @@ jobs:
all-tests-pass: all-tests-pass:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- run: - run:
name: All Tests Passed name: All Tests Passed

2
.nvmrc
View File

@ -1 +1 @@
v6.3.1 v8.11.3

6401
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

18
package.json
View File

@ -108,7 +108,7 @@
"ethereumjs-wallet": "^0.6.0", "ethereumjs-wallet": "^0.6.0",
"etherscan-link": "^1.0.2", "etherscan-link": "^1.0.2",
"ethjs": "^0.4.0", "ethjs": "^0.4.0",
"ethjs-contract": "^0.2.0", "ethjs-contract": "^0.2.3",
"ethjs-ens": "^2.0.0", "ethjs-ens": "^2.0.0",
"ethjs-query": "^0.3.4", "ethjs-query": "^0.3.4",
"express": "^4.15.5", "express": "^4.15.5",
@ -210,7 +210,7 @@
"babel-register": "^6.7.2", "babel-register": "^6.7.2",
"babelify": "^8.0.0", "babelify": "^8.0.0",
"beefy": "^2.1.5", "beefy": "^2.1.5",
"brfs": "^1.4.3", "brfs": "^1.6.1",
"browserify": "^16.1.1", "browserify": "^16.1.1",
"chai": "^4.1.0", "chai": "^4.1.0",
"chromedriver": "2.36.0", "chromedriver": "2.36.0",
@ -234,9 +234,9 @@
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
"fs-promise": "^2.0.3", "fs-promise": "^2.0.3",
"ganache-cli": "^6.1.0", "ganache-cli": "^6.1.0",
"ganache-core": "^2.1.0", "ganache-core": "^2.1.3",
"geckodriver": "^1.11.0", "geckodriver": "^1.11.0",
"gh-pages": "^1.1.0", "gh-pages": "^1.2.0",
"gifencoder": "^1.1.0", "gifencoder": "^1.1.0",
"gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
"gulp-babel": "^7.0.0", "gulp-babel": "^7.0.0",
@ -260,7 +260,7 @@
"jsdom": "^11.2.0", "jsdom": "^11.2.0",
"jsdom-global": "^3.0.2", "jsdom-global": "^3.0.2",
"jshint-stylish": "~2.2.1", "jshint-stylish": "~2.2.1",
"karma": "^2.0.0", "karma": "^2.0.4",
"karma-chrome-launcher": "^2.2.0", "karma-chrome-launcher": "^2.2.0",
"karma-cli": "^1.0.1", "karma-cli": "^1.0.1",
"karma-firefox-launcher": "^1.0.1", "karma-firefox-launcher": "^1.0.1",
@ -271,9 +271,9 @@
"mocha-jsdom": "^1.1.0", "mocha-jsdom": "^1.1.0",
"mocha-sinon": "^2.0.0", "mocha-sinon": "^2.0.0",
"nock": "^9.0.14", "nock": "^9.0.14",
"node-sass": "^4.7.2", "node-sass": "^4.9.0",
"nsp": "^3.2.1", "nsp": "^3.2.1",
"nyc": "^11.0.3", "nyc": "^13.0.0",
"open": "0.0.5", "open": "0.0.5",
"path": "^0.12.7", "path": "^0.12.7",
"png-file-stream": "^1.0.0", "png-file-stream": "^1.0.0",
@ -296,11 +296,11 @@
"style-loader": "^0.21.0", "style-loader": "^0.21.0",
"stylelint-config-standard": "^18.2.0", "stylelint-config-standard": "^18.2.0",
"tape": "^4.5.1", "tape": "^4.5.1",
"testem": "^2.0.0", "testem": "^2.8.0",
"through2": "^2.0.3", "through2": "^2.0.3",
"vinyl-buffer": "^1.0.1", "vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0", "vinyl-source-stream": "^2.0.0",
"watchify": "^3.9.0" "watchify": "^3.11.0"
}, },
"engines": { "engines": {
"node": ">=8.0.0" "node": ">=8.0.0"

16
test/e2e/beta/metamask-beta-ui.spec.js
View File

@ -100,15 +100,21 @@ describe('MetaMask', function () {
await delay(regularDelayMs) await delay(regularDelayMs)
// Close all other tabs // Close all other tabs
let [oldUi, infoPage, newUi] = await driver.getAllWindowHandles() let [oldUi, tab1, tab2] = await driver.getAllWindowHandles()
newUi = newUi || infoPage
await driver.switchTo().window(oldUi) await driver.switchTo().window(oldUi)
await driver.close() await driver.close()
if (infoPage !== newUi) {
await driver.switchTo().window(infoPage) await driver.switchTo().window(tab1)
const tab1Url = await driver.getCurrentUrl()
if (tab1Url.match(/metamask.io/)) {
await driver.switchTo().window(tab1)
await driver.close() await driver.close()
await driver.switchTo().window(tab2)
} else if (tab2) {
await driver.switchTo().window(tab2)
await driver.close()
await driver.switchTo().window(tab1)
} }
await driver.switchTo().window(newUi)
await delay(regularDelayMs) await delay(regularDelayMs)
const continueBtn = await findElement(driver, By.css('.welcome-screen__button')) const continueBtn = await findElement(driver, By.css('.welcome-screen__button'))