github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: will-attach-webview handler modifying params.instanceId does not break <webview> (#32386)

Browse Source
This commit is contained in:
Milan Burda
2022-01-12 08:41:20 +01:00
committed by GitHub
parent cbe68bdbb8
commit 99ee1fc0eb
5 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/static/main.js
View File

@@ -138,6 +138,12 @@ ipcMain.on('prevent-next-will-attach-webview', (event) => {
event.sender.once('will-attach-webview', event => event.preventDefault());
});
ipcMain.on('break-next-will-attach-webview', (event, id) => {
event.sender.once('will-attach-webview', (event, webPreferences, params) => {
params.instanceId = null;
});
});
ipcMain.on('disable-node-on-next-will-attach-webview', (event, id) => {
event.sender.once('will-attach-webview', (event, webPreferences, params) => {
params.src = `file://${path.join(__dirname, '..', 'fixtures', 'pages', 'c.html')}`;

8
spec/webview-spec.js
View File

@@ -1163,6 +1163,14 @@ describe('<webview> tag', function () {
});
});
it('handler modifying params.instanceId does not break <webview>', async () => {
ipcRenderer.send('break-next-will-attach-webview');
await startLoadingWebViewAndWaitForMessage(webview, {
src: `file://${fixtures}/pages/a.html`
});
});
it('supports preventing a webview from being created', async () => {
ipcRenderer.send('prevent-next-will-attach-webview');