![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 139.0.7258.6 * chore: bump chromium in DEPS to 139.0.7258.5 * chore: bump chromium in DEPS to 140.0.7270.1 * chore: bump chromium in DEPS to 140.0.7271.1 * chore: bump chromium in DEPS to 140.0.7273.0 * chore: bump chromium in DEPS to 140.0.7273.1 * chore: bump chromium in DEPS to 140.0.7275.1 * chore: bump chromium in DEPS to 140.0.7275.4 * chore: bump chromium in DEPS to 140.0.7277.1 * chore: bump chromium in DEPS to 140.0.7279.1 * chore: bump chromium in DEPS to 140.0.7281.1 * chore: bump chromium in DEPS to 140.0.7283.1 * chore: bump chromium in DEPS to 140.0.7285.1 * chore: bump chromium in DEPS to 140.0.7287.1 * chore: bump chromium in DEPS to 140.0.7289.0 * chore: bump chromium in DEPS to 140.0.7289.1 * chore: bump chromium in DEPS to 140.0.7291.1 * chore: bump chromium in DEPS to 140.0.7293.1 * chore: bump chromium in DEPS to 140.0.7295.1 * chore: bump chromium in DEPS to 140.0.7296.0 * chore: bump chromium to 140.0.7281.0 (main) (#47616) cherry picked from603cafad7e
* chore: bump chromium in DEPS to 140.0.7269.2 * chore: bump chromium in DEPS to 140.0.7270.0 * chore: bump chromium in DEPS to 140.0.7271.0 * chore: bump chromium in DEPS to 140.0.7273.0 * 6516731: [ExclusiveAccessForAndroid] remove unneeded includes & deps | https://chromium-review.googlesource.com/c/chromium/src/+/6516731 * 6694809: dbus: Ensure systemd scope is started before using any portal services | https://chromium-review.googlesource.com/c/chromium/src/+/6694809 * chore: patch chromium * chore: export patches * chore: bump chromium in DEPS to 140.0.7275.0 * 6677511: [pepper] More pepper removal | https://chromium-review.googlesource.com/c/chromium/src/+/6677511 * 6513641: [gin] Rename gin::Wrappable to gin::DeprecatedWrappable | https://chromium-review.googlesource.com/c/chromium/src/+/6513641 * chore: export chromium patches * 6513641: [gin] Rename gin::Wrappable to gin::DeprecatedWrappable | https://chromium-review.googlesource.com/c/chromium/src/+/6513641 * chore: bump chromium in DEPS to 140.0.7277.0 * chore: bump chromium in DEPS to 140.0.7279.0 * chore: bump chromium in DEPS to 140.0.7281.0 * 6677314: Plumb enabled client hints in the network requestion to network layer https://chromium-review.googlesource.com/c/chromium/src/+/6677314 * 6351556: [source-phase-imports] Support Wasm Source Phase Imports https://chromium-review.googlesource.com/c/chromium/src/+/6351556 * 6700077: [renderer] Avoid calls to deprecated GetIsolate methods https://chromium-review.googlesource.com/c/chromium/src/+/6700077 * 6692873: Reland "Reland "FSA: Only normalize the hardcoded rules once during initialization"" https://chromium-review.googlesource.com/c/chromium/src/+/6692873 * 6686234: [gin] Cleanup NamedPropertyInterceptor for Wrappable https://chromium-review.googlesource.com/c/chromium/src/+/6686234 * chore: export patches * 6667723: Remove content_enable_legacy_ipc GN arg. https://chromium-review.googlesource.com/c/chromium/src/+/6667723 * 6646566: ui: Move NativeWindowTracker to its own directory https://chromium-review.googlesource.com/c/chromium/src/+/6646566 * fix: add missing includes * 6580522: [WAR, DNR] Fix unsafe redirect error to web accessible resource https://chromium-review.googlesource.com/c/chromium/src/+/6580522 * 6680477: Implement `completeCode` endpoint and expose to DevTools https://chromium-review.googlesource.com/c/chromium/src/+/6680477 * 6677511: [pepper] More pepper removal https://chromium-review.googlesource.com/c/chromium/src/+/6677511 * 6696689: Rename views::WidgetFocusManager -> NativeViewFocusManager https://chromium-review.googlesource.com/c/chromium/src/+/6696689 * 6702812: Move wtf/text/string_impl*.* to "blink" namespace https://chromium-review.googlesource.com/c/chromium/src/+/6702812 * chore: fix dialog patch * 6702431: [animation-trigger] Parse timeline-trigger-name https://chromium-review.googlesource.com/c/chromium/src/+/6702431 * chore: fixup patch indices * feat: replace webFrame.routingId with webFrame.frameToken * feat: WebFrameMain.prototype.frameToken * test: refactor to use replacement APIs * chore: fixup pip patch * test: adjust webFrame tests for frameToken changes * 6703757: Reland "Enable -fsanitize=array-bounds in non-UBSan builds" https://chromium-review.googlesource.com/c/chromium/src/+/6703757 * test: switch to frameTokens * test: routingId is fine to test in the main process * docs: add routingId to breaking changes * docs: update plugin-crashed event * chore: fixup linux dialog patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> (cherry picked from commit603cafad7e
) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
270 lines
10 KiB
TypeScript
270 lines
10 KiB
TypeScript
import { BrowserWindow, ipcMain, WebContents } from 'electron/main';
|
|
|
|
import { expect } from 'chai';
|
|
|
|
import { once } from 'node:events';
|
|
import * as path from 'node:path';
|
|
|
|
import { defer } from './lib/spec-helpers';
|
|
|
|
describe('webFrame module', () => {
|
|
const fixtures = path.resolve(__dirname, 'fixtures');
|
|
|
|
it('can use executeJavaScript', async () => {
|
|
const w = new BrowserWindow({
|
|
show: false,
|
|
webPreferences: {
|
|
nodeIntegration: true,
|
|
contextIsolation: true,
|
|
preload: path.join(fixtures, 'pages', 'world-safe-preload.js')
|
|
}
|
|
});
|
|
defer(() => w.close());
|
|
const isSafe = once(ipcMain, 'executejs-safe');
|
|
w.loadURL('about:blank');
|
|
const [, wasSafe] = await isSafe;
|
|
expect(wasSafe).to.equal(true);
|
|
});
|
|
|
|
it('can use executeJavaScript and catch conversion errors', async () => {
|
|
const w = new BrowserWindow({
|
|
show: false,
|
|
webPreferences: {
|
|
nodeIntegration: true,
|
|
contextIsolation: true,
|
|
preload: path.join(fixtures, 'pages', 'world-safe-preload-error.js')
|
|
}
|
|
});
|
|
defer(() => w.close());
|
|
const execError = once(ipcMain, 'executejs-safe');
|
|
w.loadURL('about:blank');
|
|
const [, error] = await execError;
|
|
expect(error).to.not.equal(null, 'Error should not be null');
|
|
expect(error).to.have.property('message', 'Uncaught Error: An object could not be cloned.');
|
|
});
|
|
|
|
it('calls a spellcheck provider', async () => {
|
|
const w = new BrowserWindow({
|
|
show: false,
|
|
webPreferences: {
|
|
nodeIntegration: true,
|
|
contextIsolation: false
|
|
}
|
|
});
|
|
defer(() => w.close());
|
|
await w.loadFile(path.join(fixtures, 'pages', 'webframe-spell-check.html'));
|
|
w.focus();
|
|
await w.webContents.executeJavaScript('document.querySelector("input").focus()', true);
|
|
|
|
const spellCheckerFeedback =
|
|
new Promise<[string[], boolean]>(resolve => {
|
|
ipcMain.on('spec-spell-check', (e, words, callbackDefined) => {
|
|
if (words.length === 5) {
|
|
// The API calls the provider after every completed word.
|
|
// The promise is resolved only after this event is received with all words.
|
|
resolve([words, callbackDefined]);
|
|
}
|
|
});
|
|
});
|
|
const inputText = 'spleling test you\'re ';
|
|
for (const keyCode of inputText) {
|
|
w.webContents.sendInputEvent({ type: 'char', keyCode });
|
|
}
|
|
const [words, callbackDefined] = await spellCheckerFeedback;
|
|
expect(words.sort()).to.deep.equal(['spleling', 'test', 'you\'re', 'you', 're'].sort());
|
|
expect(callbackDefined).to.be.true();
|
|
});
|
|
|
|
describe('api', () => {
|
|
let w: WebContents;
|
|
let win: BrowserWindow;
|
|
before(async () => {
|
|
win = new BrowserWindow({ show: false, webPreferences: { contextIsolation: false, nodeIntegration: true } });
|
|
await win.loadURL('data:text/html,<iframe name="test"></iframe>');
|
|
w = win.webContents;
|
|
await w.executeJavaScript(`
|
|
var { webFrame } = require('electron');
|
|
var isSameWebFrame = (a, b) => a.context === b.context;
|
|
childFrame = webFrame.firstChild;
|
|
null
|
|
`);
|
|
});
|
|
|
|
after(() => {
|
|
win.close();
|
|
win = null as unknown as BrowserWindow;
|
|
});
|
|
|
|
describe('top', () => {
|
|
it('is self for top frame', async () => {
|
|
const equal = await w.executeJavaScript('isSameWebFrame(webFrame.top, webFrame)');
|
|
expect(equal).to.be.true();
|
|
});
|
|
|
|
it('is self for child frame', async () => {
|
|
const equal = await w.executeJavaScript('isSameWebFrame(childFrame.top, webFrame)');
|
|
expect(equal).to.be.true();
|
|
});
|
|
});
|
|
|
|
describe('opener', () => {
|
|
it('is null for top frame', async () => {
|
|
const equal = await w.executeJavaScript('webFrame.opener === null');
|
|
expect(equal).to.be.true();
|
|
});
|
|
});
|
|
|
|
describe('parent', () => {
|
|
it('is null for top frame', async () => {
|
|
const equal = await w.executeJavaScript('webFrame.parent === null');
|
|
expect(equal).to.be.true();
|
|
});
|
|
|
|
it('is top frame for child frame', async () => {
|
|
const equal = await w.executeJavaScript('isSameWebFrame(childFrame.parent, webFrame)');
|
|
expect(equal).to.be.true();
|
|
});
|
|
});
|
|
|
|
describe('firstChild', () => {
|
|
it('is child frame for top frame', async () => {
|
|
const equal = await w.executeJavaScript('isSameWebFrame(webFrame.firstChild, childFrame)');
|
|
expect(equal).to.be.true();
|
|
});
|
|
|
|
it('is null for child frame', async () => {
|
|
const equal = await w.executeJavaScript('childFrame.firstChild === null');
|
|
expect(equal).to.be.true();
|
|
});
|
|
});
|
|
|
|
describe('getFrameForSelector()', () => {
|
|
it('does not crash when not found', async () => {
|
|
const equal = await w.executeJavaScript('webFrame.getFrameForSelector("unexist-selector") === null');
|
|
expect(equal).to.be.true();
|
|
});
|
|
|
|
it('returns the webFrame when found', async () => {
|
|
const equal = await w.executeJavaScript('isSameWebFrame(webFrame.getFrameForSelector("iframe"), childFrame)');
|
|
expect(equal).to.be.true();
|
|
});
|
|
});
|
|
|
|
describe('findFrameByName()', () => {
|
|
it('does not crash when not found', async () => {
|
|
const equal = await w.executeJavaScript('webFrame.findFrameByName("unexist-name") === null');
|
|
expect(equal).to.be.true();
|
|
});
|
|
|
|
it('returns the webFrame when found', async () => {
|
|
const equal = await w.executeJavaScript('isSameWebFrame(webFrame.findFrameByName("test"), childFrame)');
|
|
expect(equal).to.be.true();
|
|
});
|
|
});
|
|
|
|
describe('findFrameByToken()', () => {
|
|
it('does not crash when not found', async () => {
|
|
const equal = await w.executeJavaScript('webFrame.findFrameByToken("unknown") === null');
|
|
expect(equal).to.be.true();
|
|
});
|
|
|
|
it('returns the webFrame when found', async () => {
|
|
const equal = await w.executeJavaScript('isSameWebFrame(webFrame.findFrameByToken(childFrame.frameToken), childFrame)');
|
|
expect(equal).to.be.true();
|
|
});
|
|
});
|
|
|
|
describe('setZoomFactor()', () => {
|
|
it('works', async () => {
|
|
const zoom = await w.executeJavaScript('childFrame.setZoomFactor(2.0); childFrame.getZoomFactor()');
|
|
expect(zoom).to.equal(2.0);
|
|
});
|
|
});
|
|
|
|
describe('setZoomLevel()', () => {
|
|
it('works', async () => {
|
|
const zoom = await w.executeJavaScript('childFrame.setZoomLevel(5); childFrame.getZoomLevel()');
|
|
expect(zoom).to.equal(5);
|
|
});
|
|
});
|
|
|
|
describe('getResourceUsage()', () => {
|
|
it('works', async () => {
|
|
const result = await w.executeJavaScript('childFrame.getResourceUsage()');
|
|
expect(result).to.have.property('images').that.is.an('object');
|
|
expect(result).to.have.property('scripts').that.is.an('object');
|
|
expect(result).to.have.property('cssStyleSheets').that.is.an('object');
|
|
expect(result).to.have.property('xslStyleSheets').that.is.an('object');
|
|
expect(result).to.have.property('fonts').that.is.an('object');
|
|
expect(result).to.have.property('other').that.is.an('object');
|
|
});
|
|
});
|
|
|
|
describe('executeJavaScript', () => {
|
|
it('executeJavaScript() yields results via a promise and a sync callback', async () => {
|
|
const { callbackResult, callbackError, result } = await w.executeJavaScript(`new Promise(resolve => {
|
|
let callbackResult, callbackError;
|
|
childFrame
|
|
.executeJavaScript('1 + 1', (result, error) => {
|
|
callbackResult = result;
|
|
callbackError = error;
|
|
}).then(result => resolve({callbackResult, callbackError, result}))
|
|
})`);
|
|
|
|
expect(callbackResult).to.equal(2);
|
|
expect(callbackError).to.be.undefined();
|
|
expect(result).to.equal(2);
|
|
});
|
|
|
|
it('executeJavaScriptInIsolatedWorld() yields results via a promise and a sync callback', async () => {
|
|
const { callbackResult, callbackError, result } = await w.executeJavaScript(`new Promise(resolve => {
|
|
let callbackResult, callbackError;
|
|
childFrame
|
|
.executeJavaScriptInIsolatedWorld(999, [{code: '1 + 1'}], (result, error) => {
|
|
callbackResult = result;
|
|
callbackError = error;
|
|
}).then(result => resolve({callbackResult, callbackError, result}))
|
|
})`);
|
|
|
|
expect(callbackResult).to.equal(2);
|
|
expect(callbackError).to.be.undefined();
|
|
expect(result).to.equal(2);
|
|
});
|
|
|
|
it('executeJavaScript() yields errors via a promise and a sync callback', async () => {
|
|
const { callbackResult, callbackError, error } = await w.executeJavaScript(`new Promise(resolve => {
|
|
let callbackResult, callbackError;
|
|
childFrame
|
|
.executeJavaScript('thisShouldProduceAnError()', (result, error) => {
|
|
callbackResult = result;
|
|
callbackError = error;
|
|
}).then(result => {throw new Error}, error => resolve({callbackResult, callbackError, error}))
|
|
})`);
|
|
|
|
expect(callbackResult).to.be.undefined();
|
|
expect(callbackError).to.be.an('error');
|
|
expect(error).to.be.an('error');
|
|
});
|
|
|
|
it('executeJavaScriptInIsolatedWorld() yields errors via a promise and a sync callback', async () => {
|
|
const { callbackResult, callbackError, error } = await w.executeJavaScript(`new Promise(resolve => {
|
|
let callbackResult, callbackError;
|
|
childFrame
|
|
.executeJavaScriptInIsolatedWorld(999, [{code: 'thisShouldProduceAnError()'}], (result, error) => {
|
|
callbackResult = result;
|
|
callbackError = error;
|
|
}).then(result => {throw new Error}, error => resolve({callbackResult, callbackError, error}))
|
|
})`);
|
|
|
|
expect(callbackResult).to.be.undefined();
|
|
expect(callbackError).to.be.an('error');
|
|
expect(error).to.be.an('error');
|
|
});
|
|
|
|
it('executeJavaScript(InIsolatedWorld) can be used without a callback', async () => {
|
|
expect(await w.executeJavaScript('webFrame.executeJavaScript(\'1 + 1\')')).to.equal(2);
|
|
expect(await w.executeJavaScript('webFrame.executeJavaScriptInIsolatedWorld(999, [{code: \'1 + 1\'}])')).to.equal(2);
|
|
});
|
|
});
|
|
});
|
|
});
|