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

test: fix failing tests of focus/blur events of WebContents (#32711)

Browse source
This commit is contained in:
Cheng Zhao 2022-02-03 00:32:53 +09:00 committed by GitHub
parent ed185f324e
commit c3d11e2ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docs/api/web-contents.md
View file

@ -516,6 +516,15 @@ Emitted when the `WebContents` loses focus.
Emitted when the `WebContents` gains focus. Emitted when the `WebContents` gains focus.
Note that on macOS, having focus means the `WebContents` is the first responder
of window, so switching focus between windows would not trigger the `focus` and
`blur` events of `WebContents`, as the first responder of each window is not
changed.
The `focus` and `blur` events of `WebContents` should only be used to detect
focus change between different `WebContents` and `BrowserView` in the same
window.
#### Event: 'devtools-opened' #### Event: 'devtools-opened'
Emitted when DevTools is opened. Emitted when DevTools is opened.

28
spec-main/api-web-contents-spec.ts
View file

@ -826,15 +826,20 @@ describe('webContents module', () => {
}); });
}); });
const moveFocusToDevTools = async (win: BrowserWindow) => {
const devToolsOpened = emittedOnce(win.webContents, 'devtools-opened');
win.webContents.openDevTools({ mode: 'right' });
await devToolsOpened;
win.webContents.devToolsWebContents!.focus();
};
describe('focus event', () => { describe('focus event', () => {
afterEach(closeAllWindows); afterEach(closeAllWindows);
it('is triggered when web contents is focused', async () => { it('is triggered when web contents is focused', async () => {
const w = new BrowserWindow({ show: false }); const w = new BrowserWindow({ show: false });
await w.loadURL('about:blank'); await w.loadURL('about:blank');
const devToolsOpened = emittedOnce(w.webContents, 'devtools-opened'); await moveFocusToDevTools(w);
w.webContents.openDevTools();
await devToolsOpened;
w.webContents.devToolsWebContents!.focus();
const focusPromise = emittedOnce(w.webContents, 'focus'); const focusPromise = emittedOnce(w.webContents, 'focus');
w.webContents.focus(); w.webContents.focus();
await expect(focusPromise).to.eventually.be.fulfilled(); await expect(focusPromise).to.eventually.be.fulfilled();
@ -849,16 +854,17 @@ describe('webContents module', () => {
window2.loadURL('about:blank') window2.loadURL('about:blank')
]); ]);
const focusPromise1 = emittedOnce(window1.webContents, 'focus');
const focusPromise2 = emittedOnce(window2.webContents, 'focus');
window1.showInactive(); window1.showInactive();
window2.showInactive(); window2.showInactive();
let focusPromise = emittedOnce(window1.webContents, 'focus');
window1.focus(); window1.focus();
await expect(focusPromise).to.eventually.be.fulfilled(); await expect(focusPromise1).to.eventually.be.fulfilled();
focusPromise = emittedOnce(window2.webContents, 'focus');
window2.focus(); window2.focus();
await expect(focusPromise).to.eventually.be.fulfilled(); await expect(focusPromise2).to.eventually.be.fulfilled();
}); });
}); });
@ -867,11 +873,9 @@ describe('webContents module', () => {
it('is triggered when web contents is blurred', async () => { it('is triggered when web contents is blurred', async () => {
const w = new BrowserWindow({ show: true }); const w = new BrowserWindow({ show: true });
await w.loadURL('about:blank'); await w.loadURL('about:blank');
w.webContents.focus();
const blurPromise = emittedOnce(w.webContents, 'blur'); const blurPromise = emittedOnce(w.webContents, 'blur');
const devToolsOpened = emittedOnce(w.webContents, 'devtools-opened'); await moveFocusToDevTools(w);
w.webContents.openDevTools({ mode: 'detach' });
await devToolsOpened;
w.webContents.devToolsWebContents!.focus();
await expect(blurPromise).to.eventually.be.fulfilled(); await expect(blurPromise).to.eventually.be.fulfilled();
}); });
}); });