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

build: enable JS semicolons (#22783)

Browse source
This commit is contained in:
Samuel Attard 2020-03-20 13:28:31 -07:00 • committed by GitHub
parent 24e21467b9
commit 5d657dece4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
354 changed files with 21512 additions and 21510 deletions
Download patch file Download diff file Expand all files Collapse all files

180
spec-main/visibility-state-spec.ts
View file

@ -1,28 +1,28 @@
import { expect } from 'chai'
import * as cp from 'child_process'
import { BrowserWindow, BrowserWindowConstructorOptions, ipcMain } from 'electron'
import * as path from 'path'
import { expect } from 'chai';
import * as cp from 'child_process';
import { BrowserWindow, BrowserWindowConstructorOptions, ipcMain } from 'electron';
import * as path from 'path';
import { emittedOnce } from './events-helpers'
import { closeWindow } from './window-helpers'
import { ifdescribe, delay } from './spec-helpers'
import { emittedOnce } from './events-helpers';
import { closeWindow } from './window-helpers';
import { ifdescribe, delay } from './spec-helpers';
// visibilityState specs pass on linux with a real window manager but on CI
// the environment does not let these specs pass
ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
let w: BrowserWindow
let w: BrowserWindow;
afterEach(() => {
return closeWindow(w)
})
return closeWindow(w);
});
const load = () => w.loadFile(path.resolve(__dirname, 'fixtures', 'chromium', 'visibilitystate.html'))
const load = () => w.loadFile(path.resolve(__dirname, 'fixtures', 'chromium', 'visibilitystate.html'));
const itWithOptions = (name: string, options: BrowserWindowConstructorOptions, fn: Mocha.Func) => {
return it(name, async function (...args) {
// document.visibilityState tests are very flaky, this is probably because
// Electron implements it via async IPC messages.
this.retries(3)
this.retries(3);
w = new BrowserWindow({
...options,
@ -31,47 +31,47 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
...(options.webPreferences || {}),
nodeIntegration: true
}
})
await Promise.resolve(fn.apply(this, args))
})
}
});
await Promise.resolve(fn.apply(this, args));
});
};
const getVisibilityState = async (): Promise<string> => {
const response = emittedOnce(ipcMain, 'visibility-state')
w.webContents.send('get-visibility-state')
return (await response)[1]
}
const response = emittedOnce(ipcMain, 'visibility-state');
w.webContents.send('get-visibility-state');
return (await response)[1];
};
itWithOptions('should be visible when the window is initially shown by default', {}, async () => {
await load()
const state = await getVisibilityState()
expect(state).to.equal('visible')
})
await load();
const state = await getVisibilityState();
expect(state).to.equal('visible');
});
itWithOptions('should be visible when the window is initially shown', {
show: true
}, async () => {
await load()
const state = await getVisibilityState()
expect(state).to.equal('visible')
})
await load();
const state = await getVisibilityState();
expect(state).to.equal('visible');
});
itWithOptions('should be hidden when the window is initially hidden', {
show: false
}, async () => {
await load()
const state = await getVisibilityState()
expect(state).to.equal('hidden')
})
await load();
const state = await getVisibilityState();
expect(state).to.equal('hidden');
});
itWithOptions('should be visible when the window is initially hidden but shown before the page is loaded', {
show: false
}, async () => {
w.show()
await load()
const state = await getVisibilityState()
expect(state).to.equal('visible')
})
w.show();
await load();
const state = await getVisibilityState();
expect(state).to.equal('visible');
});
itWithOptions('should be hidden when the window is initially shown but hidden before the page is loaded', {
show: true
@ -79,59 +79,59 @@ 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(0)
await delay(0);
}
w.hide()
await load()
const state = await getVisibilityState()
expect(state).to.equal('hidden')
})
w.hide();
await load();
const state = await getVisibilityState();
expect(state).to.equal('hidden');
});
itWithOptions('should be toggle between visible and hidden as the window is hidden and shown', {}, async () => {
await load()
expect(await getVisibilityState()).to.equal('visible')
await emittedOnce(ipcMain, 'visibility-change', () => w.hide())
expect(await getVisibilityState()).to.equal('hidden')
await emittedOnce(ipcMain, 'visibility-change', () => w.show())
expect(await getVisibilityState()).to.equal('visible')
})
await load();
expect(await getVisibilityState()).to.equal('visible');
await emittedOnce(ipcMain, 'visibility-change', () => w.hide());
expect(await getVisibilityState()).to.equal('hidden');
await emittedOnce(ipcMain, 'visibility-change', () => w.show());
expect(await getVisibilityState()).to.equal('visible');
});
itWithOptions('should become hidden when a window is minimized', {}, async () => {
await load()
expect(await getVisibilityState()).to.equal('visible')
await emittedOnce(ipcMain, 'visibility-change', () => w.minimize())
expect(await getVisibilityState()).to.equal('hidden')
})
await load();
expect(await getVisibilityState()).to.equal('visible');
await emittedOnce(ipcMain, 'visibility-change', () => w.minimize());
expect(await getVisibilityState()).to.equal('hidden');
});
itWithOptions('should become visible when a window is restored', {}, async () => {
await load()
expect(await getVisibilityState()).to.equal('visible')
await emittedOnce(ipcMain, 'visibility-change', () => w.minimize())
await emittedOnce(ipcMain, 'visibility-change', () => w.restore())
expect(await getVisibilityState()).to.equal('visible')
})
await load();
expect(await getVisibilityState()).to.equal('visible');
await emittedOnce(ipcMain, 'visibility-change', () => w.minimize());
await emittedOnce(ipcMain, 'visibility-change', () => w.restore());
expect(await getVisibilityState()).to.equal('visible');
});
describe('on platforms that support occlusion detection', () => {
let child: cp.ChildProcess
let child: cp.ChildProcess;
before(function () {
if (process.platform !== 'darwin') this.skip()
})
if (process.platform !== 'darwin') this.skip();
});
const makeOtherWindow = (opts: { x: number; y: number; width: number; height: number; }) => {
child = cp.spawn(process.execPath, [path.resolve(__dirname, 'fixtures', 'chromium', 'other-window.js'), `${opts.x}`, `${opts.y}`, `${opts.width}`, `${opts.height}`])
child = cp.spawn(process.execPath, [path.resolve(__dirname, 'fixtures', 'chromium', 'other-window.js'), `${opts.x}`, `${opts.y}`, `${opts.width}`, `${opts.height}`]);
return new Promise(resolve => {
child.stdout!.on('data', (chunk) => {
if (chunk.toString().includes('__ready__')) resolve()
})
})
}
if (chunk.toString().includes('__ready__')) resolve();
});
});
};
afterEach(() => {
if (child && !child.killed) {
child.kill('SIGTERM')
child.kill('SIGTERM');
}
})
});
itWithOptions('should be visible when two windows are on screen', {
x: 0,
@ -144,11 +144,11 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
y: 0,
width: 200,
height: 200
})
await load()
const state = await getVisibilityState()
expect(state).to.equal('visible')
})
});
await load();
const state = await getVisibilityState();
expect(state).to.equal('visible');
});
itWithOptions('should be visible when two windows are on screen that overlap partially', {
x: 50,
@ -161,11 +161,11 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
y: 0,
width: 200,
height: 200
})
await load()
const state = await getVisibilityState()
expect(state).to.equal('visible')
})
});
await load();
const state = await getVisibilityState();
expect(state).to.equal('visible');
});
itWithOptions('should be hidden when a second window completely conceals the current window', {
x: 50,
@ -173,18 +173,18 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
width: 50,
height: 50
}, async function () {
this.timeout(240000)
await load()
this.timeout(240000);
await load();
await emittedOnce(ipcMain, 'visibility-change', async () => {
await makeOtherWindow({
x: 0,
y: 0,
width: 300,
height: 300
})
})
const state = await getVisibilityState()
expect(state).to.equal('hidden')
})
})
})
});
});
const state = await getVisibilityState();
expect(state).to.equal('hidden');
});
});
});