b5ed025267
* build: use github actions for windows (#44136)
* build: test windows runner
* build: try build windows on windows?
* build: take win/cross changes
* build: use bash as default shell always
* build: configure git for windows build tools
* build: bash as default
* build: configure windows correctly
* build: use sha1sum
* build: force windows cipd init and python3 existence
* just pain
* build: restore cache on windows
* build: use build-tools gclient
* build: sync gclient vars to build windows job
* build: output depshash for debugging
* build: past sam was a silly goose
* build: depshash logging
* build: force lf endings for lock and DEPS
* build: platform strings are hard
* build: checkout on windows host
* sup
* no check
* idk
* sigh
* ...
* no double checkout
* build: yolo some stuff
* build: run gn-check for windows on linux hosts for speed
* use container...
* cry ?
* build: e d
* e d
* no log
* fix toolchain on windows cross check
* build: use powershell to add mksnapshot_args
* build: enable x86 and arm64 windows builds too
* clean up
* maybe not needed
* build: keep action around for post step
* build: configure git global on win
* build: ia32 zip manifest
* build: no patch depot_tools for tests
* build: get arm64 windows closer to working
* build: windows tar is ass
* 32 bit on 32 bit
* maybe bash
* build: set up nodejs
* correct windows sharding
* fix some spec runner stuff
* fix windows tests
* overwrite -Force
* sigh
* screen res
* wat
* logs
* ... more logs
* line endings will be the death of me
* remove 1080p force thing
* vsctools + logging
* disable some fullscreen tests on GHA
* no progress
* run all CI
* install visual studio on arm64
* windows hax for non windows
* maybe arm sdk
* clean up depshash logic
* build: use single check per platform
* ensure clean args
* fix loop
* remove debug
* update default build image sha for dispatch
* plzzzz
* one more try
* arm64 vctools
* sad
* build: fix non-dispatch windows gn check
* chore: debug datadog-ci location
* chore: update build-tools for newer toolchain
* chore: set path for datadog-ci
* try this
* chore: fixup gn check
* fixup gn-check some more
* fixup windows gn check
* chore: fixup windows gn check
* test: use cmd for Windows testing
* fixup use cmd for testing on Windows
* fixup windows GN check
* fixup npm config arch for x86
* Can we set test files via powershell
* fixup to set test files via powershell
* fixup set test files via powershell
* Don't check cross instance cache disk space on Windows
* Use separate step to set env variables for testing
* fixup Use separate step to set env variables for testing
* fixup Use separate step to set env variables for testing
* fixup Use separate step to set env variables for testing (AGAIN)
* use powershell if in powershell
* fixup use powershell if in powershell
* chore: remove no longer needed changes to depot_tools
xref: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5669094
and https://chromium-review.googlesource.com/c/chromium/src/+/5844046
* chore: try using 7zip on Windows to extract tarball
* Revert "chore: try using 7zip on Windows to extract tarball"
This reverts commit c7432b6a37857fd0746b8f1776fbd1103dba0b85.
* test: debug failing tests on GHA windows
* fix: ftbfs when including simdjson in Node.js
(cherry picked from commit 48e44c40d61b7aa843a990d4e0c8dec676b4ce8f)
* chore: try to track down Windows testing hang
* use correct timeout
* try this
* see if this helps
* try to figure out why node is running
* shard tests to try to narrow down WOA lockup
* try to narrow down problem test
* Narrow down blocking test more
* do we need a combo to repro
* see if this cleans up the tests
* fixup navigator.usb test
* remove logging from problematic tests
* Revert "shard tests to try to narrow down WOA lockup"
This reverts commit a1806583769678491814cb8b008131c32be4e8fb.
* remove logging
* debug keyboard test
* add timeout for Windows since arm64 sometimes hangs
* see if this helps
* put back original timeout
* try to use screenCapture to get screenshots of what is going on on WOA
* try using electron screencapture to debug WOA hang
* chore: turn off privacy experience
* run screenshot on both shards
* fixup screencap
* try to narrow down hanging spec
* chore: cleanup servers left open
* cleanup tests
* Revert "try to narrow down hanging spec"
This reverts commit a0f959f5382f4012a9919ac535d42c5333eb7d5f.
* cleanup test debugging
* fixup extensions spec
* cleanup unneeded items
* run wtf with 2 shards instead of 6
* Revert "run wtf with 2 shards instead of 6"
This reverts commit ca2d282129ee42c535d80f9876d6fa0dc6c08344.
* debug windows version on woa
* dump more info
* Get detailed CPU info
* revert debugging
* use same args as AppVeyor WOA for GHA WOA
* fixup use same args as AppVeyor WOA for GHA WOA
* fixup use same args as AppVeyor WOA for GHA WOA
* try to track down which tests trigger hang
* one or more of these combinations should hang
* break up web contents spec to find hang
* further break down api-web-contents to find hang
* test: ensure all webContents are closed
* test: fix require is not defined error
* see if api-web-contents spec is now good
* test: ensure all webContents are closed
* Revert "try to track down which tests trigger hang"
This reverts commit 07298d6ffeb4873ef7615a8ec3d1a6696e354ff4.
* chore: use alternate location for windows toolchain
* Reapply "try to track down which tests trigger hang"
This reverts commit 0321f76d01069ef325339b6fe6ed39700eae2b6b.
* try to narrow down problem test
* fix TEST_SHARD env var
* no, really fix TEST_SHARD env var
* see if this fixes it
* test: cleanup any remaining windows and webcontents
* see if new cleanup helps
* dont destroy webcontents for now
* fixup dont destroy webcontents for now
* Only cleanup right before process.exit
* see if this fixes the hang
* actually destroy webcontents
* Revert "Reapply "try to track down which tests trigger hang""
This reverts commit cdee7de049ce6bb5f67bbcc64882c56aa2c73027.
* see if this helps
* Revert "see if this helps"
This reverts commit 9a15a69cf7dbc456db7a61efa5b6870535bae993.
* Is it all about the web contents?
* it is all about the webcontents
but which one?
* Narrow down problem webcontents test
* try to speed up git install on WOA
* disable problematic test on WOA
* remove debugging
* remove debugging from choco installs
* Revert "disable problematic test on WOA"
This reverts commit e060fb0839b73d53cfde1f8acdca634f8e267937.
* Revert "remove debugging"
This reverts commit f18dd8b1a555f56bb06d0ea996a6eff31b424bf1.
* run against all the tests in the failing shard
* don't run visibility tests first
* remove debugging
* 3 is a magic number
* Revert "3 is a magic number"
This reverts commit 36b91ccf9f03a4b34230cd69ceca482f7d8428c1.
* match what Appveyor runs exactly
* Revert "match what Appveyor runs exactly"
This reverts commit 7260dd432216c62696e4bc864930f17c857eabbe.
* chore: sort files alphabetically
* find out what spec is leaving stuff open
* chore: Checkout PR HEAD commit
instead of merge commit
* try using app.exit instead of process.exit
* test: cleanup BrowserWindows and webContents
* Revert "chore: sort files alphabetically"
This reverts commit d9e217ffb1522076e150fce9e43a31bf56716acb.
* chore: use win32 to match process.platform
Needed for build-tools to download from PRs
* chore: cache yarn dir
* fixup cache yarn
* fixup use win32 to match process.platform
* fixup use win32 to match process.platform
* fixup cache yarn
* Add debugging for WOA hang
* Add debugging for failing keyboard lock test
* Revert "Add debugging for WOA hang"
This reverts commit 8df03d568d15a269e4026140d1158e8cdf551dec.
* try using process.kill
* add more debugging to keyboard.lock test
* Revert "Add debugging for failing keyboard lock test"
* remove debugging
* test: disable keyboard.lock on Windows
* test: disable fullscreen tests on Windows
* test: only force test suite exit on WOA
* fixup test: only force test suite exit on WOA
* cleanup tests
* extract yarn caching/install to action
* try using bash to run windows tests
* remove left over debugging
* standardize on 'win' for Windows builds
* use 'x86' for arch for manifest files
* fixup try using bash to run windows tests
* fixup use 'x86' for arch for manifest files
* standardize on 'win' for Windows builds
* fixup use 'x86' for arch for manifest files
* fixup try using bash to run windows tests
---------
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
(cherry picked from commit be1a3dce83
)
* chore: update build tools to correct sha
---------
Co-authored-by: Samuel Attard <sam@electronjs.org>
364 lines
14 KiB
TypeScript
364 lines
14 KiB
TypeScript
import { BaseWindow, BrowserWindow, View, WebContentsView, webContents, screen } from 'electron/main';
|
|
|
|
import { expect } from 'chai';
|
|
|
|
import { once } from 'node:events';
|
|
|
|
import { HexColors, ScreenCapture, hasCapturableScreen, nextFrameTime } from './lib/screen-helpers';
|
|
import { defer, ifdescribe, waitUntil } from './lib/spec-helpers';
|
|
import { closeAllWindows } from './lib/window-helpers';
|
|
|
|
describe('WebContentsView', () => {
|
|
afterEach(async () => {
|
|
await closeAllWindows();
|
|
const existingWCS = webContents.getAllWebContents();
|
|
existingWCS.forEach((contents) => contents.close());
|
|
});
|
|
|
|
it('can be instantiated with no arguments', () => {
|
|
// eslint-disable-next-line no-new
|
|
new WebContentsView();
|
|
});
|
|
|
|
it('can be instantiated with no webPreferences', () => {
|
|
// eslint-disable-next-line no-new
|
|
new WebContentsView({});
|
|
});
|
|
|
|
it('accepts existing webContents object', async () => {
|
|
const currentWebContentsCount = webContents.getAllWebContents().length;
|
|
|
|
const wc = (webContents as typeof ElectronInternal.WebContents).create({ sandbox: true });
|
|
defer(() => wc.destroy());
|
|
await wc.loadURL('about:blank');
|
|
|
|
const webContentsView = new WebContentsView({
|
|
webContents: wc
|
|
});
|
|
|
|
expect(webContentsView.webContents).to.eq(wc);
|
|
expect(webContents.getAllWebContents().length).to.equal(currentWebContentsCount + 1, 'expected only single webcontents to be created');
|
|
});
|
|
|
|
it('should throw error when created with already attached webContents to BrowserWindow', () => {
|
|
const browserWindow = new BrowserWindow();
|
|
defer(() => browserWindow.webContents.destroy());
|
|
|
|
const webContentsView = new WebContentsView();
|
|
defer(() => webContentsView.webContents.destroy());
|
|
|
|
browserWindow.contentView.addChildView(webContentsView);
|
|
defer(() => browserWindow.contentView.removeChildView(webContentsView));
|
|
|
|
expect(() => new WebContentsView({
|
|
webContents: webContentsView.webContents
|
|
})).to.throw('options.webContents is already attached to a window');
|
|
});
|
|
|
|
it('should throw error when created with already attached webContents to other WebContentsView', () => {
|
|
const browserWindow = new BrowserWindow();
|
|
|
|
const webContentsView = new WebContentsView();
|
|
defer(() => webContentsView.webContents.destroy());
|
|
webContentsView.webContents.loadURL('about:blank');
|
|
|
|
expect(() => new WebContentsView({
|
|
webContents: browserWindow.webContents
|
|
})).to.throw('options.webContents is already attached to a window');
|
|
});
|
|
|
|
it('can be used as content view', () => {
|
|
const w = new BaseWindow({ show: false });
|
|
w.setContentView(new WebContentsView());
|
|
});
|
|
|
|
it('can be removed after a close', async () => {
|
|
const w = new BaseWindow({ show: false });
|
|
const v = new View();
|
|
const wcv = new WebContentsView();
|
|
w.setContentView(v);
|
|
v.addChildView(wcv);
|
|
await wcv.webContents.loadURL('about:blank');
|
|
const destroyed = once(wcv.webContents, 'destroyed');
|
|
wcv.webContents.executeJavaScript('window.close()');
|
|
await destroyed;
|
|
expect(wcv.webContents.isDestroyed()).to.be.true();
|
|
v.removeChildView(wcv);
|
|
});
|
|
|
|
it('correctly reorders children', () => {
|
|
const w = new BaseWindow({ show: false });
|
|
const cv = new View();
|
|
w.setContentView(cv);
|
|
|
|
const wcv1 = new WebContentsView();
|
|
const wcv2 = new WebContentsView();
|
|
const wcv3 = new WebContentsView();
|
|
w.contentView.addChildView(wcv1);
|
|
w.contentView.addChildView(wcv2);
|
|
w.contentView.addChildView(wcv3);
|
|
|
|
expect(w.contentView.children).to.deep.equal([wcv1, wcv2, wcv3]);
|
|
|
|
w.contentView.addChildView(wcv1);
|
|
w.contentView.addChildView(wcv2);
|
|
expect(w.contentView.children).to.deep.equal([wcv3, wcv1, wcv2]);
|
|
});
|
|
|
|
it('handle removal and re-addition of children', () => {
|
|
const w = new BaseWindow({ show: false });
|
|
const cv = new View();
|
|
w.setContentView(cv);
|
|
|
|
const wcv1 = new WebContentsView();
|
|
const wcv2 = new WebContentsView();
|
|
|
|
expect(w.contentView.children).to.deep.equal([]);
|
|
|
|
w.contentView.addChildView(wcv1);
|
|
w.contentView.addChildView(wcv2);
|
|
|
|
expect(w.contentView.children).to.deep.equal([wcv1, wcv2]);
|
|
|
|
w.contentView.removeChildView(wcv1);
|
|
|
|
expect(w.contentView.children).to.deep.equal([wcv2]);
|
|
|
|
w.contentView.addChildView(wcv1);
|
|
|
|
expect(w.contentView.children).to.deep.equal([wcv2, wcv1]);
|
|
});
|
|
|
|
function triggerGCByAllocation () {
|
|
const arr = [];
|
|
for (let i = 0; i < 1000000; i++) {
|
|
arr.push([]);
|
|
}
|
|
return arr;
|
|
}
|
|
|
|
it('doesn\'t crash when GCed during allocation', (done) => {
|
|
// eslint-disable-next-line no-new
|
|
new WebContentsView();
|
|
setTimeout(() => {
|
|
// NB. the crash we're testing for is the lack of a current `v8::Context`
|
|
// when emitting an event in WebContents's destructor. V8 is inconsistent
|
|
// about whether or not there's a current context during garbage
|
|
// collection, and it seems that `v8Util.requestGarbageCollectionForTesting`
|
|
// causes a GC in which there _is_ a current context, so the crash isn't
|
|
// triggered. Thus, we force a GC by other means: namely, by allocating a
|
|
// bunch of stuff.
|
|
triggerGCByAllocation();
|
|
done();
|
|
});
|
|
});
|
|
|
|
it('can be fullscreened', async () => {
|
|
const w = new BaseWindow();
|
|
const v = new WebContentsView();
|
|
w.setContentView(v);
|
|
await v.webContents.loadURL('data:text/html,<div id="div">This is a simple div.</div>');
|
|
|
|
const enterFullScreen = once(w, 'enter-full-screen');
|
|
await v.webContents.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
|
|
await enterFullScreen;
|
|
expect(w.isFullScreen()).to.be.true('isFullScreen');
|
|
});
|
|
|
|
it('can be added as a child of another View', async () => {
|
|
const w = new BaseWindow();
|
|
const v = new View();
|
|
const wcv = new WebContentsView();
|
|
|
|
await wcv.webContents.loadURL('data:text/html,<div id="div">This is a simple div.</div>');
|
|
|
|
v.addChildView(wcv);
|
|
w.contentView.addChildView(v);
|
|
|
|
expect(w.contentView.children).to.deep.equal([v]);
|
|
expect(v.children).to.deep.equal([wcv]);
|
|
});
|
|
|
|
describe('visibilityState', () => {
|
|
async function haveVisibilityState (view: WebContentsView, state: string) {
|
|
const docVisState = await view.webContents.executeJavaScript('document.visibilityState');
|
|
return docVisState === state;
|
|
}
|
|
|
|
it('is initially hidden', async () => {
|
|
const v = new WebContentsView();
|
|
await v.webContents.loadURL('data:text/html,<script>initialVisibility = document.visibilityState</script>');
|
|
expect(await v.webContents.executeJavaScript('initialVisibility')).to.equal('hidden');
|
|
});
|
|
|
|
it('becomes visible when attached', async () => {
|
|
const v = new WebContentsView();
|
|
await v.webContents.loadURL('about:blank');
|
|
expect(await v.webContents.executeJavaScript('document.visibilityState')).to.equal('hidden');
|
|
const p = v.webContents.executeJavaScript('new Promise(resolve => document.addEventListener("visibilitychange", resolve))');
|
|
// Ensure that the above listener has been registered before we add the
|
|
// view to the window, or else the visibilitychange event might be
|
|
// dispatched before the listener is registered.
|
|
// executeJavaScript calls are sequential so if this one's finished then
|
|
// the previous one must also have been finished :)
|
|
await v.webContents.executeJavaScript('undefined');
|
|
const w = new BaseWindow();
|
|
w.setContentView(v);
|
|
await p;
|
|
expect(await v.webContents.executeJavaScript('document.visibilityState')).to.equal('visible');
|
|
});
|
|
|
|
it('is initially visible if load happens after attach', async () => {
|
|
const w = new BaseWindow();
|
|
const v = new WebContentsView();
|
|
w.contentView = v;
|
|
await v.webContents.loadURL('data:text/html,<script>initialVisibility = document.visibilityState</script>');
|
|
expect(await v.webContents.executeJavaScript('initialVisibility')).to.equal('visible');
|
|
});
|
|
|
|
it('becomes hidden when parent window is hidden', async () => {
|
|
const w = new BaseWindow();
|
|
const v = new WebContentsView();
|
|
w.setContentView(v);
|
|
await v.webContents.loadURL('about:blank');
|
|
await expect(waitUntil(async () => await haveVisibilityState(v, 'visible'))).to.eventually.be.fulfilled();
|
|
const p = v.webContents.executeJavaScript('new Promise(resolve => document.addEventListener("visibilitychange", resolve))');
|
|
// We have to wait until the listener above is fully registered before hiding the window.
|
|
// On Windows, the executeJavaScript and the visibilitychange can happen out of order
|
|
// without this.
|
|
await v.webContents.executeJavaScript('0');
|
|
w.hide();
|
|
await p;
|
|
expect(await v.webContents.executeJavaScript('document.visibilityState')).to.equal('hidden');
|
|
});
|
|
|
|
it('becomes visible when parent window is shown', async () => {
|
|
const w = new BaseWindow({ show: false });
|
|
const v = new WebContentsView();
|
|
w.setContentView(v);
|
|
await v.webContents.loadURL('about:blank');
|
|
expect(await v.webContents.executeJavaScript('document.visibilityState')).to.equal('hidden');
|
|
const p = v.webContents.executeJavaScript('new Promise(resolve => document.addEventListener("visibilitychange", resolve))');
|
|
// We have to wait until the listener above is fully registered before hiding the window.
|
|
// On Windows, the executeJavaScript and the visibilitychange can happen out of order
|
|
// without this.
|
|
await v.webContents.executeJavaScript('0');
|
|
w.show();
|
|
await p;
|
|
expect(await v.webContents.executeJavaScript('document.visibilityState')).to.equal('visible');
|
|
});
|
|
|
|
it('does not change when view is moved between two visible windows', async () => {
|
|
const w = new BaseWindow();
|
|
const v = new WebContentsView();
|
|
w.setContentView(v);
|
|
await v.webContents.loadURL('about:blank');
|
|
await expect(waitUntil(async () => await haveVisibilityState(v, 'visible'))).to.eventually.be.fulfilled();
|
|
|
|
const p = v.webContents.executeJavaScript('new Promise(resolve => document.addEventListener("visibilitychange", () => resolve(document.visibilityState)))');
|
|
// Ensure the listener has been registered.
|
|
await v.webContents.executeJavaScript('undefined');
|
|
const w2 = new BaseWindow();
|
|
w2.setContentView(v);
|
|
// Wait for the visibility state to settle as "visible".
|
|
// On macOS one visibilitychange event is fired but visibilityState
|
|
// remains "visible". On Win/Linux, two visibilitychange events are
|
|
// fired, a "hidden" and a "visible" one. Reconcile these two models
|
|
// by waiting until at least one event has been fired, and then waiting
|
|
// until the visibility state settles as "visible".
|
|
let visibilityState = await p;
|
|
for (let attempts = 0; visibilityState !== 'visible' && attempts < 10; attempts++) {
|
|
visibilityState = await v.webContents.executeJavaScript('new Promise(resolve => document.visibilityState === "visible" ? resolve("visible") : document.addEventListener("visibilitychange", () => resolve(document.visibilityState)))');
|
|
}
|
|
expect(visibilityState).to.equal('visible');
|
|
});
|
|
});
|
|
|
|
describe('setBorderRadius', () => {
|
|
ifdescribe(hasCapturableScreen())('capture', () => {
|
|
let w: Electron.BaseWindow;
|
|
let v: Electron.WebContentsView;
|
|
let display: Electron.Display;
|
|
let corners: Electron.Point[];
|
|
|
|
const backgroundUrl = `data:text/html,<style>html{background:${encodeURIComponent(HexColors.GREEN)}}</style>`;
|
|
|
|
beforeEach(async () => {
|
|
display = screen.getPrimaryDisplay();
|
|
|
|
w = new BaseWindow({
|
|
...display.workArea,
|
|
show: true,
|
|
frame: false,
|
|
hasShadow: false,
|
|
backgroundColor: HexColors.BLUE,
|
|
roundedCorners: false
|
|
});
|
|
|
|
v = new WebContentsView();
|
|
w.setContentView(v);
|
|
v.setBorderRadius(100);
|
|
|
|
const readyForCapture = once(v.webContents, 'ready-to-show');
|
|
v.webContents.loadURL(backgroundUrl);
|
|
|
|
const inset = 10;
|
|
corners = [
|
|
{ x: display.workArea.x + inset, y: display.workArea.y + inset }, // top-left
|
|
{ x: display.workArea.x + display.workArea.width - inset, y: display.workArea.y + inset }, // top-right
|
|
{ x: display.workArea.x + display.workArea.width - inset, y: display.workArea.y + display.workArea.height - inset }, // bottom-right
|
|
{ x: display.workArea.x + inset, y: display.workArea.y + display.workArea.height - inset } // bottom-left
|
|
];
|
|
|
|
await readyForCapture;
|
|
});
|
|
|
|
afterEach(() => {
|
|
w.destroy();
|
|
w = v = null!;
|
|
});
|
|
|
|
it('should render with cutout corners', async () => {
|
|
const screenCapture = new ScreenCapture(display);
|
|
|
|
for (const corner of corners) {
|
|
await screenCapture.expectColorAtPointOnDisplayMatches(HexColors.BLUE, () => corner);
|
|
}
|
|
|
|
// Center should be WebContents page background color
|
|
await screenCapture.expectColorAtCenterMatches(HexColors.GREEN);
|
|
});
|
|
|
|
it('should allow resetting corners', async () => {
|
|
const corner = corners[0];
|
|
v.setBorderRadius(0);
|
|
|
|
await nextFrameTime();
|
|
const screenCapture = new ScreenCapture(display);
|
|
await screenCapture.expectColorAtPointOnDisplayMatches(HexColors.GREEN, () => corner);
|
|
await screenCapture.expectColorAtCenterMatches(HexColors.GREEN);
|
|
});
|
|
|
|
it('should render when set before attached', async () => {
|
|
v = new WebContentsView();
|
|
v.setBorderRadius(100); // must set before
|
|
|
|
w.setContentView(v);
|
|
|
|
const readyForCapture = once(v.webContents, 'ready-to-show');
|
|
v.webContents.loadURL(backgroundUrl);
|
|
await readyForCapture;
|
|
|
|
const corner = corners[0];
|
|
const screenCapture = new ScreenCapture(display);
|
|
await screenCapture.expectColorAtPointOnDisplayMatches(HexColors.BLUE, () => corner);
|
|
await screenCapture.expectColorAtCenterMatches(HexColors.GREEN);
|
|
});
|
|
});
|
|
|
|
it('should allow setting when not attached', async () => {
|
|
const v = new WebContentsView();
|
|
v.setBorderRadius(100);
|
|
});
|
|
});
|
|
});
|