From ab2424f47884fdff02926369a9ed068f4465deb6 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 1 Oct 2014 10:33:06 -0300
Subject: [PATCH] fix rebase issues

---
 test/{test.Identity.js => models/Identity.js} | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
 rename test/{test.Identity.js => models/Identity.js} (97%)

diff --git a/test/test.Identity.js b/test/models/Identity.js
similarity index 97%
rename from test/test.Identity.js
rename to test/models/Identity.js
index eeebacfeb..bf6bb3167 100644
--- a/test/test.Identity.js
+++ b/test/models/Identity.js
@@ -5,15 +5,15 @@ var _ = require('underscore');
 var chai = chai || require('chai');
 var should = chai.should();
 
-var copay = copay || require('../copay');
-var sinon = require('sinon');
-var FakeNetwork = require('./mocks/FakeNetwork');
-var FakeBlockchain = require('./mocks/FakeBlockchain');
+
+var FakeNetwork = requireMock('FakeNetwork');
+var FakeBlockchain = requireMock('FakeBlockchain');
 var FakeStorage = function FakeStorage() {};
-var Identity = require('../js/models/Identity');
-var Passphrase = require('../js/models/Passphrase');
-var mockLocalStorage = require('./mocks/FakeLocalStorage');
-var mockSessionStorage = require('./mocks/FakeLocalStorage');
+var Identity = copay.Identity;
+var Passphrase = copay.Passphrase;
+var mockLocalStorage = requireMock('FakeLocalStorage');
+var mockSessionStorage = requireMock('FakeLocalStorage');
+
 
 
 var PERSISTED_PROPERTIES = (copay.Wallet || require('../js/models/Wallet')).PERSISTED_PROPERTIES;