From 0623c8772775b59db7c6c9906dc1fd70ee776439 Mon Sep 17 00:00:00 2001
From: Yemel Jardi <angel.jardi@gmail.com>
Date: Fri, 29 Aug 2014 11:36:23 -0300
Subject: [PATCH] Update tests

---
 test/mocks/FakeBlockchainSocket.js | 15 +++++++++++++--
 test/mocks/FakeWallet.js           |  1 +
 test/test.blockchain.Insight.js    | 10 +++-------
 test/test.network.Async.js         |  1 +
 test/unit/services/servicesSpec.js | 19 +------------------
 5 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/test/mocks/FakeBlockchainSocket.js b/test/mocks/FakeBlockchainSocket.js
index b85d3c31e..85c6c98e4 100644
--- a/test/mocks/FakeBlockchainSocket.js
+++ b/test/mocks/FakeBlockchainSocket.js
@@ -1,6 +1,5 @@
 'use strict';
 
-var util = require('util');
 var EventEmitter = require('events').EventEmitter;
 
 var FakeSocket = function (url, opts) {
@@ -13,7 +12,19 @@ var FakeSocket = function (url, opts) {
   }, 0);
 }
 
-util.inherits(FakeSocket, EventEmitter);
+var inherits = function(ctor, superCtor) {
+  ctor.super_ = superCtor;
+  ctor.prototype = Object.create(superCtor.prototype, {
+    constructor: {
+      value: ctor,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+};
+
+inherits(FakeSocket, EventEmitter);
 
 FakeSocket.prototype.removeEventListener = function() {
   return;
diff --git a/test/mocks/FakeWallet.js b/test/mocks/FakeWallet.js
index a9a90d073..331b395d7 100644
--- a/test/mocks/FakeWallet.js
+++ b/test/mocks/FakeWallet.js
@@ -36,6 +36,7 @@ var FakeWallet = function() {
       return true;
     }
   };
+  this.blockchain = {subscribed: [], subscribe: function(){}};
 
   this.privateKey = new FakePrivateKey();
 };
diff --git a/test/test.blockchain.Insight.js b/test/test.blockchain.Insight.js
index a84b138bd..631abba79 100644
--- a/test/test.blockchain.Insight.js
+++ b/test/test.blockchain.Insight.js
@@ -6,11 +6,7 @@ var sinon = require('sinon');
 var bitcore = bitcore || require('bitcore');
 var FakeSocket = require('./mocks/FakeBlockchainSocket');
 
-try {
-  var copay = require('./copay'); //browser
-} catch (e) {
-  var copay = require('../copay'); //node
-}
+var copay = copay || require('../copay');
 var Buffer = bitcore.Buffer;
 var Insight = copay.Insight;
 
@@ -144,7 +140,7 @@ describe('Insight model', function() {
     sinon.stub(blockchain, "requestPost", function(url, data, cb) {
       url.should.be.equal('/api/tx/send');
       var res = {statusCode: 200};
-      var body = JSON.stringify({txid: 1234});
+      var body = {txid: 1234};
       setTimeout(function() {
         cb(null, res, body);
       }, 0);
@@ -283,7 +279,7 @@ describe('Insight model', function() {
       data.addrs.should.be.equal('2NATQJnaQe2CUKLyhL1zdNkttJM1dUH9HaM,2NE9hTCffeugo5gQtfB4owq98gyTeWC56yb,2N9D5bcCQ2bPWUDByQ6Qb5bMgMtgsk1rw3x');
       setTimeout(function() {
         var res = {statusCode: 200};
-        var body = JSON.stringify(UNSPENT);
+        var body = UNSPENT;
         cb(null, res, body);
       }, 0);
     });
diff --git a/test/test.network.Async.js b/test/test.network.Async.js
index 4d46dabb3..c4273af00 100644
--- a/test/test.network.Async.js
+++ b/test/test.network.Async.js
@@ -18,6 +18,7 @@ describe('Network / Async', function() {
     fakeSocket.emit = function() {};
     fakeSocket.on = function() {};
     fakeSocket.disconnect = function() {};
+    fakeSocket.removeAllListeners = function() {};
     n.createSocket = function() {
       return fakeSocket;
     };
diff --git a/test/unit/services/servicesSpec.js b/test/unit/services/servicesSpec.js
index 284719d3d..df7eed5bf 100644
--- a/test/unit/services/servicesSpec.js
+++ b/test/unit/services/servicesSpec.js
@@ -66,6 +66,7 @@ describe("Unit: controllerUtils", function() {
 
 
     it(' should call updateAddressList ', inject(function(controllerUtils, $rootScope) {
+      $rootScope.wallet = new FakeWallet();
       var spy = sinon.spy(controllerUtils, 'updateAddressList');
       controllerUtils.updateGlobalAddresses();
       sinon.assert.callCount(spy, 1);
@@ -77,24 +78,6 @@ describe("Unit: controllerUtils", function() {
       controllerUtils.updateGlobalAddresses();
       expect($rootScope.addrInfos[0].address).to.be.equal(Waddr);;
     }));
-
-    it('should set System Event Handlers', inject(function(controllerUtils, $rootScope, Socket) {
-      var spy = sinon.spy(Socket, 'sysOn');
-      $rootScope.wallet = new FakeWallet();
-      controllerUtils.updateGlobalAddresses();
-      sinon.assert.callCount(spy, 5);
-      ['error', 'reconnect_error', 'reconnect_failed', 'connect', 'reconnect'].forEach(function(e) {
-        sinon.assert.calledWith(spy, e);
-      });
-    }));
-
-    it('should set Address Event Handlers', inject(function(controllerUtils, $rootScope, Socket) {
-      var spy = sinon.spy(Socket, 'on');
-      $rootScope.wallet = new FakeWallet();
-      var Waddr = Object.keys($rootScope.wallet.balanceByAddr)[0];
-      controllerUtils.updateGlobalAddresses();
-      sinon.assert.calledWith(spy, Waddr);
-    }));
   });