fix: throw error when inserting menu items out-of-range (backport: 5-0-x) (#17435)

* fix: throw error when inserting menu items out-of-range

* also check pos < 0
This commit is contained in:
trop[bot]
2019-03-19 12:12:49 -07:00
committed by Samuel Attard
parent 7912ea5950
commit 361e5b2c55
2 changed files with 24 additions and 0 deletions

View File

@@ -109,6 +109,12 @@ Menu.prototype.insert = function (pos, item) {
throw new TypeError('Invalid item')
}
if (pos < 0) {
throw new RangeError(`Position ${pos} cannot be less than 0`)
} else if (pos > this.getItemCount()) {
throw new RangeError(`Position ${pos} cannot be greater than the total MenuItem count`)
}
// insert item depending on its type
insertItemByType.call(this, item, pos)

View File

@@ -688,6 +688,24 @@ describe('Menu module', () => {
})
describe('Menu.insert', () => {
it('should throw when attempting to insert at out-of-range indices', () => {
const menu = Menu.buildFromTemplate([
{ label: '1' },
{ label: '2' },
{ label: '3' }
])
const item = new MenuItem({ label: 'badInsert' })
expect(() => {
menu.insert(9999, item)
}).to.throw(/Position 9999 cannot be greater than the total MenuItem count/)
expect(() => {
menu.insert(-9999, item)
}).to.throw(/Position -9999 cannot be less than 0/)
})
it('should store item in @items by its index', () => {
const menu = Menu.buildFromTemplate([
{ label: '1' },