diff --git a/.travis.yml b/.travis.yml index 337cde38..dc85ddea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ before_install: - git config --global user.email "dev@bitpay.com" - git config --global user.name "BitPay, Inc." script: - - mocha -R spec integration/regtest.js \ No newline at end of file + - _mocha -R spec integration/regtest.js \ No newline at end of file diff --git a/integration/data/bitcoin.conf b/integration/data/bitcoin.conf new file mode 100644 index 00000000..2ebd94ba --- /dev/null +++ b/integration/data/bitcoin.conf @@ -0,0 +1,8 @@ +server=1 +whitelist=127.0.0.1 +txindex=1 +rpcallowip=127.0.0.1 +rpcuser=bitcoin +rpcpassword=local321 + + diff --git a/integration/regtest.js b/integration/regtest.js index 46973ddc..e4f6976e 100644 --- a/integration/regtest.js +++ b/integration/regtest.js @@ -5,6 +5,7 @@ var chai = require('chai'); var bitcore = require('bitcore'); +var rimraf = require('rimraf'); var bitcoind; /* jshint unused: false */ @@ -17,39 +18,45 @@ describe('Basic Functionality', function() { before(function(done) { this.timeout(30000); - bitcoind = require('../').daemon({ - datadir: process.env.BITCOINDJS_DIR || '~/.bitcoin', - network: 'regtest', - server: true, - rpcuser: 'bitcoin', - rpcpassword: 'local321', - rpcallowip: '127.0.0.1' - }); - bitcoind.on('error', function(err) { - bitcoind.log('error="%s"', err.message); - }); + rimraf('./data/regtest', function(err) { - bitcoind.on('open', function(status) { - bitcoind.log('status="%s"', status); - }); + if (err) { + throw err; + } - console.log('Waiting for Bitcoin Core to initialize...'); - - bitcoind.on('ready', function() { - - var client = new BitcoinRPC({ - protocol: 'http', - host: '127.0.0.1', - port: 18332, - user: 'bitcoin', - pass: 'local321' + bitcoind = require('../').daemon({ + datadir: './data', + network: 'regtest' }); - client.generate(100, function(err, result) { - console.log('err', err); - console.log('result', result); - done(); + bitcoind.on('error', function(err) { + bitcoind.log('error="%s"', err.message); + }); + + bitcoind.on('open', function(status) { + bitcoind.log('status="%s"', status); + }); + + console.log('Waiting for Bitcoin Core to initialize...'); + + bitcoind.on('ready', function() { + + var client = new BitcoinRPC({ + protocol: 'http', + host: '127.0.0.1', + port: 18332, + user: 'bitcoin', + pass: 'local321' + }); + + client.generate(100, function(err) { + if (err) { + throw err; + } + done(); + }); + }); }); diff --git a/package.json b/package.json index ed670d4d..1183d515 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "chai": "^3.0.0", "mocha": "~1.16.2", "proxyquire": "^1.3.1", + "rimraf": "^2.4.2", "sinon": "^1.15.4" } }