diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js index 8d4f6fd8..fbb7ee44 100755 --- a/bin/cloudcmd.js +++ b/bin/cloudcmd.js @@ -49,9 +49,9 @@ const args = require('minimist')(argv.slice(2), { root : config('root') || '/', prefix : config('prefix') || '', progress : config('progress'), - console : defaultTrue(config('console')), + console : config('console'), - 'config-dialog': defaultTrue(config('configDialog')), + 'config-dialog': config('configDialog'), 'one-panel-mode': config('onePanelMode'), }, alias: { @@ -116,13 +116,6 @@ if (args.version) { }); } -function defaultTrue(value) { - if (typeof value === 'undefined') - return true; - - return value; -} - function validateRoot(root) { const validate = require('../lib/server/validate'); validate.root(root, console.log); diff --git a/lib/cloudcmd.js b/lib/cloudcmd.js index dd181fa6..349056bd 100644 --- a/lib/cloudcmd.js +++ b/lib/cloudcmd.js @@ -78,12 +78,22 @@ module.exports = function(params) { config(name, value); }); + config('console', defaultTrue(options.console)); + config('configDialog', defaultTrue(options.configDialog)); + if (p.socket) listen(prefix, p.socket); return cloudcmd(prefix); }; +function defaultTrue(value) { + if (typeof value === 'undefined') + return true; + + return value; +} + function authCheck(socket, success) { if (!config('auth')) return success(); diff --git a/test/console.js b/test/console.js index 712d4ae9..0e7d6bc3 100644 --- a/test/console.js +++ b/test/console.js @@ -5,6 +5,19 @@ const io = require('socket.io-client'); const before = require('./before'); +test('cloudcmd: console: enabled by default', (t) => { + before({}, (port, after) => { + const socket = io(`http://localhost:${port}/console`) + + socket.once('data', (data) => { + socket.close(); + t.equal(data, 'client #1 console connected\n', 'should emit data event'); + after(); + t.end(); + }); + }); +}); + test('cloudcmd: console: enabled', (t) => { const config = {console: true}; diff --git a/test/rest/config.js b/test/rest/config.js index 249435e5..8b187f2d 100644 --- a/test/rest/config.js +++ b/test/rest/config.js @@ -99,3 +99,22 @@ test('cloudcmd: rest: config: patch: no configDialog: statusCode', (t) => { }); }); +test('cloudcmd: rest: config: enabled by default', (t) => { + before({}, (port, after) => { + const json = { + auth: false, + }; + + patch(`http://localhost:${port}/api/v1/config`, json) + .then(warp(_pullout, 'string')) + .then((result) => { + t.equal(result, 'config: ok("auth")', 'should patch config'); + t.end(); + after(); + }) + .catch((error) => { + console.log(error); + }); + }); +}); +