mirror of https://github.com/BTCPrivate/copay.git
karma passing again!
This commit is contained in:
parent
7fd93d4ffd
commit
c7378c90ec
|
@ -118,6 +118,7 @@ module.exports = function(grunt) {
|
|||
'lib/angular-foundation/mm-foundation-tpls.min.js',
|
||||
'lib/angular-gettext/dist/angular-gettext.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'
|
||||
},
|
||||
|
|
|
@ -15,17 +15,19 @@ angular.module('copayApp.controllers').controller('OpenController', function($sc
|
|||
$rootScope.fromSetup = false;
|
||||
$scope.loading = false;
|
||||
$scope.retreiving = true;
|
||||
|
||||
walletFactory.getWallets(function(wallets) {
|
||||
$scope.wallets = wallets.sort(cmp);
|
||||
|
||||
if (!$scope.wallets.length) {
|
||||
if (!wallets || !wallets.length) {
|
||||
$location.path('/');
|
||||
}
|
||||
} else {
|
||||
$scope.wallets = wallets.sort(cmp);
|
||||
|
||||
walletFactory.storage.getLastOpened(function(ret) {
|
||||
$scope.selectedWalletId = ret || ($scope.wallets[0] && $scope.wallets[0].id);
|
||||
$scope.retreiving = false;
|
||||
});
|
||||
walletFactory.storage.getLastOpened(function(ret) {
|
||||
$scope.selectedWalletId = ret || ($scope.wallets[0] && $scope.wallets[0].id);
|
||||
$scope.retreiving = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
$scope.openPassword = '';
|
||||
|
|
|
@ -28,6 +28,7 @@ module.exports = function(config) {
|
|||
'lib/angular-route/angular-route.min.js',
|
||||
'lib/angular-foundation/mm-foundation.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/inherits/inherits.js',
|
||||
'lib/bitcore.js',
|
||||
|
@ -61,7 +62,6 @@ module.exports = function(config) {
|
|||
'test/mocks/FakeBlockchainSocket.js',
|
||||
'test/mocks/FakePayProServer.js',
|
||||
'test/mocks/FakeLocalStorage.js',
|
||||
'test/mocks/FakeStorage.js',
|
||||
|
||||
'test/mocha.conf.js',
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@ describe("Unit: Controllers", function() {
|
|||
|
||||
beforeEach(module('copayApp.services'));
|
||||
beforeEach(module('copayApp.controllers'));
|
||||
beforeEach(angular.mock.module('copayApp'));
|
||||
|
||||
var walletConfig = {
|
||||
requiredCopayers: 3,
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
var sinon = require('sinon');
|
||||
var preconditions = require('preconditions').singleton();
|
||||
|
||||
beforeEach(angular.mock.module('copayApp'));
|
||||
|
||||
describe("Unit: Walletfactory Service", function() {
|
||||
beforeEach(angular.mock.module('copayApp.services'));
|
||||
it('should contain a walletFactory service', inject(function(walletFactory) {
|
||||
|
|
Loading…
Reference in New Issue