Use ES6 template strings, fix docs and remove _ERROR_ IPC event

This commit is contained in:
Samuel Attard 2016-10-24 18:19:45 +11:00 committed by Kevin Sawicki
parent 857e1da6a3
commit 9f18a6e65c
4 changed files with 10 additions and 12 deletions

View file

@ -1463,9 +1463,9 @@ describe('browser-window module', function () {
describe('window.webContents.executeJavaScript', function () {
var expected = 'hello, world!'
var expectedErrorMsg = 'woops!'
var code = '(() => "' + expected + '")()'
var asyncCode = '(() => new Promise(r => setTimeout(() => r("' + expected + '"), 500)))()'
var badAsyncCode = '(() => new Promise((r, e) => setTimeout(() => e("' + expectedErrorMsg + '"), 500)))()'
var code = `(() => "${expected}")()`
var asyncCode = `(() => new Promise(r => setTimeout(() => r("${expected}"), 500)))()`
var badAsyncCode = `(() => new Promise((r, e) => setTimeout(() => e("${expectedErrorMsg}"), 500)))()`
it('doesnt throw when no calback is provided', function () {
const result = ipcRenderer.sendSync('executeJavaScript', code, false)