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

🔧 Alex has good ideas

Browse source
This commit is contained in:
Felix Rieseberg 2017-11-18 10:59:09 -08:00
parent cf7e9df3a0
commit 5b18bea7e3
2 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/browser/api/web-contents.js
View file

@ -130,13 +130,9 @@ const asyncWebFrameMethods = function (requestId, method, callback, ...args) {
if (typeof callback === 'function') callback(result)
resolve(result)
} else {
if (error && error.__ELECTRON_SERIALIZED_ERROR__) {
let rehydratedError = error
if (errorConstructors[error.name]) {
rehydratedError = new errorConstructors[error.name](error.message)
rehydratedError.stack = error.stack
}
if (error.__ELECTRON_SERIALIZED_ERROR__ && errorConstructors[error.name]) {
const rehydratedError = new errorConstructors[error.name](error.message)
rehydratedError.stack = error.stack
reject(rehydratedError)
} else {

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

@ -2514,15 +2514,15 @@ describe('BrowserWindow module', () => {
const code = `(() => "${expected}")()`
const asyncCode = `(() => new Promise(r => setTimeout(() => r("${expected}"), 500)))()`
const badAsyncCode = `(() => new Promise((r, e) => setTimeout(() => e("${expectedErrorMsg}"), 500)))()`
const errorCodes = {
Error: 'Promise.reject(new Error("Wamp-wamp"))',
ReferenceError: 'Promise.reject(new ReferenceError("Wamp-wamp"))',
EvalError: 'Promise.reject(new EvalError("Wamp-wamp"))',
RangeError: 'Promise.reject(new RangeError("Wamp-wamp"))',
SyntaxError: 'Promise.reject(new SyntaxError("Wamp-wamp"))',
TypeError: 'Promise.reject(new TypeError("Wamp-wamp"))',
URIError: 'Promise.reject(new URIError("Wamp-wamp"))'
}
const errorTypes = new Set([
Error,
ReferenceError,
EvalError,
RangeError,
SyntaxError,
TypeError,
URIError
])
it('doesnt throw when no calback is provided', () => {
const result = ipcRenderer.sendSync('executeJavaScript', code, false)
@ -2571,11 +2571,11 @@ describe('BrowserWindow module', () => {
})
})
it('rejects the returned promise with an error if an Error.prototype is thrown', async () => {
for (const errorKey in errorCodes) {
for (const error in errorTypes) {
await new Promise((resolve) => {
ipcRenderer.send('executeJavaScript', errorCodes[errorKey], true)
ipcRenderer.send('executeJavaScript', `Promise.reject(new ${error.name}("Wamp-wamp")`, true)
ipcRenderer.once('executeJavaScript-promise-error-name', (event, name) => {
assert.equal(name, errorKey)
assert.equal(name, error.name)
resolve()
})
})