JS: Added ripple.config.load convenience function.

This commit is contained in:
Stefan Thomas
2013-02-02 14:05:37 +01:00
parent 4e526c78e6
commit 39ba2613d9
12 changed files with 37 additions and 45 deletions

View File

@@ -6,8 +6,7 @@ var Server = require("./server.js").Server;
var testutils = require("./testutils.js");
var extend = require('extend');
extend(require('../src/js/config'), require('./config'));
var config = require('../src/js/config').load(require('./config'));
// How long to wait for server to start.
var serverDelay = 1500; // XXX Not implemented.