This commit is contained in:
Matias Alejo Garcia 2014-12-02 12:15:58 -03:00
parent 43bd277959
commit 52d36a9656
3 changed files with 18 additions and 13 deletions

View File

@ -45,7 +45,6 @@ module.exports = function(config) {
//App-specific Code //App-specific Code
'js/app.js', 'js/app.js',
'js/log.js',
'js/routes.js', 'js/routes.js',
'js/services/*.js', 'js/services/*.js',
'js/directives.js', 'js/directives.js',

View File

@ -6,20 +6,24 @@ var sinon = sinon || require('sinon');
var should = chai.should(); var should = chai.should();
var log = require('../js/util/log'); var log = require('../js/util/log');
describe.only('log utils', function() { describe('log utils', function() {
afterEach(function() { afterEach(function() {
log.setLevel('info'); log.setLevel('info');
}); });
it('should log debug', function() { it('should log fatal', function() {
sinon.stub(console,'log'); if (console.warn.restore)
log.setLevel('debug'); console.warn.restore();
log.debug('hola');
var arg = console.log.getCall(0).args[0]; sinon.stub(console,'warn');
log.setLevel('debug');
log.warn('hola');
var arg = console.warn.getCall(0).args[0];
arg.should.contain('util.log.js'); arg.should.contain('util.log.js');
arg.should.contain('hola'); arg.should.contain('hola');
console.log.restore(); console.warn.restore();
}); });
it('should not log debug', function() { it('should not log debug', function() {
@ -34,6 +38,4 @@ describe.only('log utils', function() {
log.getLevels().debug.should.equal(0); log.getLevels().debug.should.equal(0);
log.getLevels().fatal.should.equal(5); log.getLevels().fatal.should.equal(5);
}); });
}); });

View File

@ -81,6 +81,13 @@ var createBundle = function(opts) {
b.require('./js/models/PluginManager', { b.require('./js/models/PluginManager', {
expose: '../js/models/PluginManager' expose: '../js/models/PluginManager'
}); });
b.require('./js/util/HTTP', {
expose: '../js/util/HTTP'
});
b.require('./js/util/log', {
expose: '../js/util/log'
});
if (!opts.disablePlugins) { if (!opts.disablePlugins) {
b.require('./js/plugins/GoogleDrive', { b.require('./js/plugins/GoogleDrive', {
expose: '../plugins/GoogleDrive' expose: '../plugins/GoogleDrive'
@ -109,9 +116,6 @@ var createBundle = function(opts) {
// The following 2 lines fix karma tests // The following 2 lines fix karma tests
b.require('sjcl'); b.require('sjcl');
b.require('./js/util/log', {
expose: '../../log.js'
});
if (opts.debug) { if (opts.debug) {
//include dev dependencies //include dev dependencies