anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix rebase issues

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-10-01 10:33:06 -03:00
commit ab2424f478
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/test.Identity.js → test/models/Identity.js
View file

@ -5,15 +5,15 @@ var _ = require('underscore');
var chai = chai || require('chai'); var chai = chai || require('chai');
var should = chai.should(); var should = chai.should();
var copay = copay || require('../copay');
var sinon = require('sinon'); var FakeNetwork = requireMock('FakeNetwork');
var FakeNetwork = require('./mocks/FakeNetwork'); var FakeBlockchain = requireMock('FakeBlockchain');
var FakeBlockchain = require('./mocks/FakeBlockchain');
var FakeStorage = function FakeStorage() {}; var FakeStorage = function FakeStorage() {};
var Identity = require('../js/models/Identity'); var Identity = copay.Identity;
var Passphrase = require('../js/models/Passphrase'); var Passphrase = copay.Passphrase;
var mockLocalStorage = require('./mocks/FakeLocalStorage'); var mockLocalStorage = requireMock('FakeLocalStorage');
var mockSessionStorage = require('./mocks/FakeLocalStorage'); var mockSessionStorage = requireMock('FakeLocalStorage');
var PERSISTED_PROPERTIES = (copay.Wallet || require('../js/models/Wallet')).PERSISTED_PROPERTIES; var PERSISTED_PROPERTIES = (copay.Wallet || require('../js/models/Wallet')).PERSISTED_PROPERTIES;