Skip to content

Commit

Permalink
Revert to lab 13 style
Browse files Browse the repository at this point in the history
  • Loading branch information
Marsup committed Feb 15, 2018
1 parent 5aed1a8 commit 0cd2a12
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -615,13 +615,14 @@ describe('merge()', () => {
done();
});

it('skips __proto__', () => {
it('skips __proto__', (done) => {

const a = '{ "ok": "value", "__proto__": { "test": "value" } }';

const b = Hoek.merge({}, JSON.parse(a));
expect(b).to.equal({ ok: 'value' });
expect(b.test).to.equal(undefined);
done();
});
});

Expand Down

0 comments on commit 0cd2a12

Please sign in to comment.