From 7c490098548522c16be1b1e84bce37f5bf87f1f4 Mon Sep 17 00:00:00 2001 From: Dan Date: Sat, 5 May 2018 11:11:53 -0400 Subject: Unit tests for containers, utils and selectors in send_/ --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 88f73a609..c44d4d423 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dist": "gulp dist", "doc": "jsdoc -c development/tools/.jsdoc.json", "test": "npm run test:unit && npm run test:integration && npm run lint", - "test:unit": "cross-env METAMASK_ENV=test mocha --exit --require test/setup.js --recursive \"test/unit/**/*.js\"", + "test:unit": "cross-env METAMASK_ENV=test mocha --exit --require test/setup.js --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"", "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", @@ -258,6 +258,7 @@ "open": "0.0.5", "png-file-stream": "^1.0.0", "prompt": "^1.0.0", + "proxyquire": "2.0.1", "qs": "^6.2.0", "qunitjs": "^2.4.1", "radgrad-jsdoc-template": "^1.1.3", -- cgit From 6bc8cc819a16118acc010d0efdec90afbda14590 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 14 May 2018 11:00:50 -0230 Subject: Merge branch 'develop' into i3725-refactor-send-component- --- package.json | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index c44d4d423..0e072088d 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 --recursive", + "test:e2e:run:firefox": "SELENIUM_BROWSER=firefox mocha test/e2e/firefox/metamask.spec --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": [ @@ -76,10 +79,11 @@ "classnames": "^2.2.5", "clone": "^2.1.1", "copy-to-clipboard": "^3.0.8", + "css-loader": "^0.28.11", "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", @@ -87,10 +91,9 @@ "ensnare": "^1.0.0", "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", - "eth-block-tracker": "^2.3.0", "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.2.1", - "eth-json-rpc-filters": "^1.2.5", + "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", "eth-keyring-controller": "^2.2.0", "eth-phishing-detect": "^1.1.4", @@ -111,6 +114,7 @@ "extensionizer": "^1.0.0", "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", + "file-loader": "^1.1.11", "fuse.js": "^3.2.0", "gulp": "github:gulpjs/gulp#4.0", "gulp-autoprefixer": "^5.0.0", @@ -132,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", @@ -185,12 +190,15 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.8.0", + "web3-provider-engine": "^14.0.5", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, "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", @@ -204,10 +212,11 @@ "brfs": "^1.4.3", "browserify": "^16.1.1", "chai": "^4.1.0", - "chromedriver": "^2.34.1", + "chromedriver": "2.36.0", "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", @@ -217,9 +226,12 @@ "eslint-plugin-json": "^1.2.0", "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", - "eth-json-rpc-middleware": "^1.2.7", + "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", @@ -254,8 +266,10 @@ "mocha-sinon": "^2.0.0", "nock": "^9.0.14", "node-sass": "^4.7.2", + "nsp": "^3.2.1", "nyc": "^11.0.3", "open": "0.0.5", + "path": "^0.12.7", "png-file-stream": "^1.0.0", "prompt": "^1.0.0", "proxyquire": "2.0.1", @@ -266,14 +280,17 @@ "react-test-renderer": "^15.6.2", "react-testutils-additions": "^15.2.0", "redux-test-utils": "^0.2.2", + "resolve-url-loader": "^2.3.0", "rimraf": "^2.6.2", + "sass-loader": "^7.0.1", "selenium-webdriver": "^3.5.0", "shell-parallel": "^1.0.3", "sinon": "^5.0.0", + "source-map": "^0.7.2", + "style-loader": "^0.21.0", "stylelint-config-standard": "^18.2.0", "tape": "^4.5.1", "testem": "^2.0.0", - "uglifyify": "^4.0.5", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", "watchify": "^3.9.0" -- cgit From 759bc173887dbb301fd17739ce431e8dfd096adc Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 15 May 2018 11:18:33 -0230 Subject: Merge branch 'develop' into i3725-refactor-send-component- --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 0e072088d..c5ded9760 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "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: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 --recursive", - "test:e2e:run:firefox": "SELENIUM_BROWSER=firefox mocha test/e2e/firefox/metamask.spec --recursive", + "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", -- cgit From 9c77af1ce6df5151bbf4b89288791057e83e215c Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 12 Jun 2018 11:13:44 -0700 Subject: Add script for auto-re-running tests on change `npm run watch:test:unit` will re-run the unit test suite whenever a file in `app`, `ui`, or `test` changes. --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index c08ae455b..d9e0bbec5 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "dist": "gulp dist", "doc": "jsdoc -c development/tools/.jsdoc.json", "test": "npm run test:unit && npm run test:integration && npm run lint", + "watch:test:unit": "nodemon --exec \"npm run test:unit\" ./test ./app ./ui", "test:unit": "cross-env METAMASK_ENV=test mocha --exit --require test/setup.js --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\" && dot-only-hunter", "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", -- cgit From ac8b56a00defff4cb44a6a34251a19d8ab6159b6 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 13 Jun 2018 22:56:46 -0700 Subject: notices - notices collection is now manually edited --- package.json | 2 -- 1 file changed, 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index d9e0bbec5..658b9147d 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,6 @@ "disc": "gulp disc --debug", "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", "storybook": "start-storybook -p 6006 -c .storybook" }, "browserify": { -- cgit From c343a1254383dbc55c557f1facedbdfe0784e3e4 Mon Sep 17 00:00:00 2001 From: Dan Date: Fri, 22 Jun 2018 09:43:01 -0230 Subject: Use locally served dapp to test contract calls in e2e beta tests --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 658b9147d..afdfbbd88 100644 --- a/package.json +++ b/package.json @@ -251,6 +251,7 @@ "gulp-util": "^3.0.7", "gulp-watch": "^5.0.0", "gulp-zip": "^4.0.0", + "http-server": "^0.11.1", "image-size": "^0.6.2", "isomorphic-fetch": "^2.2.1", "jsdoc": "^3.5.5", -- cgit From f824a2982acec08241302b84d893e32e5c5f2dce Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 28 Jun 2018 10:16:36 -0230 Subject: Use supersonic instead of httpserver to serve local dapp (e2e beta tests) --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index afdfbbd88..10a9f3a75 100644 --- a/package.json +++ b/package.json @@ -183,6 +183,7 @@ "semaphore": "^1.0.5", "semver": "^5.4.1", "shallow-copy": "0.0.1", + "superstatic": "^5.0.2", "sw-controller": "^1.0.3", "sw-stream": "^2.0.2", "textarea-caret": "^3.0.1", -- cgit From 4c86f25f5bc4fa18847ca1b77e005afc3f37eddc Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Mon, 2 Jul 2018 07:30:56 -1000 Subject: npm 6 fresh lock + node 8 (#4675) * run npm install with npm 6 and node 8 * npm audit fix --force * bump node version on circleci docker img * bump lodash --- package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 10a9f3a75..b18686e2d 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,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", @@ -209,7 +209,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", @@ -233,9 +233,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", @@ -259,7 +259,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", @@ -270,9 +270,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", @@ -295,11 +295,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" -- cgit From 4b45dd4ed06d8a41bcbb365d9d536240d9160f63 Mon Sep 17 00:00:00 2001 From: Esteban MIno Date: Mon, 2 Jul 2018 18:29:22 -0400 Subject: point eth-contract-metadata to repo master --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index b18686e2d..0094f7949 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "ensnare": "^1.0.0", "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", - "eth-contract-metadata": "^1.1.5", + "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", -- cgit From cc11a623972acf707291d7b42d9dc2f8d7006e20 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 2 Jul 2018 18:35:53 -0400 Subject: remove gulp eslint and cleanup gulpfile --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index b18686e2d..2a3ecfd06 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,8 @@ "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js", "ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'", "sentry:publish": "node ./development/sentry-publish.js", - "lint": "gulp lint", - "lint:fix": "gulp lint:fix", + "lint": "eslint .", + "lint:fix": "eslint . --fix", "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", @@ -239,7 +239,6 @@ "gifencoder": "^1.1.0", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp-babel": "^7.0.0", - "gulp-eslint": "^4.0.0", "gulp-json-editor": "^2.2.1", "gulp-livereload": "^3.8.1", "gulp-multi-process": "^1.3.1", -- cgit