TheDude
/
ciphermask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
feature/default_network_editable
brunobar79 6 years ago
parent f19ffaf08d 4c86f25f5b
commit 9b0bc67066
5 changed files with 14903 additions and 15776 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 40
      .circleci/config.yml
  2. 2
      .nvmrc
  3. 30603
      package-lock.json
  4. 18
      package.json
  5. 16
      test/e2e/beta/metamask-beta-ui.spec.js

40
.circleci/config.yml
Unescape View File

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

2
.nvmrc
Unescape View File

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

30603
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

18
package.json
Unescape View File

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

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

@ -100,15 +100,21 @@ describe('MetaMask', function () {
await delay(regularDelayMs)
// Close all other tabs
let [oldUi, infoPage, newUi] = await driver.getAllWindowHandles()
newUi = newUi || infoPage
let [oldUi, tab1, tab2] = await driver.getAllWindowHandles()
await driver.switchTo().window(oldUi)
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.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)
const continueBtn = await findElement(driver, By.css('.welcome-screen__button'))

Write Preview
Loading…
Cancel
Save