add some mocha tests to karma 6

This commit is contained in:
Manuel Araoz 2014-08-21 18:53:03 -04:00
commit 88bf042e3c
2 changed files with 13 additions and 12 deletions

View file

@ -59,12 +59,14 @@ module.exports = function(config) {
'test/mocha.conf.js', 'test/mocha.conf.js',
//test files //test files
'test/unit/**/*.js',
'test/test.blockchain.Insight.js', 'test/test.blockchain.Insight.js',
'test/test.HDParams.js', 'test/test.HDParams.js',
'test/test.HDPath.js', 'test/test.HDPath.js',
'test/test.LocalEncrypted.js', 'test/test.LocalEncrypted.js',
'test/test.Passphrase.js' 'test/test.Passphrase.js',
'test/test.PayPro.js',
'test/unit/**/*.js',
], ],

View file

@ -10,7 +10,6 @@ if (is_browser) {
} else { } else {
var copay = require('../copay'); //node var copay = require('../copay'); //node
} }
var copayConfig = require('../config');
var Wallet = copay.Wallet; var Wallet = copay.Wallet;
var PrivateKey = copay.PrivateKey; var PrivateKey = copay.PrivateKey;
var Storage = require('./mocks/FakeStorage'); var Storage = require('./mocks/FakeStorage');
@ -26,7 +25,7 @@ var startServer = copay.FakePayProServer; // TODO should be require('./mocks/Fak
var server; var server;
var config = { var walletConfig = {
requiredCopayers: 1, requiredCopayers: 1,
totalCopayers: 1, totalCopayers: 1,
spendUnconfirmed: true, spendUnconfirmed: true,
@ -36,7 +35,7 @@ var config = {
var getNewEpk = function() { var getNewEpk = function() {
return new PrivateKey({ return new PrivateKey({
networkName: config.networkName, networkName: walletConfig.networkName,
}) })
.deriveBIP45Branch() .deriveBIP45Branch()
.extendedPublicKeyString(); .extendedPublicKeyString();
@ -44,11 +43,11 @@ var getNewEpk = function() {
describe('PayPro (in Wallet) model', function() { describe('PayPro (in Wallet) model', function() {
var createW = function(N, conf) { var createW = function(N, conf) {
var c = JSON.parse(JSON.stringify(conf || config)); var c = JSON.parse(JSON.stringify(conf || walletConfig));
if (!N) N = c.totalCopayers; if (!N) N = c.totalCopayers;
var mainPrivateKey = new copay.PrivateKey({ var mainPrivateKey = new copay.PrivateKey({
networkName: config.networkName networkName: walletConfig.networkName
}); });
var mainCopayerEPK = mainPrivateKey.deriveBIP45Branch().extendedPublicKeyString(); var mainCopayerEPK = mainPrivateKey.deriveBIP45Branch().extendedPublicKeyString();
c.privateKey = mainPrivateKey; c.privateKey = mainPrivateKey;
@ -64,9 +63,9 @@ describe('PayPro (in Wallet) model', function() {
networkName: c.networkName, networkName: c.networkName,
}); });
var storage = new Storage(config.storage); var storage = new Storage(walletConfig.storage);
var network = new Network(config.network); var network = new Network(walletConfig.network);
var blockchain = new Blockchain(config.blockchain); var blockchain = new Blockchain(walletConfig.blockchain);
c.storage = storage; c.storage = storage;
c.network = network; c.network = network;
c.blockchain = blockchain; c.blockchain = blockchain;
@ -86,8 +85,8 @@ describe('PayPro (in Wallet) model', function() {
} }
}; };
c.networkName = config.networkName; c.networkName = walletConfig.networkName;
c.verbose = config.verbose; c.verbose = walletConfig.verbose;
c.version = '0.0.1'; c.version = '0.0.1';
return new Wallet(c); return new Wallet(c);