anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix controllerSpec tests

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-10-29 18:34:59 -03:00
commit b2c04b7372
8 changed files with 107 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

16
util/build.js
View file

@ -55,9 +55,6 @@ var createBundle = function(opts) {
});
b.require('./version');
b.require('./js/log', {
expose: '../js/log'
});
// b.external('bitcore');
b.require('./js/models/Identity', {
expose: '../js/models/Identity'
@ -84,10 +81,6 @@ var createBundle = function(opts) {
b.require('./js/models/PluginManager', {
expose: '../js/models/PluginManager'
});
b.require('./js/util/crypto', {
expose: '../util/crypto'
});
if (!opts.disablePlugins) {
b.require('./js/plugins/GoogleDrive', {
expose: '../plugins/GoogleDrive'
@ -110,10 +103,19 @@ var createBundle = function(opts) {
expose: '../config'
});
// The following 2 lines fix karma tests
b.require('sjcl');
b.require('./js/log', {
expose: '../log.js'
});
if (opts.debug) {
//include dev dependencies
b.require('sinon');
b.require('blanket');
b.require('./test/mocks/FakeBlockchain', {
expose: './mocks/FakeBlockchain'
});