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

openedWindow -> popupWindow

Browse source
This commit is contained in:
Kevin Sawicki 2016-09-30 08:54:19 -07:00
parent 766f5afabd
commit d942694695
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
spec/api-browser-window-spec.js
View file

@ -698,7 +698,7 @@ describe('browser-window module', function () {
}) })
let htmlPath = path.join(fixtures, 'api', 'sandbox.html?window-open-external') let htmlPath = path.join(fixtures, 'api', 'sandbox.html?window-open-external')
const pageUrl = 'file://' + htmlPath const pageUrl = 'file://' + htmlPath
let openedWindow let popupWindow
w.loadURL(pageUrl) w.loadURL(pageUrl)
w.webContents.once('new-window', (e, url, frameName, disposition, options) => { w.webContents.once('new-window', (e, url, frameName, disposition, options) => {
assert.equal(url, 'http://www.google.com/#q=electron') assert.equal(url, 'http://www.google.com/#q=electron')
@ -712,15 +712,18 @@ describe('browser-window module', function () {
ipcMain.once('answer', function (event, exceptionMessage) { ipcMain.once('answer', function (event, exceptionMessage) {
assert(/Blocked a frame with origin/.test(exceptionMessage)) assert(/Blocked a frame with origin/.test(exceptionMessage))
// FIXME this opened window should be closed in sandbox.html // FIXME this popup window should be closed in sandbox.html
closeWindow(openedWindow).then(done) closeWindow(popupWindow).then(() => {
popupWindow = null
done()
})
}) })
w.webContents.send('child-loaded') w.webContents.send('child-loaded')
}) })
}) })
app.once('browser-window-created', function (event, window) { app.once('browser-window-created', function (event, window) {
openedWindow = window popupWindow = window
}) })
}) })