diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/assert.js | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/lib/assert.js b/lib/assert.js index 555b38f39e..e336119d92 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -555,12 +555,12 @@ function expectedException(actual, expected, msg) { return expected.call({}, actual) === true; } -function getActual(block) { - if (typeof block !== 'function') { - throw new ERR_INVALID_ARG_TYPE('block', 'Function', block); +function getActual(fn) { + if (typeof fn !== 'function') { + throw new ERR_INVALID_ARG_TYPE('fn', 'Function', fn); } try { - block(); + fn(); } catch (e) { return e; } @@ -577,20 +577,21 @@ function checkIsPromise(obj) { typeof obj.catch === 'function'; } -async function waitForActual(block) { +async function waitForActual(promiseFn) { let resultPromise; - if (typeof block === 'function') { - // Return a rejected promise if `block` throws synchronously. - resultPromise = block(); + if (typeof promiseFn === 'function') { + // Return a rejected promise if `promiseFn` throws synchronously. + resultPromise = promiseFn(); // Fail in case no promise is returned. if (!checkIsPromise(resultPromise)) { throw new ERR_INVALID_RETURN_VALUE('instance of Promise', - 'block', resultPromise); + 'promiseFn', resultPromise); } - } else if (checkIsPromise(block)) { - resultPromise = block; + } else if (checkIsPromise(promiseFn)) { + resultPromise = promiseFn; } else { - throw new ERR_INVALID_ARG_TYPE('block', ['Function', 'Promise'], block); + throw new ERR_INVALID_ARG_TYPE( + 'promiseFn', ['Function', 'Promise'], promiseFn); } try { @@ -676,20 +677,20 @@ function expectsNoError(stackStartFn, actual, error, message) { throw actual; } -assert.throws = function throws(block, ...args) { - expectsError(throws, getActual(block), ...args); +assert.throws = function throws(promiseFn, ...args) { + expectsError(throws, getActual(promiseFn), ...args); }; -assert.rejects = async function rejects(block, ...args) { - expectsError(rejects, await waitForActual(block), ...args); +assert.rejects = async function rejects(promiseFn, ...args) { + expectsError(rejects, await waitForActual(promiseFn), ...args); }; -assert.doesNotThrow = function doesNotThrow(block, ...args) { - expectsNoError(doesNotThrow, getActual(block), ...args); +assert.doesNotThrow = function doesNotThrow(fn, ...args) { + expectsNoError(doesNotThrow, getActual(fn), ...args); }; -assert.doesNotReject = async function doesNotReject(block, ...args) { - expectsNoError(doesNotReject, await waitForActual(block), ...args); +assert.doesNotReject = async function doesNotReject(fn, ...args) { + expectsNoError(doesNotReject, await waitForActual(fn), ...args); }; assert.ifError = function ifError(err) { |