From 8a1a3adf9055c2bee871563c489750a70e17d8a2 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Thu, 14 Aug 2014 10:30:53 -0400 Subject: [PATCH] fix karma tests after rebase --- util/build.js | 41 +++++++++++++---------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/util/build.js b/util/build.js index d8a41e3cf..71c96b6c8 100644 --- a/util/build.js +++ b/util/build.js @@ -13,7 +13,7 @@ var puts = function(error, stdout, stderr) { //sys.puts(stderr); }; -var pack = function (params) { +var pack = function(params) { var file = require.resolve('soop'); var dir = file.substr(0, file.length - String('soop.js').length); var preludePath = dir + 'example/custom_prelude.js'; @@ -48,9 +48,6 @@ var createBundle = function(opts) { b.require('./copay', { expose: 'copay' }); - b.require('./copay', { - expose: '../copay' - }); b.require('./version'); // b.external('bitcore'); b.require('./js/models/core/WalletFactory', { @@ -60,27 +57,24 @@ var createBundle = function(opts) { b.require('./js/models/core/Wallet', { expose: '../js/models/core/Wallet' }); + b.require('./js/models/core/Wallet', { + expose: '../js/models/core/Wallet' + }); b.require('./js/models/core/Wallet', { expose: '../../js/models/core/Wallet' }); b.require('./test/mocks/FakeStorage', { expose: './mocks/FakeStorage' }); - b.require('./test/mocks/FakePayProServer', { - expose: './mocks/FakePayProServer' - }); - b.require('./test/mocks/FakePayProServer', { - expose: '../../mocks/FakePayProServer' - }); b.require('./test/mocks/FakeBlockchain', { expose: './mocks/FakeBlockchain' }); - b.require('./test/mocks/FakeLocalStorage', { - expose: './mocks/FakeLocalStorage' - }); b.require('./test/mocks/FakeNetwork', { expose: './mocks/FakeNetwork' }); + b.require('./test/mocks/FakePayProServer', { + expose: '../../mocks/FakePayProServer' + }); b.require('./js/models/network/WebRTC', { expose: '../js/models/network/WebRTC' }); @@ -96,24 +90,15 @@ var createBundle = function(opts) { b.require('./js/models/core/Passphrase', { expose: '../js/models/core/Passphrase' }); - b.require('./js/models/core/Message', { - expose: '../js/models/core/Message' - }); - b.require('./config', { - expose: '../config' - }); - b.require('./js/models/core/HDPath', { - expose: '../js/models/core/HDPath' - }); - if (opts.debug) { + if (opts.dontminify) { //include dev dependencies b.require('sinon'); b.require('blanket'); b.require('soop'); } - if (!opts.debug) { + if (!opts.dontminify) { b.transform({ global: true }, 'uglifyify'); @@ -128,10 +113,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, --dontminify', 'Development. Don\'t minify the code.') + .option('-o, --stdout', 'Specify output as stdout') + .parse(process.argv); createVersion(); var copayBundle = createBundle(program);