fix karma tests after rebase

This commit is contained in:
Manuel Araoz 2014-08-14 10:30:53 -04:00
commit 8a1a3adf90

View file

@ -13,7 +13,7 @@ var puts = function(error, stdout, stderr) {
//sys.puts(stderr); //sys.puts(stderr);
}; };
var pack = function (params) { var pack = function(params) {
var file = require.resolve('soop'); var file = require.resolve('soop');
var dir = file.substr(0, file.length - String('soop.js').length); var dir = file.substr(0, file.length - String('soop.js').length);
var preludePath = dir + 'example/custom_prelude.js'; var preludePath = dir + 'example/custom_prelude.js';
@ -48,9 +48,6 @@ var createBundle = function(opts) {
b.require('./copay', { b.require('./copay', {
expose: 'copay' expose: 'copay'
}); });
b.require('./copay', {
expose: '../copay'
});
b.require('./version'); b.require('./version');
// b.external('bitcore'); // b.external('bitcore');
b.require('./js/models/core/WalletFactory', { b.require('./js/models/core/WalletFactory', {
@ -60,27 +57,24 @@ var createBundle = function(opts) {
b.require('./js/models/core/Wallet', { b.require('./js/models/core/Wallet', {
expose: '../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', { b.require('./js/models/core/Wallet', {
expose: '../../js/models/core/Wallet' expose: '../../js/models/core/Wallet'
}); });
b.require('./test/mocks/FakeStorage', { b.require('./test/mocks/FakeStorage', {
expose: './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', { b.require('./test/mocks/FakeBlockchain', {
expose: './mocks/FakeBlockchain' expose: './mocks/FakeBlockchain'
}); });
b.require('./test/mocks/FakeLocalStorage', {
expose: './mocks/FakeLocalStorage'
});
b.require('./test/mocks/FakeNetwork', { b.require('./test/mocks/FakeNetwork', {
expose: './mocks/FakeNetwork' expose: './mocks/FakeNetwork'
}); });
b.require('./test/mocks/FakePayProServer', {
expose: '../../mocks/FakePayProServer'
});
b.require('./js/models/network/WebRTC', { b.require('./js/models/network/WebRTC', {
expose: '../js/models/network/WebRTC' expose: '../js/models/network/WebRTC'
}); });
@ -96,24 +90,15 @@ var createBundle = function(opts) {
b.require('./js/models/core/Passphrase', { b.require('./js/models/core/Passphrase', {
expose: '../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 //include dev dependencies
b.require('sinon'); b.require('sinon');
b.require('blanket'); b.require('blanket');
b.require('soop'); b.require('soop');
} }
if (!opts.debug) { if (!opts.dontminify) {
b.transform({ b.transform({
global: true global: true
}, 'uglifyify'); }, 'uglifyify');
@ -128,10 +113,10 @@ if (require.main === module) {
}; };
var program = require('commander'); var program = require('commander');
program program
.version('0.0.1') .version('0.0.1')
.option('-d, --debug', 'Development. Don\'t minify the codem and include debug packages.') .option('-d, --dontminify', 'Development. Don\'t minify the code.')
.option('-o, --stdout', 'Specify output as stdout') .option('-o, --stdout', 'Specify output as stdout')
.parse(process.argv); .parse(process.argv);
createVersion(); createVersion();
var copayBundle = createBundle(program); var copayBundle = createBundle(program);