aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-04-16 00:39:51 +0800
committerDan Finlay <somniac@me.com>2016-04-16 00:39:51 +0800
commitdac7406ff8dd614b7d4111f3c7fcbd8dc5dda489 (patch)
treea60035c9e8b435c509bf629e0ff6a32d84011cb0
parent61590807318a66a5853e50d52f316881d04b1c65 (diff)
parent6e0bb68cba735b9ffbf19a7b328670af0a12ed4d (diff)
downloadtangerine-wallet-browser-dac7406ff8dd614b7d4111f3c7fcbd8dc5dda489.tar.gz
tangerine-wallet-browser-dac7406ff8dd614b7d4111f3c7fcbd8dc5dda489.tar.zst
tangerine-wallet-browser-dac7406ff8dd614b7d4111f3c7fcbd8dc5dda489.zip
Merge pull request #106 from MetaMask/AddTravisCI
Add rudimentary travis.yml
-rw-r--r--.travis.yml13
-rw-r--r--README.md2
-rw-r--r--package.json18
3 files changed, 22 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..77772408e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: node_js
+env:
+ - CXX=g++-4.8
+addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - g++-4.8
+node_js:
+ - "5.1"
+before_script:
+ - npm install -g mocha
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
diff --git a/package.json b/package.json
index e871d8721..db0e2823a 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,10 @@
"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",
+ "testUi": "mocha ui/test/**/**/*test.js",
"watchUi": "mocha watch ui/test/**/*test.js"
},
"browserify": {
@@ -33,7 +34,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",
@@ -41,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",
@@ -62,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",
@@ -84,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",