From 5853a197e5414b0ec3e7bb426eb2a9500513090c Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Wed, 13 Aug 2014 15:04:55 -0700 Subject: [PATCH] replace try/catch with browserify for copay.js --- test/test.TxProposals.js | 6 +----- util/build.js | 16 +++++++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) mode change 100755 => 100644 util/build.js diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js index a7a25e727..94f51964a 100644 --- a/test/test.TxProposals.js +++ b/test/test.TxProposals.js @@ -13,11 +13,7 @@ var TransactionBuilder = bitcore.TransactionBuilder; var util = bitcore.util; var networks = bitcore.networks; var sinon = require('sinon'); -try { - var copay = require('copay'); //browser -} catch (e) { - var copay = require('../copay'); //node -} +var copay = require('../copay'); var FakeBuilder = require('./mocks/FakeBuilder'); var TxProposal = copay.TxProposal; diff --git a/util/build.js b/util/build.js old mode 100755 new mode 100644 index 11a7e17ff..f1a7a2f98 --- a/util/build.js +++ b/util/build.js @@ -48,8 +48,11 @@ var createBundle = function(opts) { b.require('./copay', { expose: 'copay' }); + b.require('./copay', { + expose: '../copay' + }); b.require('./version'); -// b.external('bitcore'); + // b.external('bitcore'); b.require('./js/models/core/WalletFactory', { expose: '../js/models/core/WalletFactory' }); @@ -72,6 +75,9 @@ var createBundle = function(opts) { b.require('./test/mocks/FakeNetwork', { expose: './mocks/FakeNetwork' }); + b.require('./test/mocks/FakeBuilder', { + expose: './mocks/FakeBuilder' + }); b.require('./js/models/network/WebRTC', { expose: '../js/models/network/WebRTC' }); @@ -119,10 +125,10 @@ if (require.main === module) { }; var program = require('commander'); program - .version('0.0.1') - .option('-d, --debug', 'Development. Don\'t minify the codem and include debug packages.') - .option('-o, --stdout', 'Specify output as stdout') - .parse(process.argv); + .version('0.0.1') + .option('-d, --debug', 'Development. Don\'t minify the codem and include debug packages.') + .option('-o, --stdout', 'Specify output as stdout') + .parse(process.argv); createVersion(); var copayBundle = createBundle(program);