From 291975bb24e600e62d3ece2452d397ee68236016 Mon Sep 17 00:00:00 2001
From: Esteban Ordano <eordano@gmail.com>
Date: Sun, 26 Oct 2014 21:06:43 -0300
Subject: [PATCH] Fixing Identity Network Tests

---
 Gruntfile.js          |  2 +-
 js/models/Identity.js |  5 ++--
 test/Identity.js      | 66 ++++++++++++++++++++++++-------------------
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 9f8e42899..421548ece 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -85,7 +85,7 @@ module.exports = function(grunt) {
         tasks: ['shell:dev', 'concat:main']
       },
       test: {
-        files: ['test/*.js'],
+        files: ['test/**/*.js', 'js/**/*.js'],
         tasks: ['mochaTest']
       }
     },
diff --git a/js/models/Identity.js b/js/models/Identity.js
index 6a04c9189..843726495 100644
--- a/js/models/Identity.js
+++ b/js/models/Identity.js
@@ -607,8 +607,9 @@ Identity.prototype.joinWallet = function(opts, cb) {
           if (w) {
             w.sendWalletReady(decodedSecret.pubKey);
           } else {
-            if (!err) err = 'walletFull';
-            log.info(err);
+            if (!err) {
+              err = 'walletFull';
+            }
           }
           return cb(err, w);
         });
diff --git a/test/Identity.js b/test/Identity.js
index 199b2e5af..5defa42e4 100644
--- a/test/Identity.js
+++ b/test/Identity.js
@@ -25,7 +25,7 @@ function assertObjectEqual(a, b) {
 }
 
 
-describe.only('Identity model', function() {
+describe('Identity model', function() {
   var wallet;
   var email = 'hola@hola.com';
   var password = 'password';
@@ -303,7 +303,7 @@ describe.only('Identity model', function() {
     });
 
 
-    it('should yield to join error', function(done) {
+    it('should callback with a join error in case of a problem', function(done) {
       opts.privHex = undefined;
       var net = sinon.stub();
       net.greet = sinon.stub();
@@ -316,47 +316,55 @@ describe.only('Identity model', function() {
         type: 'walletId',
         networkName: iden.networkName,
       });
-      Identity._newAsync = function() {
-        return net;
-      };
+      opts.Async = net;
 
       iden.joinWallet(opts, function(err, w) {
-        done();
-      });
-    });
-
-
-    it('should call network.start / create', function(done) {
-      opts.privHex = undefined;
-      net.on.withArgs('connected').yields(null);
-      net.on.withArgs('data').yields('senderId', {
-        type: 'walletId',
-        networkName: 'testnet',
-        opts: {},
-      });
-      var w = sinon.stub();
-      w.sendWalletReady = sinon.spy();
-      iden.createWallet = sinon.stub().yields(null, w);
-      iden.joinWallet(opts, function(err, w) {
+        err.should.equal('joinError');
         done();
       });
     });
 
     it('should return walletFull', function(done) {
+      net = sinon.stub();
+      net.on = sinon.stub();
+      net.start = sinon.stub();
+      net.start.onFirstCall().callsArg(1);
+      net.greet = sinon.stub();
+      iden.createWallet = sinon.stub();
+      iden.createWallet.onFirstCall().yields();
+      net.on.withArgs('data').yields('senderId', {
+        type: 'walletId',
+        networkName: 'testnet',
+        opts: {},
+      });
+      opts.privHex = undefined;
+      opts.Async = net;
+
       iden.joinWallet(opts, function(err, w) {
+        err.should.equal('walletFull');
         done();
       });
     });
 
-    it('should accept a priv key a input', function() {
-      opts.privHex = 'tprv8ZgxMBicQKsPf7MCvCjnhnr4uiR2Z2gyNC27vgd9KUu98F9mM1tbaRrWMyddVju36GxLbeyntuSadBAttriwGGMWUkRgVmUUCg5nFioGZsd';
-      iden.joinWallet(opts, function(err, w) {
+    it('should accept a priv key as an input', function(done) {
+      net = sinon.stub();
+      net.on = sinon.stub();
+      net.start = sinon.stub();
+      net.start.onFirstCall().callsArg(1);
+      net.greet = sinon.stub();
+      iden.createWallet = sinon.stub();
+      var fakeWallet = {sendWalletReady: _.noop};
+      iden.createWallet.onFirstCall().yields(null, fakeWallet);
+      net.on.withArgs('data').yields('senderId', {
+        type: 'walletId',
+        networkName: 'testnet',
+        opts: {},
       });
-    });
-    it('should call network.start with private key', function(done) {
-      opts.privHex = undefined;
+
+      opts.privHex = 'tprv8ZgxMBicQKsPf7MCvCjnhnr4uiR2Z2gyNC27vgd9KUu98F9mM1tbaRrWMyddVju36GxLbeyntuSadBAttriwGGMWUkRgVmUUCg5nFioGZsd';
+      opts.Async = net;
       iden.joinWallet(opts, function(err, w) {
-        console.error(err);
+        w.should.equal(fakeWallet);
         done();
       });
     });