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

fix: ensure correct WebContents when checking PDFReadyToPrint (32-x-y) (#44011)

Browse source 
* fix: ensure correct `WebContents` when checking `PDFReadyToPrint` (#43943)

* fix: ensure correct WebContents when checking PDFReadyToPrint

* test: fix paths on Windows

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update spec/api-web-contents-spec.ts

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2024-09-29 15:38:22 +02:00 • committed by GitHub
commit e69f5bc850
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 58 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

43
spec/api-web-contents-spec.ts
View file

@ -3,6 +3,7 @@ import { AddressInfo } from 'node:net';
import * as path from 'node:path';
import * as fs from 'node:fs';
import * as http from 'node:http';
import * as url from 'node:url';
import { BrowserWindow, ipcMain, webContents, session, app, BrowserView, WebContents } from 'electron/main';
import { closeAllWindows } from './lib/window-helpers';
import { ifdescribe, defer, waitUntil, listen, ifit } from './lib/spec-helpers';
@ -11,7 +12,6 @@ import { setTimeout } from 'node:timers/promises';
const pdfjs = require('pdfjs-dist');
const fixturesPath = path.resolve(__dirname, 'fixtures');
const mainFixturesPath = path.resolve(__dirname, 'fixtures');
const features = process._linkedBinding('electron_common_features');
describe('webContents module', () => {
@ -1133,7 +1133,7 @@ describe('webContents module', () => {
}).to.throw('\'icon\' parameter is required');
expect(() => {
w.webContents.startDrag({ file: __filename, icon: path.join(mainFixturesPath, 'blank.png') });
w.webContents.startDrag({ file: __filename, icon: path.join(fixturesPath, 'blank.png') });
}).to.throw(/Failed to load image from path (.+)/);
});
});
@ -2431,6 +2431,45 @@ describe('webContents module', () => {
const { items } = await page.getTextContent();
expect(containsText(items, /Cat: The Ideal Pet/)).to.be.true();
});
it('from an existing pdf document in a WebView', async () => {
const win = new BrowserWindow({
show: false,
webPreferences: {
webviewTag: true
}
});
await win.loadURL('about:blank');
const webContentsCreated = once(app, 'web-contents-created') as Promise<[any, WebContents]>;
const src = url.format({
pathname: `${fixturesPath.replaceAll('\\', '/')}/cat.pdf`,
protocol: 'file',
slashes: true
});
await win.webContents.executeJavaScript(`
new Promise((resolve, reject) => {
const webview = new WebView()
webview.setAttribute('src', '${src}')
document.body.appendChild(webview)
webview.addEventListener('did-finish-load', () => {
resolve()
})
})
`);
const [, webContents] = await webContentsCreated;
await once(webContents, '-pdf-ready-to-print');
const data = await webContents.printToPDF({});
const doc = await pdfjs.getDocument(data).promise;
expect(doc.numPages).to.equal(2);
const page = await doc.getPage(1);
const { items } = await page.getTextContent();
expect(containsText(items, /Cat: The Ideal Pet/)).to.be.true();
});
});
describe('PictureInPicture video', () => {