Commit fcabd995 by Manuel Araoz

fix travis tests 2

parent 9f12e870
...@@ -6,7 +6,5 @@ node_js: ...@@ -6,7 +6,5 @@ node_js:
- "6" - "6"
before_install: before_install:
- npm i -g ethereumjs-testrpc - npm i -g ethereumjs-testrpc
- npm i -g truffle
script: script:
- testrpc > /dev/null & - npm test
- truffle test
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"babel-preset-stage-3": "^6.17.0", "babel-preset-stage-3": "^6.17.0",
"babel-register": "^6.23.0", "babel-register": "^6.23.0",
"ethereumjs-testrpc": "^3.0.2", "ethereumjs-testrpc": "^3.0.2",
"truffle": "^3.1.1" "truffle": "git@github.com:ConsenSys/truffle.git#beta"
}, },
"scripts": { "scripts": {
"test": "scripts/test.sh", "test": "scripts/test.sh",
......
...@@ -7,7 +7,7 @@ if [ ! $trpc_running ]; then ...@@ -7,7 +7,7 @@ if [ ! $trpc_running ]; then
testrpc > /dev/null & testrpc > /dev/null &
trpc_pid=$! trpc_pid=$!
fi fi
truffle test ./node_modules/truffle/cli.js test
if [ ! $trpc_running ]; then if [ ! $trpc_running ]; then
kill -9 $trpc_pid kill -9 $trpc_pid
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment