@@ -554,6 +554,14 @@ describe('merge()', () => {
554
554
expect ( a . x . toString ( ) ) . to . equal ( 'abc' ) ;
555
555
} ) ;
556
556
557
+ it ( 'overrides RegExp' , ( ) => {
558
+
559
+ const a = { x : / t e s t / } ;
560
+
561
+ Hoek . merge ( { x : { } } , a ) ;
562
+ expect ( a . x ) . to . equal ( / t e s t / ) ;
563
+ } ) ;
564
+
557
565
it ( 'skips __proto__' , ( ) => {
558
566
559
567
const a = '{ "ok": "value", "__proto__": { "test": "value" } }' ;
@@ -1098,6 +1106,7 @@ describe('deepEqual()', () => {
1098
1106
expect ( Hoek . deepEqual ( new Map ( [ [ 1 , { } ] ] ) , new Map ( [ [ 1 , { } ] ] ) ) ) . to . be . true ( ) ;
1099
1107
expect ( Hoek . deepEqual ( new Map ( [ [ 1 , item1 ] ] ) , new Map ( [ [ 1 , item1 ] ] ) ) ) . to . be . true ( ) ;
1100
1108
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 ( ) ;
1101
1110
expect ( Hoek . deepEqual ( new Map ( [ [ 1 , undefined ] ] ) , new Map ( [ [ 2 , undefined ] ] ) ) ) . to . be . false ( ) ;
1102
1111
expect ( Hoek . deepEqual ( new Map ( [ [ 1 , { } ] ] ) , new Map ( [ [ 1 , { } ] , [ 2 , { } ] ] ) ) ) . to . be . false ( ) ;
1103
1112
expect ( Hoek . deepEqual ( new Map ( [ [ item1 , 1 ] ] ) , new Map ( [ [ item1 , 1 ] ] ) ) ) . to . be . true ( ) ;
@@ -1670,7 +1679,8 @@ describe('reach()', () => {
1670
1679
} ,
1671
1680
g : {
1672
1681
h : 3
1673
- }
1682
+ } ,
1683
+ '-2' : true
1674
1684
} ,
1675
1685
i : function ( ) { } ,
1676
1686
j : null ,
@@ -1696,6 +1706,11 @@ describe('reach()', () => {
1696
1706
expect ( Hoek . reach ( obj , 'k.-2' ) ) . to . equal ( 9 ) ;
1697
1707
} ) ;
1698
1708
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
+
1699
1714
it ( 'returns a valid member' , ( ) => {
1700
1715
1701
1716
expect ( Hoek . reach ( obj , 'a.b.c.d' ) ) . to . equal ( 1 ) ;
0 commit comments