diff options
| author | Thomas <thomas.b.huang@gmail.com> | 2018-05-17 13:47:07 +0800 |
|---|---|---|
| committer | Thomas <thomas.b.huang@gmail.com> | 2018-05-17 13:47:07 +0800 |
| commit | 5e80bc4cb93277c8b3952345a6cb4cc055248b94 (patch) | |
| tree | a173db7caddd63a055dcf3eff4c8b66ba954eb27 /package.json | |
| parent | d9be7f989a86e3fdfd83e4c632fd08cefd8309e5 (diff) | |
| parent | 6e79225dbff512ab9bcae2731bcfc4ce33e98664 (diff) | |
| download | tangerine-wallet-browser-5e80bc4cb93277c8b3952345a6cb4cc055248b94.tar tangerine-wallet-browser-5e80bc4cb93277c8b3952345a6cb4cc055248b94.tar.gz tangerine-wallet-browser-5e80bc4cb93277c8b3952345a6cb4cc055248b94.tar.bz2 tangerine-wallet-browser-5e80bc4cb93277c8b3952345a6cb4cc055248b94.tar.lz tangerine-wallet-browser-5e80bc4cb93277c8b3952345a6cb4cc055248b94.tar.xz tangerine-wallet-browser-5e80bc4cb93277c8b3952345a6cb4cc055248b94.tar.zst tangerine-wallet-browser-5e80bc4cb93277c8b3952345a6cb4cc055248b94.zip | |
Merge branch 'develop' into testing
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/package.json b/package.json index 315008330..771b0237e 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,10 @@ "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js", "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara", "test:integration:build": "gulp build:scss", - "test:e2e": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run'", - "test:e2e:run": "mocha test/e2e/metamask.spec --recursive", + "test:e2e:chrome": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:chrome'", + "test:e2e:firefox": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:firefox'", + "test:e2e:run:chrome": "SELENIUM_BROWSER=chrome mocha test/e2e/chrome/metamask.spec --bail --recursive", + "test:e2e:run:firefox": "SELENIUM_BROWSER=firefox mocha test/e2e/firefox/metamask.spec --bail --recursive", "test:screens": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:screens:run'", "test:screens:run": "node test/screens/new-ui.js", "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload", @@ -42,7 +44,8 @@ "announce": "node development/announcer.js", "version:bump": "node development/run-version-bump.js", "generateNotice": "node notices/notice-generator.js", - "deleteNotice": "node notices/notice-delete.js" + "deleteNotice": "node notices/notice-delete.js", + "storybook": "start-storybook -p 6006 -c .storybook" }, "browserify": { "transform": [ @@ -80,7 +83,7 @@ "currency-formatter": "^1.4.2", "debounce": "^1.0.0", "debounce-stream": "^2.0.0", - "deep-extend": "^0.5.0", + "deep-extend": "^0.5.1", "detect-node": "^2.0.3", "disc": "^1.3.2", "dnode": "^1.2.2", @@ -133,6 +136,7 @@ "lodash.shuffle": "^4.2.0", "lodash.uniqby": "^4.7.0", "loglevel": "^1.4.1", + "material-ui": "1.0.0-beta.44", "metamascara": "^2.0.0", "metamask-logo": "^2.1.4", "mkdirp": "^0.5.1", @@ -191,6 +195,9 @@ }, "devDependencies": { "@sentry/cli": "^1.30.3", + "@storybook/addon-info": "^3.4.2", + "@storybook/addon-knobs": "^3.4.2", + "@storybook/react": "^3.4.2", "babel-core": "^6.24.1", "babel-eslint": "^8.0.0", "babel-plugin-transform-async-to-generator": "^6.24.1", @@ -208,6 +215,7 @@ "compression": "^1.7.1", "coveralls": "^3.0.0", "cross-env": "^5.1.4", + "css-loader": "^0.28.11", "deep-freeze-strict": "^1.1.1", "del": "^3.0.0", "envify": "^4.0.0", @@ -218,9 +226,11 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", + "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", "ganache-core": "^2.1.0", + "geckodriver": "^1.11.0", "gifencoder": "^1.1.0", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp-babel": "^7.0.0", |