From 2bfa83a8e59fc87735277143f33713b03dd002cf Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 9 Sep 2014 11:47:42 -0300 Subject: [PATCH 1/3] Fixes: delete wallet on the intermediate screen --- js/controllers/copayers.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js index b14f3fd41..b1e4e6b68 100644 --- a/js/controllers/copayers.js +++ b/js/controllers/copayers.js @@ -21,7 +21,6 @@ angular.module('copayApp.controllers').controller('CopayersController', $scope.deleteWallet = function() { var w = $rootScope.wallet; - w.disconnect(); walletFactory.delete(w.id, function() { controllerUtils.logout(); }); From c9bc512227d2904b22f47e1999df2f97c4e8b99a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 9 Sep 2014 12:59:27 -0300 Subject: [PATCH 2/3] Fix: copayers list --- js/controllers/copayers.js | 6 ++---- views/includes/peer-list.html | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js index b1e4e6b68..8aaf0fbcb 100644 --- a/js/controllers/copayers.js +++ b/js/controllers/copayers.js @@ -26,11 +26,9 @@ angular.module('copayApp.controllers').controller('CopayersController', }); }; - // Cached list of copayers - $scope.copayers = $rootScope.wallet.getRegisteredPeerIds(); - $scope.copayersList = function() { - return $rootScope.wallet.getRegisteredPeerIds(); + $scope.copayers = $rootScope.wallet.getRegisteredPeerIds(); + return $scope.copayers; } $scope.isBackupReady = function(copayer) { diff --git a/views/includes/peer-list.html b/views/includes/peer-list.html index a4dbbaed6..55cd63fef 100644 --- a/views/includes/peer-list.html +++ b/views/includes/peer-list.html @@ -7,7 +7,7 @@ -
+
Date: Tue, 9 Sep 2014 12:59:48 -0300 Subject: [PATCH 3/3] tests for copayers controller --- test/unit/controllers/controllersSpec.js | 25 +++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/test/unit/controllers/controllersSpec.js b/test/unit/controllers/controllersSpec.js index 1c464b236..abd154840 100644 --- a/test/unit/controllers/controllersSpec.js +++ b/test/unit/controllers/controllersSpec.js @@ -40,7 +40,7 @@ describe("Unit: Controllers", function() { }); - describe('Backup Controller', function() { + describe('More Controller', function() { var ctrl; beforeEach(inject(function($controller, $rootScope) { scope = $rootScope.$new(); @@ -479,7 +479,30 @@ describe("Unit: Controllers", function() { }); }); + describe('Copayers Controller', function() { + var saveDownload = null; + var ctrl; + beforeEach(inject(function($controller, $rootScope) { + scope = $rootScope.$new(); + $rootScope.wallet = new FakeWallet(walletConfig); + ctrl = $controller('CopayersController', { + $scope: scope, + $modal: {}, + }); + })); + + it('should exist', function() { + should.exist(ctrl); + }); + + it('Delete Wallet', function() { + expect(scope.wallet).not.equal(undefined); + scope.deleteWallet(); + expect(scope.wallet).equal(undefined); + }); + + }); describe('Join Controller', function() { var what;