Skip to content

Commit 927974e

Browse files
committedNov 14, 2018
Update lab 18
1 parent bcfa947 commit 927974e

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed
 

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {},
1111
"devDependencies": {
1212
"code": "5.x.x",
13-
"lab": "17.x.x"
13+
"lab": "18.x.x"
1414
},
1515
"scripts": {
1616
"test": "lab -a code -t 100 -L",

‎test/index.js

+16-1
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,14 @@ describe('merge()', () => {
554554
expect(a.x.toString()).to.equal('abc');
555555
});
556556

557+
it('overrides RegExp', () => {
558+
559+
const a = { x: /test/ };
560+
561+
Hoek.merge({ x: {} }, a);
562+
expect(a.x).to.equal(/test/);
563+
});
564+
557565
it('skips __proto__', () => {
558566

559567
const a = '{ "ok": "value", "__proto__": { "test": "value" } }';
@@ -1098,6 +1106,7 @@ describe('deepEqual()', () => {
10981106
expect(Hoek.deepEqual(new Map([[1, {}]]), new Map([[1, {}]]))).to.be.true();
10991107
expect(Hoek.deepEqual(new Map([[1, item1]]), new Map([[1, item1]]))).to.be.true();
11001108
expect(Hoek.deepEqual(new Map([[1, item1]]), new Map([[1, item2]]))).to.be.false();
1109+
expect(Hoek.deepEqual(new Map([[1, undefined]]), new Map([[1, undefined]]))).to.be.true();
11011110
expect(Hoek.deepEqual(new Map([[1, undefined]]), new Map([[2, undefined]]))).to.be.false();
11021111
expect(Hoek.deepEqual(new Map([[1, {}]]), new Map([[1, {}], [2, {}]]))).to.be.false();
11031112
expect(Hoek.deepEqual(new Map([[item1, 1]]), new Map([[item1, 1]]))).to.be.true();
@@ -1670,7 +1679,8 @@ describe('reach()', () => {
16701679
},
16711680
g: {
16721681
h: 3
1673-
}
1682+
},
1683+
'-2': true
16741684
},
16751685
i: function () { },
16761686
j: null,
@@ -1696,6 +1706,11 @@ describe('reach()', () => {
16961706
expect(Hoek.reach(obj, 'k.-2')).to.equal(9);
16971707
});
16981708

1709+
it('returns object property with negative index for non-array', () => {
1710+
1711+
expect(Hoek.reach(obj, 'a.-2')).to.be.equal(true);
1712+
});
1713+
16991714
it('returns a valid member', () => {
17001715

17011716
expect(Hoek.reach(obj, 'a.b.c.d')).to.equal(1);

0 commit comments

Comments
 (0)
Please sign in to comment.