From 7141dee5c84f36a07bd6909b4daa706e0f68cd9f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 7 Apr 2014 13:26:29 -0300
Subject: [PATCH] fix tests

---
 js/services/network.js     | 36 ++++++++++++++++++++++++------------
 test/test.publickeyring.js |  5 +----
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/js/services/network.js b/js/services/network.js
index 7e526654f..1551345d5 100644
--- a/js/services/network.js
+++ b/js/services/network.js
@@ -80,16 +80,20 @@ angular.module('copay.network')
           });
           break;
         case 'disconnect':
-          $rootScope.connectedPeers = _arrayRemove(obj.sender, $rootScope.connectedPeers);
-          $rootScope.connectedTo = _arrayRemove(obj.sender, $rootScope.connectedTo);
-
-          _saveDataStorage();
-
-          $rootScope.$digest();
+          _onClose(obj.sender);
           break;
       }
     };
 
+    var _onClose = function(pid) {
+      $rootScope.connectedPeers = _arrayRemove(pid, $rootScope.connectedPeers);
+      $rootScope.connectedTo = _arrayRemove(pid, $rootScope.connectedTo);
+
+      _saveDataStorage();
+
+      $rootScope.$digest();
+    };
+
     var _connectToPeers = function(peers) {
       var arrayDiff = _arrayDiff(peers, $rootScope.connectedTo);
 
@@ -99,7 +103,7 @@ angular.module('copay.network')
     };
 
     // public methods
-    var _init = function(cb) {
+    var init = function(cb) {
       peer = new Peer($rootScope.peerId, {
         key: 'lwjd5qra8257b9', // TODO: we need our own PeerServer KEY (http://peerjs.com/peerserver)
         debug: 3
@@ -135,13 +139,17 @@ angular.module('copay.network')
               });
 
               c.on('data', _onData);
+
+              c.on('close', function() {
+                _onClose(c.peer);
+              });
             }
           });
         }
       });
     };
 
-    var _connect = function(pid, cb) {
+    var connect = function(pid, cb) {
       if (pid !== $rootScope.peerId) {
         var c = peer.connect(pid, {
           label: 'wallet',
@@ -163,6 +171,10 @@ angular.module('copay.network')
         });
 
         c.on('data', _onData);
+
+        c.on('close', function() {
+          _onClose(c.peer);
+        });
       }
     };
 
@@ -175,7 +187,7 @@ angular.module('copay.network')
         _sender(pids, data, cb);
     };
 
-    var _disconnect = function(cb) {
+    var disconnect = function(cb) {
       var conns = $rootScope.connectedPeers.length;
       var i = 1;
 
@@ -198,10 +210,10 @@ angular.module('copay.network')
     }
 
     return {
-      init: _init,
-      connect: _connect,
+      init: init,
+      connect: connect,
       send: _send,
-      disconnect: _disconnect
+      disconnect: disconnect
     } 
   });
 
diff --git a/test/test.publickeyring.js b/test/test.publickeyring.js
index 994911447..4b9025e51 100644
--- a/test/test.publickeyring.js
+++ b/test/test.publickeyring.js
@@ -252,13 +252,10 @@ describe('PublicKeyRing model', function() {
         id: w.id,
       });
       w2.addCopayer();
-      w.merge(w2.toObj());
+      w.merge(w2.toObj()).should.equal(true);
     }
     w.haveAllRequiredPubKeys().should.equal(true);
   });
-
-
-
 });