From 776977e0dcaf47a81054dcc81d76722ada71f9eb Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Tue, 3 Dec 2019 18:11:32 +0900 Subject: Validate on top-level settings and use pre-compiled ajv --- test/shared/settings/Blacklist.test.ts | 18 ------------------ test/shared/settings/Keymaps.test.ts | 1 - test/shared/settings/Search.test.ts | 13 ------------- 3 files changed, 32 deletions(-) (limited to 'test/shared/settings') diff --git a/test/shared/settings/Blacklist.test.ts b/test/shared/settings/Blacklist.test.ts index 133112c..0112757 100644 --- a/test/shared/settings/Blacklist.test.ts +++ b/test/shared/settings/Blacklist.test.ts @@ -16,16 +16,6 @@ describe('BlacklistItem', () => { expect(item.partial).to.be.true; expect(item.keys).to.deep.equal(['j', 'k']); }); - - it('throws a TypeError', () => { - expect(() => BlacklistItem.fromJSON(null)).to.throw(TypeError); - expect(() => BlacklistItem.fromJSON(100)).to.throw(TypeError); - expect(() => BlacklistItem.fromJSON({})).to.throw(TypeError); - expect(() => BlacklistItem.fromJSON({url: 'google.com'})).to.throw(TypeError); - expect(() => BlacklistItem.fromJSON({keys: ['a']})).to.throw(TypeError); - expect(() => BlacklistItem.fromJSON({url: 'google.com', keys: 10})).to.throw(TypeError); - expect(() => BlacklistItem.fromJSON({url: 'google.com', keys: ['a', 'b', 3]})).to.throw(TypeError); - }); }); describe('#matches', () => { @@ -118,14 +108,6 @@ describe('Blacklist', () => { let blacklist = Blacklist.fromJSON([]); expect(blacklist.toJSON()).to.deep.equals([]); }); - - it('throws a TypeError', () => { - expect(() => Blacklist.fromJSON(null)).to.throw(TypeError); - expect(() => Blacklist.fromJSON(100)).to.throw(TypeError); - expect(() => Blacklist.fromJSON({})).to.throw(TypeError); - expect(() => Blacklist.fromJSON([100])).to.throw(TypeError); - expect(() => Blacklist.fromJSON([{}])).to.throw(TypeError); - }) }); describe('#includesEntireBlacklist', () => { diff --git a/test/shared/settings/Keymaps.test.ts b/test/shared/settings/Keymaps.test.ts index 7896a63..9e4109f 100644 --- a/test/shared/settings/Keymaps.test.ts +++ b/test/shared/settings/Keymaps.test.ts @@ -19,7 +19,6 @@ describe('Keymaps', () => { }); it('throws a TypeError by invalid settings', () => { - expect(() => Keymaps.fromJSON(null)).to.throw(TypeError); expect(() => Keymaps.fromJSON({ k: { type: "invalid.operation" }, })).to.throw(TypeError); diff --git a/test/shared/settings/Search.test.ts b/test/shared/settings/Search.test.ts index 7c9134d..51cd3eb 100644 --- a/test/shared/settings/Search.test.ts +++ b/test/shared/settings/Search.test.ts @@ -26,19 +26,6 @@ describe('Search', () => { }); it('throws a TypeError by invalid settings', () => { - expect(() => Search.fromJSON(null)).to.throw(TypeError); - expect(() => Search.fromJSON({})).to.throw(TypeError); - expect(() => Search.fromJSON([])).to.throw(TypeError); - expect(() => Search.fromJSON({ - default: 123, - engines: {} - })).to.throw(TypeError); - expect(() => Search.fromJSON({ - default: 'google', - engines: { - 'google': 123456, - } - })).to.throw(TypeError); expect(() => Search.fromJSON({ default: 'wikipedia', engines: { -- cgit v1.2.3