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

Add failing spec for cycle in options

Browse source
This commit is contained in:
Kevin Sawicki 2017-01-04 14:44:14 -08:00
parent b942c54bea
commit 12382f064b
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
spec/chromium-spec.js
View file

@ -3,7 +3,7 @@ const http = require('http')
const path = require('path') const path = require('path')
const ws = require('ws') const ws = require('ws')
const url = require('url') const url = require('url')
const remote = require('electron').remote const {ipcRenderer, remote} = require('electron')
const {closeWindow} = require('./window-helpers') const {closeWindow} = require('./window-helpers')
const {BrowserWindow, ipcMain, protocol, session, webContents} = remote const {BrowserWindow, ipcMain, protocol, session, webContents} = remote
@ -187,6 +187,12 @@ describe('chromium feature', function () {
return return
} }
let w = null
afterEach(() => {
return closeWindow(w).then(() => w = null)
})
it('returns a BrowserWindowProxy object', function () { it('returns a BrowserWindowProxy object', function () {
var b = window.open('about:blank', '', 'show=no') var b = window.open('about:blank', '', 'show=no')
assert.equal(b.closed, false) assert.equal(b.closed, false)
@ -260,6 +266,20 @@ describe('chromium feature', function () {
b = window.open('file://' + fixtures + '/pages/window-open-size.html', '', 'show=no,width=' + size.width + ',height=' + size.height) b = window.open('file://' + fixtures + '/pages/window-open-size.html', '', 'show=no,width=' + size.width + ',height=' + size.height)
}) })
it('handles cycles when merging the parent options into the child options', (done) => {
w = BrowserWindow.fromId(ipcRenderer.sendSync('create-window-with-options-cycle'))
w.loadURL('file://' + fixtures + '/pages/window-open.html')
w.webContents.once('new-window', (event, url, frameName, disposition, options) => {
assert.deepEqual(options, {
show: false,
foo: {
bar: null
}
})
done()
})
})
it('defines a window.location getter', function (done) { it('defines a window.location getter', function (done) {
var b, targetURL var b, targetURL
if (process.platform === 'win32') { if (process.platform === 'win32') {

2
spec/fixtures/pages/window-open.html vendored
View file

@ -1,7 +1,7 @@
<html> <html>
<body> <body>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
window.open('http://host', 'host' , 'this-is-not-a-standard-feature'); window.open('http://host', 'host', 'this-is-not-a-standard-feature');
</script> </script>
</body> </body>
</html> </html>

10
spec/static/main.js
View file

@ -230,3 +230,13 @@ ipcMain.on('close-on-will-navigate', (event, id) => {
contents.send('closed-on-will-navigate') contents.send('closed-on-will-navigate')
}) })
}) })
ipcMain.on('create-window-with-options-cycle', (event) => {
// This can't be done over remote since cycles are already
// nulled out at the IPC layer
const foo = {}
foo.bar = foo
const window = new BrowserWindow({show: false, foo: foo})
event.returnValue = window.id
})