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

karma passing again!

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-09-17 13:03:12 -03:00
commit c7378c90ec
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Gruntfile.js
View file

@ -118,6 +118,7 @@ module.exports = function(grunt) {
'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js',
'lib/angular-gettext/dist/angular-gettext.min.js', 'lib/angular-gettext/dist/angular-gettext.min.js',
'lib/angular-load/angular-load.min.js' 'lib/angular-load/angular-load.min.js'
// If you add libs here, remember to add it too to karma.conf
], ],
dest: 'lib/angularjs-all.js' dest: 'lib/angularjs-all.js'
}, },

16
js/controllers/open.js
View file

@ -15,17 +15,19 @@ angular.module('copayApp.controllers').controller('OpenController', function($sc
$rootScope.fromSetup = false; $rootScope.fromSetup = false;
$scope.loading = false; $scope.loading = false;
$scope.retreiving = true; $scope.retreiving = true;
walletFactory.getWallets(function(wallets) { walletFactory.getWallets(function(wallets) {
$scope.wallets = wallets.sort(cmp);
if (!$scope.wallets.length) { if (!wallets || !wallets.length) {
$location.path('/'); $location.path('/');
} } else {
$scope.wallets = wallets.sort(cmp);
walletFactory.storage.getLastOpened(function(ret) { walletFactory.storage.getLastOpened(function(ret) {
$scope.selectedWalletId = ret || ($scope.wallets[0] && $scope.wallets[0].id); $scope.selectedWalletId = ret || ($scope.wallets[0] && $scope.wallets[0].id);
$scope.retreiving = false; $scope.retreiving = false;
}); });
}
}); });
$scope.openPassword = ''; $scope.openPassword = '';

2
karma.conf.js
View file

@ -28,6 +28,7 @@ module.exports = function(config) {
'lib/angular-route/angular-route.min.js', 'lib/angular-route/angular-route.min.js',
'lib/angular-foundation/mm-foundation.min.js', 'lib/angular-foundation/mm-foundation.min.js',
'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js',
'lib/angular-load/angular-load.min.js',
'lib/angular-gettext/dist/angular-gettext.min.js', 'lib/angular-gettext/dist/angular-gettext.min.js',
'lib/inherits/inherits.js', 'lib/inherits/inherits.js',
'lib/bitcore.js', 'lib/bitcore.js',
@ -61,7 +62,6 @@ module.exports = function(config) {
'test/mocks/FakeBlockchainSocket.js', 'test/mocks/FakeBlockchainSocket.js',
'test/mocks/FakePayProServer.js', 'test/mocks/FakePayProServer.js',
'test/mocks/FakeLocalStorage.js', 'test/mocks/FakeLocalStorage.js',
'test/mocks/FakeStorage.js',
'test/mocha.conf.js', 'test/mocha.conf.js',

1
test/unit/controllers/controllersSpec.js
View file

@ -25,6 +25,7 @@ describe("Unit: Controllers", function() {
beforeEach(module('copayApp.services')); beforeEach(module('copayApp.services'));
beforeEach(module('copayApp.controllers')); beforeEach(module('copayApp.controllers'));
beforeEach(angular.mock.module('copayApp'));
var walletConfig = { var walletConfig = {
requiredCopayers: 3, requiredCopayers: 3,

2
test/unit/services/servicesSpec.js
View file

@ -6,6 +6,8 @@
var sinon = require('sinon'); var sinon = require('sinon');
var preconditions = require('preconditions').singleton(); var preconditions = require('preconditions').singleton();
beforeEach(angular.mock.module('copayApp'));
describe("Unit: Walletfactory Service", function() { describe("Unit: Walletfactory Service", function() {
beforeEach(angular.mock.module('copayApp.services')); beforeEach(angular.mock.module('copayApp.services'));
it('should contain a walletFactory service', inject(function(walletFactory) { it('should contain a walletFactory service', inject(function(walletFactory) {