fix: ipcRemote.sendSync regression after moving away from JSON for return values (#13997)

This commit is contained in:
trop[bot] 2018-08-09 09:24:10 -05:00 committed by Charles Kerr
parent 1f430259ce
commit 3d89185396
4 changed files with 5 additions and 2 deletions

View file

@ -3,7 +3,6 @@
'use strict'
const {send, sendSync} = binding
const {parse} = JSON
const ipcRenderer = {
send (...args) {
@ -11,7 +10,7 @@ const ipcRenderer = {
},
sendSync (...args) {
return parse(sendSync('ipc-message-sync', args))
return sendSync('ipc-message-sync', args)[0]
},
// No-ops since events aren't received

View file

@ -3072,6 +3072,7 @@ describe('BrowserWindow module', () => {
typeofFunctionApply: 'function'
},
pageContext: {
openedLocation: '',
preloadProperty: 'undefined',
pageProperty: 'string',
typeofRequire: 'undefined',

View file

@ -9,9 +9,11 @@
Function.prototype.apply = true
const opened = window.open()
const openedLocation = opened.location
opened.close()
window.postMessage({
openedLocation,
preloadProperty: typeof window.foo,
pageProperty: typeof window.hello,
typeofRequire: typeof require,

View file

@ -527,6 +527,7 @@ describe('<webview> tag', function () {
typeofFunctionApply: 'function'
},
pageContext: {
openedLocation: '',
preloadProperty: 'undefined',
pageProperty: 'string',
typeofRequire: 'undefined',