merge master into fix-fullscreen-with-resizable-flag.

This commit is contained in:
Vanessa Yuen 2017-09-12 18:33:40 -04:00
commit 9a7d8a0511
2 changed files with 24 additions and 0 deletions

View file

@ -2180,6 +2180,25 @@ describe('BrowserWindow module', function () {
})
})
describe('fullscreen state with resizable set', function () {
// Only implemented on macOS.
if (process.platform !== 'darwin') return
it('resizable flag should be set to true and restored', function (done) {
w.destroy()
w = new BrowserWindow({ resizable: false })
w.once('enter-full-screen', () => {
assert.equal(w.isResizable(), true)
w.setFullScreen(false)
})
w.once('leave-full-screen', () => {
assert.equal(w.isResizable(), false)
done()
})
w.setFullScreen(true)
})
})
describe('fullscreen state', function () {
// Only implemented on macOS.
if (process.platform !== 'darwin') return