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

test: use node helpers for events.once and setTimeout promise (#37374)

Browse source
This commit is contained in:
Jeremy Rose 2023-02-23 15:53:53 -08:00 • committed by GitHub
parent 46c8b9c728
commit a3e3efe4c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 932 additions and 927 deletions
Download patch file Download diff file Expand all files Collapse all files

43
spec/visibility-state-spec.ts
View file

@ -3,9 +3,10 @@ import * as cp from 'child_process';
import { BrowserWindow, BrowserWindowConstructorOptions, ipcMain } from 'electron/main';
import * as path from 'path';
import { emittedOnce } from './lib/events-helpers';
import { closeWindow } from './lib/window-helpers';
import { ifdescribe, delay } from './lib/spec-helpers';
import { ifdescribe } from './lib/spec-helpers';
import { once } from 'events';
import { setTimeout } from 'timers/promises';
// visibilityState specs pass on linux with a real window manager but on CI
// the environment does not let these specs pass
@ -35,7 +36,7 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
itWithOptions('should be visible when the window is initially shown by default', {}, async () => {
load();
const [, state] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, state] = await once(ipcMain, 'initial-visibility-state');
expect(state).to.equal('visible');
});
@ -43,7 +44,7 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
show: true
}, async () => {
load();
const [, state] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, state] = await once(ipcMain, 'initial-visibility-state');
expect(state).to.equal('visible');
});
@ -51,7 +52,7 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
show: false
}, async () => {
load();
const [, state] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, state] = await once(ipcMain, 'initial-visibility-state');
expect(state).to.equal('hidden');
});
@ -60,7 +61,7 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
}, async () => {
w.show();
load();
const [, state] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, state] = await once(ipcMain, 'initial-visibility-state');
expect(state).to.equal('visible');
});
@ -70,40 +71,42 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
// TODO(MarshallOfSound): Figure out if we can work around this 1 tick issue for users
if (process.platform === 'darwin') {
// Wait for a tick, the window being "shown" takes 1 tick on macOS
await delay(10000);
await setTimeout(10000);
}
w.hide();
load();
const [, state] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, state] = await once(ipcMain, 'initial-visibility-state');
expect(state).to.equal('hidden');
});
itWithOptions('should be toggle between visible and hidden as the window is hidden and shown', {}, async () => {
load();
const [, initialState] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, initialState] = await once(ipcMain, 'initial-visibility-state');
expect(initialState).to.equal('visible');
w.hide();
await emittedOnce(ipcMain, 'visibility-change-hidden');
await once(ipcMain, 'visibility-change-hidden');
w.show();
await emittedOnce(ipcMain, 'visibility-change-visible');
await once(ipcMain, 'visibility-change-visible');
});
itWithOptions('should become hidden when a window is minimized', {}, async () => {
load();
const [, initialState] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, initialState] = await once(ipcMain, 'initial-visibility-state');
expect(initialState).to.equal('visible');
w.minimize();
await emittedOnce(ipcMain, 'visibility-change-hidden', () => w.minimize());
const p = once(ipcMain, 'visibility-change-hidden');
w.minimize();
await p;
});
itWithOptions('should become visible when a window is restored', {}, async () => {
load();
const [, initialState] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, initialState] = await once(ipcMain, 'initial-visibility-state');
expect(initialState).to.equal('visible');
w.minimize();
await emittedOnce(ipcMain, 'visibility-change-hidden');
await once(ipcMain, 'visibility-change-hidden');
w.restore();
await emittedOnce(ipcMain, 'visibility-change-visible');
await once(ipcMain, 'visibility-change-visible');
});
describe('on platforms that support occlusion detection', () => {
@ -141,7 +144,7 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
height: 200
});
load();
const [, state] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, state] = await once(ipcMain, 'initial-visibility-state');
expect(state).to.equal('visible');
});
@ -158,7 +161,7 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
height: 200
});
load();
const [, state] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, state] = await once(ipcMain, 'initial-visibility-state');
expect(state).to.equal('visible');
});
@ -170,7 +173,7 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
}, async function () {
this.timeout(240000);
load();
const [, state] = await emittedOnce(ipcMain, 'initial-visibility-state');
const [, state] = await once(ipcMain, 'initial-visibility-state');
expect(state).to.equal('visible');
makeOtherWindow({
x: 0,
@ -178,7 +181,7 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
width: 300,
height: 300
});
await emittedOnce(ipcMain, 'visibility-change-hidden');
await once(ipcMain, 'visibility-change-hidden');
});
});
});