update
This commit is contained in:
+225
-3
@@ -31,6 +31,7 @@ test('merge()', function (t) {
|
||||
t.deepEqual(noOptionsNonObjectSource, { foo: 'baz', bar: true });
|
||||
|
||||
var func = function f() {};
|
||||
func();
|
||||
t.deepEqual(
|
||||
utils.merge(func, { foo: 'bar' }),
|
||||
[func, { foo: 'bar' }],
|
||||
@@ -64,6 +65,7 @@ test('merge()', function (t) {
|
||||
observed[0] = observed[0]; // eslint-disable-line no-self-assign
|
||||
st.equal(setCount, 1);
|
||||
st.equal(getCount, 2);
|
||||
|
||||
st.end();
|
||||
}
|
||||
);
|
||||
@@ -77,6 +79,7 @@ test('merge()', function (t) {
|
||||
s2t.ok(utils.isOverflow(overflow), 'overflow object is marked');
|
||||
var merged = utils.merge(overflow, 'd');
|
||||
s2t.deepEqual(merged, { 0: 'a', 1: 'b', 2: 'c', 3: 'd' }, 'adds primitive at next numeric index');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
@@ -92,6 +95,7 @@ test('merge()', function (t) {
|
||||
var obj = { foo: 'bar' };
|
||||
var merged = utils.merge(obj, 'baz');
|
||||
s2t.deepEqual(merged, { foo: 'bar', baz: true }, 'adds primitive as key with value true');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
@@ -109,6 +113,17 @@ test('merge()', function (t) {
|
||||
var merged = utils.merge('c', overflow);
|
||||
s2t.ok(utils.isOverflow(merged), 'result is also marked as overflow');
|
||||
s2t.deepEqual(merged, { 0: 'c', 1: 'a', 2: 'b' }, 'creates object with primitive at 0, source values shifted');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('merges overflow object into primitive with plainObjects', function (s2t) {
|
||||
var overflow = utils.combine(['a'], 'b', 0, false);
|
||||
s2t.ok(utils.isOverflow(overflow), 'overflow object is marked');
|
||||
var merged = utils.merge('c', overflow, { plainObjects: true });
|
||||
s2t.ok(utils.isOverflow(merged), 'result is also marked as overflow');
|
||||
s2t.deepEqual(merged, { __proto__: null, 0: 'c', 1: 'a', 2: 'b' }, 'creates null-proto object with primitive at 0');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
@@ -118,6 +133,7 @@ test('merge()', function (t) {
|
||||
s2t.ok(utils.isOverflow(overflow), 'overflow object is marked');
|
||||
var merged = utils.merge('a', overflow);
|
||||
s2t.deepEqual(merged, { 0: 'a', 1: 'b', 2: 'c', 3: 'd' }, 'shifts all source indices by 1');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
@@ -125,6 +141,95 @@ test('merge()', function (t) {
|
||||
var obj = { foo: 'bar' };
|
||||
var merged = utils.merge('a', obj);
|
||||
s2t.deepEqual(merged, ['a', { foo: 'bar' }], 'creates array with primitive and object');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('merges primitive into array that exceeds arrayLimit', function (s2t) {
|
||||
var arr = ['a', 'b', 'c'];
|
||||
var merged = utils.merge(arr, 'd', { arrayLimit: 1 });
|
||||
s2t.ok(utils.isOverflow(merged), 'result is marked as overflow');
|
||||
s2t.deepEqual(merged, { 0: 'a', 1: 'b', 2: 'c', 3: 'd' }, 'converts to overflow object with primitive appended');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('merges array into primitive that exceeds arrayLimit', function (s2t) {
|
||||
var merged = utils.merge('a', ['b', 'c'], { arrayLimit: 1 });
|
||||
s2t.ok(utils.isOverflow(merged), 'result is marked as overflow');
|
||||
s2t.deepEqual(merged, { 0: 'a', 1: 'b', 2: 'c' }, 'converts to overflow object');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('merges primitive into array at the arrayLimit boundary, consistently with combine', function (s2t) {
|
||||
var merged = utils.merge(['a'], 'b', { arrayLimit: 1 });
|
||||
s2t.ok(utils.isOverflow(merged), 'result is marked as overflow at the boundary');
|
||||
s2t.deepEqual(merged, { 0: 'a', 1: 'b' }, 'converts to overflow object instead of a length-2 array');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('merges two arrays that exceed arrayLimit into an overflow object', function (s2t) {
|
||||
var merged = utils.merge(['a'], ['b'], { arrayLimit: 1 });
|
||||
s2t.ok(utils.isOverflow(merged), 'result is marked as overflow');
|
||||
s2t.deepEqual(merged, { 0: 'a', 1: 'b' }, 'array-into-array merge enforces arrayLimit like combine');
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('throws at the arrayLimit boundary when merging a primitive into an array with throwOnLimitExceeded', function (s2t) {
|
||||
s2t['throws'](
|
||||
function () { utils.merge(['a'], 'b', { arrayLimit: 1, throwOnLimitExceeded: true }); },
|
||||
new RangeError('Array limit exceeded. Only 1 element allowed in an array.'),
|
||||
'throws when the resulting length would exceed arrayLimit'
|
||||
);
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('throws when merging two arrays past arrayLimit with throwOnLimitExceeded', function (s2t) {
|
||||
s2t['throws'](
|
||||
function () { utils.merge(['a'], ['b'], { arrayLimit: 1, throwOnLimitExceeded: true }); },
|
||||
new RangeError('Array limit exceeded. Only 1 element allowed in an array.'),
|
||||
'array-into-array merge throws rather than silently exceeding arrayLimit'
|
||||
);
|
||||
s2t['throws'](
|
||||
function () { utils.merge(['a', 'b', 'c'], ['d', 'e', 'f'], { arrayLimit: 2, throwOnLimitExceeded: true }); },
|
||||
new RangeError('Array limit exceeded. Only 2 elements allowed in an array.'),
|
||||
'uses the plural message when arrayLimit is not 1'
|
||||
);
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('throws instead of merging primitive into over-limit array when throwOnLimitExceeded is set', function (s2t) {
|
||||
s2t['throws'](
|
||||
function () { utils.merge(['a', 'b', 'c'], 'd', { arrayLimit: 1, throwOnLimitExceeded: true }); },
|
||||
new RangeError('Array limit exceeded. Only 1 element allowed in an array.'),
|
||||
'throws rather than converting to an overflow object'
|
||||
);
|
||||
s2t['throws'](
|
||||
function () { utils.merge(['a', 'b', 'c'], 'd', { arrayLimit: 2, throwOnLimitExceeded: true }); },
|
||||
new RangeError('Array limit exceeded. Only 2 elements allowed in an array.'),
|
||||
'uses the plural message when arrayLimit is not 1'
|
||||
);
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('throws instead of merging array into primitive when throwOnLimitExceeded is set', function (s2t) {
|
||||
s2t['throws'](
|
||||
function () { utils.merge('a', ['b', 'c'], { arrayLimit: 1, throwOnLimitExceeded: true }); },
|
||||
new RangeError('Array limit exceeded. Only 1 element allowed in an array.'),
|
||||
'throws rather than converting to an overflow object'
|
||||
);
|
||||
s2t['throws'](
|
||||
function () { utils.merge('a', ['b', 'c', 'd'], { arrayLimit: 2, throwOnLimitExceeded: true }); },
|
||||
new RangeError('Array limit exceeded. Only 2 elements allowed in an array.'),
|
||||
'uses the plural message when arrayLimit is not 1'
|
||||
);
|
||||
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
@@ -249,6 +354,47 @@ test('combine()', function (t) {
|
||||
st.end();
|
||||
});
|
||||
|
||||
t.test('with throwOnLimitExceeded', function (st) {
|
||||
st.test('throws when concatenation exceeds the limit', function (s2t) {
|
||||
s2t['throws'](
|
||||
function () { utils.combine(['a', 'b', 'c'], 'd', 3, false, true); },
|
||||
new RangeError('Array limit exceeded. Only 3 elements allowed in an array.'),
|
||||
'throws instead of converting to an overflow object'
|
||||
);
|
||||
s2t['throws'](
|
||||
function () { utils.combine([], 'a', 0, false, true); },
|
||||
new RangeError('Array limit exceeded. Only 0 elements allowed in an array.'),
|
||||
'throws with the correct count at arrayLimit 0'
|
||||
);
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('throws when adding to an existing overflow object', function (s2t) {
|
||||
var overflow = utils.combine(['a', 'b'], 'c', 0, false);
|
||||
s2t.ok(utils.isOverflow(overflow), 'initial object is marked as overflow');
|
||||
|
||||
s2t['throws'](
|
||||
function () { utils.combine(overflow, 'd', 0, false, true); },
|
||||
new RangeError('Array limit exceeded. Only 0 elements allowed in an array.'),
|
||||
'throws rather than appending to the overflow object'
|
||||
);
|
||||
s2t['throws'](
|
||||
function () { utils.combine(overflow, 'd', 1, false, true); },
|
||||
new RangeError('Array limit exceeded. Only 1 element allowed in an array.'),
|
||||
'uses the singular message at arrayLimit 1'
|
||||
);
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.test('does not throw when within the limit', function (s2t) {
|
||||
var combined = utils.combine(['a'], 'b', 5, false, true);
|
||||
s2t.deepEqual(combined, ['a', 'b'], 'returns the array unchanged when under the limit');
|
||||
s2t.end();
|
||||
});
|
||||
|
||||
st.end();
|
||||
});
|
||||
|
||||
t.test('with existing overflow object', function (st) {
|
||||
st.test('adds to existing overflow object at next index', function (s2t) {
|
||||
// Create overflow object first via combine: 3 elements (indices 0-2) with limit 0
|
||||
@@ -347,6 +493,79 @@ test('encode', function (t) {
|
||||
'encodes a long string'
|
||||
);
|
||||
|
||||
var boundary = '';
|
||||
var expected = '';
|
||||
for (var j = 0; j < 1023; j++) {
|
||||
boundary += 'a';
|
||||
expected += 'a';
|
||||
}
|
||||
boundary += '😀';
|
||||
expected += '%F0%9F%98%80';
|
||||
|
||||
t.equal(
|
||||
utils.encode(boundary),
|
||||
expected,
|
||||
'encodes a surrogate pair split across long-string chunks'
|
||||
);
|
||||
|
||||
var laterBoundary = '';
|
||||
var laterExpected = '';
|
||||
for (var k = 0; k < 2047; k++) {
|
||||
laterBoundary += 'a';
|
||||
laterExpected += 'a';
|
||||
}
|
||||
laterBoundary += '😀';
|
||||
laterExpected += '%F0%9F%98%80';
|
||||
|
||||
t.equal(
|
||||
utils.encode(laterBoundary),
|
||||
laterExpected,
|
||||
'encodes a surrogate pair split across a later chunk boundary'
|
||||
);
|
||||
|
||||
var twoPairs = '';
|
||||
for (k = 0; k < 1023; k++) {
|
||||
twoPairs += 'a';
|
||||
}
|
||||
twoPairs += '😀';
|
||||
for (k = 0; k < 1022; k++) {
|
||||
twoPairs += 'b';
|
||||
}
|
||||
twoPairs += '😀';
|
||||
|
||||
t.equal(
|
||||
(utils.encode(twoPairs).match(/%F0%9F%98%80/g) || []).length,
|
||||
2,
|
||||
'encodes two surrogate pairs each split across a chunk boundary'
|
||||
);
|
||||
|
||||
var roundTrip = '';
|
||||
for (k = 0; k < 1023; k++) {
|
||||
roundTrip += 'a';
|
||||
}
|
||||
roundTrip += '😀';
|
||||
|
||||
t.equal(
|
||||
decodeURIComponent(utils.encode(roundTrip)),
|
||||
roundTrip,
|
||||
'a boundary-split surrogate pair round-trips through decodeURIComponent'
|
||||
);
|
||||
|
||||
var loneBoundary = '';
|
||||
var loneExpected = '';
|
||||
for (k = 0; k < 1023; k++) {
|
||||
loneBoundary += 'a';
|
||||
loneExpected += 'a';
|
||||
}
|
||||
loneBoundary += '\uD83DX';
|
||||
loneExpected += '%F0%9F%91%98';
|
||||
|
||||
t.equal(
|
||||
utils.encode(loneBoundary),
|
||||
loneExpected,
|
||||
'a lone high surrogate at a chunk boundary encodes the same as mid-chunk'
|
||||
);
|
||||
|
||||
t.equal(
|
||||
utils.encode('\x28\x29'),
|
||||
'%28%29',
|
||||
@@ -376,7 +595,9 @@ test('encode', function (t) {
|
||||
});
|
||||
|
||||
test('isBuffer()', function (t) {
|
||||
forEach([null, undefined, true, false, '', 'abc', 42, 0, NaN, {}, [], function () {}, /a/g], function (x) {
|
||||
var fn = function () {};
|
||||
fn();
|
||||
forEach([null, undefined, true, false, '', 'abc', 42, 0, NaN, {}, [], fn, /a/g], function (x) {
|
||||
t.equal(utils.isBuffer(x), false, inspect(x) + ' is not a buffer');
|
||||
});
|
||||
|
||||
@@ -386,8 +607,9 @@ test('isBuffer()', function (t) {
|
||||
var saferBuffer = SaferBuffer.from('abc');
|
||||
t.equal(utils.isBuffer(saferBuffer), true, 'SaferBuffer instance is a buffer');
|
||||
|
||||
var buffer = Buffer.from && Buffer.alloc ? Buffer.from('abc') : new Buffer('abc');
|
||||
t.equal(utils.isBuffer(buffer), true, 'real Buffer instance is a buffer');
|
||||
var buffer = SaferBuffer.from('abc');
|
||||
t.notEqual(saferBuffer, buffer, 'different buffer instances');
|
||||
t.equal(utils.isBuffer(buffer), true, 'another Buffer instance is a buffer');
|
||||
t.end();
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user