mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Update blur parent window spec

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-13 18:22:57 -08:00 • committed by Kevin Sawicki
parent 35908ac398
commit 86007fe61d
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spec/api-web-contents-spec.js
View file

@ -310,14 +310,16 @@ describe('webContents module', function () {
}) })
describe('focus()', function () { describe('focus()', function () {
it('focuses the parent window', function (done) { describe('when the web contents is hidden', function () {
ipcMain.once('answer', (event, visible, focused) => { it('does not blur the focused window', function (done) {
assert.equal(visible, true) ipcMain.once('answer', (event, parentFocused, childFocused) => {
assert.equal(focused, true) assert.equal(parentFocused, true)
assert.equal(childFocused, false)
done() done()
}) })
w.show() w.show()
w.loadURL('file://' + path.join(__dirname, 'fixtures', 'pages', 'focus-web-contents.html')) w.loadURL('file://' + path.join(__dirname, 'fixtures', 'pages', 'focus-web-contents.html'))
}) })
}) })
})
}) })

14
spec/fixtures/pages/focus-web-contents.html vendored
View file

@ -6,16 +6,16 @@
<script> <script>
const {ipcRenderer, remote} = require('electron') const {ipcRenderer, remote} = require('electron')
remote.getCurrentWindow().focus()
const child = new remote.BrowserWindow({show: false}) const child = new remote.BrowserWindow({show: false})
child.loadURL('about:blank')
child.webContents.focus()
remote.getCurrentWindow().once('blur', () => { const currentFocused = remote.getCurrentWindow().isFocused()
ipcRenderer.send('answer', child.isVisible(), child.isFocused()) const childFocused = child.isFocused()
child.close() child.close()
}) ipcRenderer.send('answer', currentFocused, childFocused)
child.webContents.focus()
child.show()
child.webContents.focus()
</script> </script>
</head> </head>
<body> <body>