From ccde26428275a2e6d6d45ec0256947c9fcc2a9c4 Mon Sep 17 00:00:00 2001 From: Stefan Thomas Date: Sat, 27 Jul 2013 19:47:51 -0700 Subject: [PATCH] JS Tests: Fallback to config-example if config is not present. --- test/account_set-test.js | 3 +-- test/account_tx-test.js | 5 ++--- test/jsonrpc-test.js | 2 +- test/monitor-test.js | 3 +-- test/offer-test.js | 5 ++--- test/path-test.js | 4 ++-- test/remote-test.js | 3 +-- test/send-test.js | 3 +-- test/testutils.js | 15 +++++++++++++++ test/websocket-test.js | 9 +++++---- 10 files changed, 31 insertions(+), 21 deletions(-) diff --git a/test/account_set-test.js b/test/account_set-test.js index 65352c3524..be89b23259 100644 --- a/test/account_set-test.js +++ b/test/account_set-test.js @@ -7,8 +7,7 @@ var Request = require("ripple-lib").Request; var Server = require("./server").Server; var testutils = require("./testutils"); - -var config = require('ripple-lib').config.load(require('./config')); +var config = testutils.init_config(); // How long to wait for server to start. var serverDelay = 1500; diff --git a/test/account_tx-test.js b/test/account_tx-test.js index 6c7a8babec..56b81c64c4 100644 --- a/test/account_tx-test.js +++ b/test/account_tx-test.js @@ -6,9 +6,8 @@ var Remote = require("ripple-lib").Remote; var Transaction = require("ripple-lib").Transaction; var Server = require("./server").Server; -var testutils = require("./testutils"); - -require('ripple-lib').config.load(require('./config')); +var testutils = require("./testutils"); +var config = testutils.init_config(); buster.testRunner.timeout = 350000; //This is a very long test! diff --git a/test/jsonrpc-test.js b/test/jsonrpc-test.js index c19c2636e1..7a6b9d61dd 100644 --- a/test/jsonrpc-test.js +++ b/test/jsonrpc-test.js @@ -10,7 +10,7 @@ var Server = require("./server").Server; var testutils = require("./testutils"); -var config = require('ripple-lib').config.load(require('./config')); +var config = testutils.init_config(); // How long to wait for server to start. var serverDelay = 1500; diff --git a/test/monitor-test.js b/test/monitor-test.js index 342dd7e4fb..e2ef06a738 100644 --- a/test/monitor-test.js +++ b/test/monitor-test.js @@ -6,8 +6,7 @@ var Remote = require("ripple-lib").Remote; var Server = require("./server").Server; var testutils = require("./testutils"); - -require('ripple-lib').config.load(require('./config')); +var config = testutils.init_config(); buster.testRunner.timeout = 5000; diff --git a/test/offer-test.js b/test/offer-test.js index a15f205699..ed015ab7a6 100644 --- a/test/offer-test.js +++ b/test/offer-test.js @@ -7,9 +7,8 @@ var Remote = require("ripple-lib").Remote; var Transaction = require("ripple-lib").Transaction; var Server = require("./server").Server; -var testutils = require("./testutils"); - -require('ripple-lib').config.load(require('./config')); +var testutils = require("./testutils"); +var config = testutils.init_config(); buster.testRunner.timeout = 5000; diff --git a/test/path-test.js b/test/path-test.js index 31aea5f4a6..3616122b3b 100644 --- a/test/path-test.js +++ b/test/path-test.js @@ -6,9 +6,9 @@ var Remote = require("ripple-lib").Remote; var Transaction = require("ripple-lib").Transaction; var Server = require("./server").Server; -var testutils = require("./testutils"); +var testutils = require("./testutils"); +var config = testutils.init_config(); -require('ripple-lib').config.load(require('./config')); buster.testRunner.timeout = 5000; diff --git a/test/remote-test.js b/test/remote-test.js index 841f3df0d0..0b390e3005 100644 --- a/test/remote-test.js +++ b/test/remote-test.js @@ -5,8 +5,7 @@ var Remote = require("ripple-lib").Remote; var Server = require("./server.js").Server; var testutils = require("./testutils.js"); - -var config = require('ripple-lib').config.load(require('./config')); +var config = testutils.init_config(); // How long to wait for server to start. var serverDelay = 1500; // XXX Not implemented. diff --git a/test/send-test.js b/test/send-test.js index dd98c41bc4..15d363ddf5 100644 --- a/test/send-test.js +++ b/test/send-test.js @@ -6,8 +6,7 @@ var Remote = require("ripple-lib").Remote; var Server = require("./server").Server; var testutils = require("./testutils"); - -var config = require('ripple-lib').config.load(require('./config')); +var config = testutils.init_config(); // How long to wait for server to start. var serverDelay = 1500; diff --git a/test/testutils.js b/test/testutils.js index 748363e68e..579d57ed05 100644 --- a/test/testutils.js +++ b/test/testutils.js @@ -218,6 +218,20 @@ var credit_limit = function (remote, src, amount, callback) { } }; +function init_config() { + var cfg; + + // See if the person testing wants to override the configuration by creating a + // file called test/config.js. + try { + cfg = require('./config'); + } catch (e) { + cfg = require('./config-example'); + } + + return require('ripple-lib').config.load(cfg); +} + var verify_limit = function (remote, src, amount, callback) { assert(4 === arguments.length); @@ -486,6 +500,7 @@ exports.build_teardown = build_teardown; exports.create_accounts = create_accounts; exports.credit_limit = credit_limit; exports.credit_limits = credit_limits; +exports.init_config = init_config; exports.ledger_close = ledger_close; exports.payment = payment; exports.payments = payments; diff --git a/test/websocket-test.js b/test/websocket-test.js index e0a9704984..a96bc3bf9d 100644 --- a/test/websocket-test.js +++ b/test/websocket-test.js @@ -1,9 +1,10 @@ -var buster = require("buster"); +var buster = require("buster"); -var Server = require("./server").Server; -var Remote = require("ripple-lib").Remote; +var Server = require("./server").Server; +var Remote = require("ripple-lib").Remote; -var config = require('ripple-lib').config.load(require('./config')); +var testutils = require('./testutils'); +var config = testutils.init_config(); buster.testRunner.timeout = 5000;