From b1a0c0aa212d0f0b233a7058118bd3a1e892e53a Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 13 Apr 2016 17:20:58 -0700 Subject: [PATCH 1/8] Add rudimentary travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..5f1e0c213 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: node_js +node_js: + - "5.1" + - "4.2" +before_script: + - npm install -g mocha From 29f1957b86b3528d6fb07f9f7159be79e81b134a Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 14 Apr 2016 14:34:52 -0700 Subject: [PATCH 2/8] Bump ethereumjs-utils version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e871d8721..bf618c66c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "eth-lightwallet": "^2.2.2", "eth-store": "^1.1.0", "ethereumjs-tx": "^1.0.0", - "ethereumjs-util": "^2.6.0", + "ethereumjs-util": "^4.3.0", "faux-jax": "git+https://github.com/kumavis/faux-jax.git#c3648de04804f3895c5b4972750cae5b51ddb103", "hat": "0.0.3", "inject-css": "^0.1.1", From 4ee1b0ddf90c9823ee75de7aa52ef01ddd30b132 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 14 Apr 2016 14:43:29 -0700 Subject: [PATCH 3/8] Add c++ compiler for travis and node 4+ https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5f1e0c213..bc59ce453 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: node_js +env: + - CXX=g++-4.8 node_js: - "5.1" - "4.2" From de1bd04bfc127526ee823cfd54c14185131f58c3 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 14 Apr 2016 14:46:08 -0700 Subject: [PATCH 4/8] Add travis compiler addons --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index bc59ce453..54397f611 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,12 @@ language: node_js env: - CXX=g++-4.8 +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 node_js: - "5.1" - "4.2" From 93b75c88c42e591f6fde0136a91d0481caa8ad34 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 14 Apr 2016 14:55:41 -0700 Subject: [PATCH 5/8] Remove extraneous build target --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 54397f611..77772408e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,5 @@ addons: - g++-4.8 node_js: - "5.1" - - "4.2" before_script: - npm install -g mocha From 702b7e86f202529bdfb3c966c42fea054e03c987 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 14 Apr 2016 15:10:12 -0700 Subject: [PATCH 6/8] Limit test suite to UI for now --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index bf618c66c..07f34b2f1 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "private": true, "scripts": { "start": "gulp dev", - "test": "mocha --require test/helper.js --compilers js:babel-register --recursive", + "test": "npm run testUi", + "testPlugin": "mocha --require test/helper.js --compilers js:babel-register --recursive", "watch": "mocha watch --compilers js:babel-register --recursive", "testUi": "mocha ui/test/**/*test.js", "watchUi": "mocha watch ui/test/**/*test.js" From 5de4dc76620395c6f5638dee375b48b31cb1914a Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 14 Apr 2016 15:12:13 -0700 Subject: [PATCH 7/8] Add build badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c98b87cfa..1d15fa204 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Metamask Plugin +# Metamask Plugin [![Build Status](https://travis-ci.com/MetaMask/metamask-plugin.svg?token=3txzDGFpqQqvRCdgwTJp&branch=master)](https://travis-ci.com/MetaMask/metamask-plugin) ## Development From 6e0bb68cba735b9ffbf19a7b328670af0a12ed4d Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 14 Apr 2016 15:26:26 -0700 Subject: [PATCH 8/8] Run all UI tests --- package.json | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 07f34b2f1..db0e2823a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "test": "npm run testUi", "testPlugin": "mocha --require test/helper.js --compilers js:babel-register --recursive", "watch": "mocha watch --compilers js:babel-register --recursive", - "testUi": "mocha ui/test/**/*test.js", + "testUi": "mocha ui/test/**/**/*test.js", "watchUi": "mocha watch ui/test/**/*test.js" }, "browserify": { @@ -42,15 +42,11 @@ "multiplex": "^6.7.0", "pojo-migrator": "^2.1.0", "pumpify": "^1.3.4", - "react": "^15.0.1", - "react-addons-css-transition-group": "^15.0.1", - "react-dom": "^15.0.1", - "react-hyperscript": "^2.4.0", - "readable-stream": "^2.0.5", "react": "^0.14.3", "react-addons-css-transition-group": "^0.14.7", "react-dom": "^0.14.3", "react-hyperscript": "^2.2.2", + "readable-stream": "^2.0.5", "react-redux": "^4.0.3", "redux": "^3.0.5", "redux-logger": "^2.3.1", @@ -63,11 +59,11 @@ "xtend": "^4.0.1" }, "devDependencies": { - "brfs": "^1.4.3", "babel-preset-es2015": "^6.6.0", - "babelify": "^7.2.0", "babel-register": "^6.7.2", + "babelify": "^7.2.0", "beefy": "^2.1.5", + "brfs": "^1.4.3", "browserify": "^13.0.0", "chai": "^3.5.0", "deep-freeze-strict": "^1.1.1", @@ -85,6 +81,7 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^1.1.5", "sinon": "^1.17.3", + "tape": "^4.5.1", "uglifyify": "^3.0.1", "vinyl-buffer": "^1.0.0", "vinyl-source-stream": "^1.1.0",