update branch

This commit is contained in:
Gustavo Cortez 2014-06-19 13:16:20 -03:00
commit f1b92ac67f
5 changed files with 4 additions and 4 deletions

View File

@ -24,7 +24,6 @@ var copayApp = window.copayApp = angular.module('copayApp',[
'angularMoment', 'angularMoment',
'mm.foundation', 'mm.foundation',
'monospaced.qrcode', 'monospaced.qrcode',
'notifications',
'copayApp.filters', 'copayApp.filters',
'copayApp.services', 'copayApp.services',
'copayApp.controllers', 'copayApp.controllers',

View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('notifications', []). angular.module('copayApp.services').
factory('$notification', ['$timeout',function($timeout){ factory('$notification', ['$timeout',function($timeout){
var notifications = JSON.parse(localStorage.getItem('$notifications')) || [], var notifications = JSON.parse(localStorage.getItem('$notifications')) || [],

View File

@ -49,10 +49,13 @@ describe('WalletFactory model', function() {
var c2 = JSON.parse(JSON.stringify(config)); var c2 = JSON.parse(JSON.stringify(config));
c2.verbose = 1; c2.verbose = 1;
var wf = new WalletFactory(c2, '0.0.1'); var wf = new WalletFactory(c2, '0.0.1');
var save_console_log = console.log;
console.log = function() {};
var spy = sinon.spy(console, 'log'); var spy = sinon.spy(console, 'log');
wf.log('ok'); wf.log('ok');
sinon.assert.callCount(spy, 1); sinon.assert.callCount(spy, 1);
spy.getCall(0).args[0].should.equal('ok'); spy.getCall(0).args[0].should.equal('ok');
console.log = save_console_log;
}); });

View File

@ -13,7 +13,6 @@ describe("Unit: Controllers", function() {
var scope; var scope;
beforeEach(module('notifications'));
beforeEach(module('copayApp.services')); beforeEach(module('copayApp.services'));
beforeEach(module('copayApp.controllers')); beforeEach(module('copayApp.controllers'));

View File

@ -61,7 +61,6 @@ describe("Unit: Walletfactory Service", function() {
describe("Unit: controllerUtils", function() { describe("Unit: controllerUtils", function() {
beforeEach(angular.mock.module('copayApp.services')); beforeEach(angular.mock.module('copayApp.services'));
beforeEach(angular.mock.module('notifications'));
it('should updateBalance in bits', inject(function(controllerUtils, $rootScope) { it('should updateBalance in bits', inject(function(controllerUtils, $rootScope) {
expect(controllerUtils.updateBalance).not.to.equal(null); expect(controllerUtils.updateBalance).not.to.equal(null);