1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

repl: don't override all internal repl defaults

Browse Source 
The createInternalRepl() module accepts an options object as an
argument. However, if one is provided, it overrides all of the
default options. This commit applies the options object to the
defaults, only changing the values that are explicitly set.

PR-URL: https://github.com/nodejs/node/pull/7826
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
cjihrig 2016-07-21 13:17:07 -04:00
parent f18b1c91b8
commit 2d4a521d58
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/internal/repl.js
View File

@ -5,7 +5,8 @@ const REPL = require('repl');
const path = require('path');
const fs = require('fs');
const os = require('os');
const debug = require('util').debuglog('repl');
const util = require('util');
const debug = util.debuglog('repl');
module.exports = Object.create(REPL);
module.exports.createInternalRepl = createRepl;
@ -19,12 +20,12 @@ function createRepl(env, opts, cb) {
cb = opts;
opts = null;
}
opts = opts || {
opts = util._extend({
ignoreUndefined: false,
terminal: process.stdout.isTTY,
useGlobal: true,
breakEvalOnSigint: true
};
}, opts);
if (parseInt(env.NODE_NO_READLINE)) {
opts.terminal = false;

6
test/parallel/test-repl-envvars.js
View File

@ -2,7 +2,7 @@
// Flags: --expose-internals
require('../common');
const common = require('../common');
const stream = require('stream');
const REPL = require('internal/repl');
const assert = require('assert');
@ -46,6 +46,10 @@ function run(test) {
REPL.createInternalRepl(env, opts, function(err, repl) {
if (err) throw err;
// The REPL registers 'module' and 'require' globals
common.allowGlobals(repl.context.module, repl.context.require);
assert.equal(expected.terminal, repl.terminal,
'Expected ' + inspect(expected) + ' with ' + inspect(env));
assert.equal(expected.useColors, repl.useColors,

4
test/parallel/test-repl-history-perm.js
View File

@ -35,6 +35,10 @@ const replHistoryPath = path.join(common.tmpDir, '.node_repl_history');
const checkResults = common.mustCall(function(err, r) {
if (err)
throw err;
// The REPL registers 'module' and 'require' globals
common.allowGlobals(r.context.module, r.context.require);
r.input.end();
const stat = fs.statSync(replHistoryPath);
assert.strictEqual(

3
test/parallel/test-repl-persistent-history.js
View File

@ -262,6 +262,9 @@ function runTest(assertCleaned) {
throw err;
}
// The REPL registers 'module' and 'require' globals
common.allowGlobals(repl.context.module, repl.context.require);
repl.once('close', () => {
if (repl._flushing) {
repl.once('flushHistory', onClose);

5
test/parallel/test-repl-use-global.js
View File

@ -7,8 +7,6 @@ const stream = require('stream');
const repl = require('internal/repl');
const assert = require('assert');
common.globalCheck = false;
// Array of [useGlobal, expectedResult] pairs
const globalTestCases = [
[false, 'undefined'],
@ -20,6 +18,9 @@ const globalTest = (useGlobal, cb, output) => (err, repl) => {
if (err)
return cb(err);
// The REPL registers 'module' and 'require' globals
common.allowGlobals(repl.context.module, repl.context.require);
let str = '';
output.on('data', (data) => (str += data));
global.lunch = 'tacos';