From f245ba80228b0b40d9928618e4430f680e75c383 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Thu, 18 Dec 2014 13:02:02 -0300
Subject: [PATCH] Tests improvements

---
 test/RateService.js | 27 ++++++++-------------------
 test/Wallet.js      |  9 ++++++++-
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/test/RateService.js b/test/RateService.js
index 36bbc3ee0..fa68e2961 100644
--- a/test/RateService.js
+++ b/test/RateService.js
@@ -327,11 +327,8 @@ describe('RateService model', function() {
         rs.isAvailable = sinon.stub().returns(false);
         (function() {
           rs.listAlternatives();
-        }).should.throw('not available');;
-
-        rs.getAlternatives();
+        }).should.throw('not available');
       });
-
       it('should return list of available currencies', function() {
         var rs = new RateService();
         rs.isAvailable = sinon.stub().returns(true);
@@ -348,32 +345,24 @@ describe('RateService model', function() {
         var list = rs.listAlternatives();
         list.should.exist;
         list.length.should.equal(2);
-
-        list = rs.getAlternatives();
-        list.should.exist;
-        list.length.should.equal(2);
       });
-
-      it('should return an error when trying to get the list of available currencies', function() {
+    });
+    describe('#getAlternatives', function() {
+      it('should return nothing when trying to get the list of available currencies', function() {
         var rs = new RateService();
-        rs.isAvailable = sinon.stub().returns(true);
-        rs.whenAvailable(function() {});
         rs.isAvailable = sinon.stub().returns(false);
         rs.whenAvailable(function() {});
-
         rs.getAlternatives().length.should.equal(0);
-
-        (function() {
-          rs.listAlternatives();
-        }).should.throw;
       });
+
     });
     describe('#singleton', function() {
       it('should create only one instance', function() {
         var rs = RateService.singleton();
         rs.should.be.not.null;
-        rs = RateService.singleton();
-        rs.should.be.not.null;
+        var rs2 = RateService.singleton();
+        rs2.should.be.not.null;
+        rs.should.deep.equal(rs2);
       });
     });
   });
diff --git a/test/Wallet.js b/test/Wallet.js
index 6f8715043..4c296dde9 100644
--- a/test/Wallet.js
+++ b/test/Wallet.js
@@ -203,6 +203,7 @@ describe('Wallet model', function() {
 
     sinon.spy(w, 'sendIndexes');
     sinon.spy(w, 'sendTxProposal');
+
     w.spend({
       toAddress: toAddress,
       amountSat: amountSatStr,
@@ -213,6 +214,9 @@ describe('Wallet model', function() {
       w.sendTxProposal.calledOnce.should.equal(true);
       w.sendIndexes.calledOnce.should.equal(false);
 
+      w.network.send.calledOnce.should.equal(true);
+
+
       var p = w.getPendingTxProposalsCount();
       p.pending.should.be.equal(1);
       p.pendingForUs.should.be.equal(0);
@@ -766,13 +770,16 @@ describe('Wallet model', function() {
 
   it('should close wallet', function(done) {
     var w = createW2();
-    w.removeAllListeners = sinon.stub();
     w.network.removeAllListeners = sinon.stub();
     w.network.cleanUp = sinon.stub();
     w.blockchain.removeAllListeners = sinon.stub();
     w.blockchain.destroy = sinon.stub();
 
     w.close(function() {
+      w.network.removeAllListeners.calledOnce.should.equal(true);
+      w.network.cleanUp.calledOnce.should.equal(true);
+      w.blockchain.removeAllListeners.calledOnce.should.equal(true);
+      w.network.cleanUp.calledOnce.should.equal(true);
       done();
     });
   });