chore: lint spec-main (#20835)
This commit is contained in:
Jeremy Apthorp
GitHub
parent
1fed1ed577
commit
ecd9e1f26e
51 changed files with 589 additions and 533 deletions
|
|
@ -1,6 +1,5 @@
|
|||
import * as chai from 'chai'
|
||||
import * as chaiAsPromised from 'chai-as-promised'
|
||||
import dirtyChai = require('dirty-chai')
|
||||
import * as path from 'path'
|
||||
import * as fs from 'fs'
|
||||
import * as os from 'os'
|
||||
|
|
@ -12,6 +11,7 @@ import { app, BrowserWindow, BrowserView, ipcMain, OnBeforeSendHeadersListenerDe
|
|||
import { emittedOnce } from './events-helpers'
|
||||
import { ifit, ifdescribe } from './spec-helpers'
|
||||
import { closeWindow } from './window-helpers'
|
||||
import dirtyChai = require('dirty-chai')
|
||||
|
||||
const { expect } = chai
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ const expectBoundsEqual = (actual: any, expected: any) => {
|
|||
|
||||
const closeAllWindows = async () => {
|
||||
for (const w of BrowserWindow.getAllWindows()) {
|
||||
await closeWindow(w, {assertNotWindows: false})
|
||||
await closeWindow(w, { assertNotWindows: false })
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('BrowserWindow.close()', () => {
|
||||
let w = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
})
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -138,7 +138,7 @@ describe('BrowserWindow module', () => {
|
|||
{ name: 'did-fail-load', path: '/net-error' }
|
||||
]
|
||||
|
||||
for (const {name, path} of events) {
|
||||
for (const { name, path } of events) {
|
||||
it(`should not crash when closed during ${name}`, async () => {
|
||||
const w = new BrowserWindow({ show: false })
|
||||
w.webContents.once((name as any), () => {
|
||||
|
|
@ -155,7 +155,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('window.close()', () => {
|
||||
let w = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
})
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -179,7 +179,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('BrowserWindow.destroy()', () => {
|
||||
let w = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
})
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -206,7 +206,7 @@ describe('BrowserWindow module', () => {
|
|||
backgroundThrottling: false
|
||||
}
|
||||
}
|
||||
const windows = Array.from(Array(windowCount)).map(x => new BrowserWindow(windowOptions))
|
||||
const windows = Array.from(Array(windowCount)).map(() => new BrowserWindow(windowOptions))
|
||||
windows.forEach(win => win.show())
|
||||
windows.forEach(win => win.focus())
|
||||
windows.forEach(win => win.destroy())
|
||||
|
|
@ -229,7 +229,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
})
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -372,7 +372,7 @@ describe('BrowserWindow module', () => {
|
|||
it('sets the content type header on URL encoded forms', async () => {
|
||||
await w.loadURL(url)
|
||||
const requestDetails: Promise<OnBeforeSendHeadersListenerDetails> = new Promise(resolve => {
|
||||
w.webContents.session.webRequest.onBeforeSendHeaders((details, callback) => {
|
||||
w.webContents.session.webRequest.onBeforeSendHeaders((details) => {
|
||||
resolve(details)
|
||||
})
|
||||
})
|
||||
|
|
@ -388,7 +388,7 @@ describe('BrowserWindow module', () => {
|
|||
it('sets the content type header on multi part forms', async () => {
|
||||
await w.loadURL(url)
|
||||
const requestDetails: Promise<OnBeforeSendHeadersListenerDetails> = new Promise(resolve => {
|
||||
w.webContents.session.webRequest.onBeforeSendHeaders((details, callback) => {
|
||||
w.webContents.session.webRequest.onBeforeSendHeaders((details) => {
|
||||
resolve(details)
|
||||
})
|
||||
})
|
||||
|
|
@ -420,7 +420,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('navigation events', () => {
|
||||
let w = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
})
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -462,7 +462,7 @@ describe('BrowserWindow module', () => {
|
|||
server.close()
|
||||
})
|
||||
it('is emitted on redirects', (done) => {
|
||||
w.webContents.on('will-redirect', (event, url) => {
|
||||
w.webContents.on('will-redirect', () => {
|
||||
done()
|
||||
})
|
||||
w.loadURL(`${url}/302`)
|
||||
|
|
@ -473,7 +473,7 @@ describe('BrowserWindow module', () => {
|
|||
w.webContents.on('will-navigate', () => {
|
||||
navigateCalled = true
|
||||
})
|
||||
w.webContents.on('will-redirect', (event, url) => {
|
||||
w.webContents.on('will-redirect', () => {
|
||||
expect(navigateCalled).to.equal(true, 'should have called will-navigate first')
|
||||
done()
|
||||
})
|
||||
|
|
@ -485,7 +485,7 @@ describe('BrowserWindow module', () => {
|
|||
w.webContents.on('did-stop-loading', () => {
|
||||
stopCalled = true
|
||||
})
|
||||
w.webContents.on('will-redirect', (event, url) => {
|
||||
w.webContents.on('will-redirect', () => {
|
||||
expect(stopCalled).to.equal(false, 'should not have called did-stop-loading first')
|
||||
done()
|
||||
})
|
||||
|
|
@ -493,7 +493,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('allows the window to be closed from the event listener', (done) => {
|
||||
w.webContents.once('will-redirect', (event, input) => {
|
||||
w.webContents.once('will-redirect', () => {
|
||||
w.close()
|
||||
done()
|
||||
})
|
||||
|
|
@ -525,7 +525,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('focus and visibility', () => {
|
||||
let w = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false})
|
||||
w = new BrowserWindow({ show: false })
|
||||
})
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -693,7 +693,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('sizing', () => {
|
||||
let w = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false, width: 400, height: 400})
|
||||
w = new BrowserWindow({ show: false, width: 400, height: 400 })
|
||||
})
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -927,7 +927,7 @@ describe('BrowserWindow module', () => {
|
|||
ifdescribe(process.platform === 'darwin')('tabbed windows', () => {
|
||||
let w = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false})
|
||||
w = new BrowserWindow({ show: false })
|
||||
})
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -998,7 +998,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('autoHideMenuBar property', () => {
|
||||
afterEach(closeAllWindows)
|
||||
it('exists', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
expect(w).to.have.property('autoHideMenuBar')
|
||||
|
||||
// TODO(codebytere): remove when propertyification is complete
|
||||
|
|
@ -1011,7 +1011,7 @@ describe('BrowserWindow module', () => {
|
|||
afterEach(closeAllWindows)
|
||||
|
||||
it('returns a Promise with a Buffer', async () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const image = await w.capturePage({
|
||||
x: 0,
|
||||
y: 0,
|
||||
|
|
@ -1023,7 +1023,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('preserves transparency', async () => {
|
||||
const w = new BrowserWindow({show: false, transparent: true})
|
||||
const w = new BrowserWindow({ show: false, transparent: true })
|
||||
w.loadURL('about:blank')
|
||||
await emittedOnce(w, 'ready-to-show')
|
||||
w.show()
|
||||
|
|
@ -1040,7 +1040,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('BrowserWindow.setProgressBar(progress)', () => {
|
||||
let w = null as unknown as BrowserWindow
|
||||
before(() => {
|
||||
w = new BrowserWindow({show: false})
|
||||
w = new BrowserWindow({ show: false })
|
||||
})
|
||||
after(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -1080,7 +1080,7 @@ describe('BrowserWindow module', () => {
|
|||
let w = null as unknown as BrowserWindow
|
||||
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false})
|
||||
w = new BrowserWindow({ show: false })
|
||||
})
|
||||
|
||||
afterEach(async () => {
|
||||
|
|
@ -1136,7 +1136,7 @@ describe('BrowserWindow module', () => {
|
|||
}
|
||||
res.end()
|
||||
})
|
||||
server.on('connection', (connection) => { connections++ })
|
||||
server.on('connection', () => { connections++ })
|
||||
|
||||
await new Promise(resolve => server.listen(0, '127.0.0.1', () => resolve()))
|
||||
url = `http://127.0.0.1:${(server.address() as AddressInfo).port}`
|
||||
|
|
@ -1149,12 +1149,9 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('calling preconnect() connects to the server', (done) => {
|
||||
w = new BrowserWindow({show: false})
|
||||
w.webContents.on('did-start-navigation', (event, preconnectUrl, isInPlace, isMainFrame, frameProcessId, frameRoutingId) => {
|
||||
w.webContents.session.preconnect({
|
||||
url: preconnectUrl,
|
||||
numSockets: 4
|
||||
})
|
||||
w = new BrowserWindow({ show: false })
|
||||
w.webContents.on('did-start-navigation', (event, url) => {
|
||||
w.webContents.session.preconnect({ url, numSockets: 4 })
|
||||
})
|
||||
w.webContents.on('did-finish-load', () => {
|
||||
expect(connections).to.equal(4)
|
||||
|
|
@ -1164,13 +1161,13 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('does not preconnect unless requested', async () => {
|
||||
w = new BrowserWindow({show: false})
|
||||
w = new BrowserWindow({ show: false })
|
||||
await w.loadURL(url)
|
||||
expect(connections).to.equal(1)
|
||||
})
|
||||
|
||||
it('parses <link rel=preconnect>', async () => {
|
||||
w = new BrowserWindow({show: true})
|
||||
w = new BrowserWindow({ show: true })
|
||||
const p = emittedOnce(w.webContents.session, 'preconnect')
|
||||
w.loadURL(url + '/link')
|
||||
const [, preconnectUrl, allowCredentials] = await p
|
||||
|
|
@ -1182,7 +1179,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('BrowserWindow.setAutoHideCursor(autoHide)', () => {
|
||||
let w = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false})
|
||||
w = new BrowserWindow({ show: false })
|
||||
})
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
|
|
@ -1209,7 +1206,7 @@ describe('BrowserWindow module', () => {
|
|||
afterEach(closeAllWindows)
|
||||
|
||||
it('does not throw', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
expect(() => {
|
||||
w.setWindowButtonVisibility(true)
|
||||
w.setWindowButtonVisibility(false)
|
||||
|
|
@ -1232,7 +1229,7 @@ describe('BrowserWindow module', () => {
|
|||
afterEach(closeAllWindows)
|
||||
|
||||
it('allows setting, changing, and removing the vibrancy', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
expect(() => {
|
||||
w.setVibrancy('light')
|
||||
w.setVibrancy('dark')
|
||||
|
|
@ -1247,7 +1244,7 @@ describe('BrowserWindow module', () => {
|
|||
afterEach(closeAllWindows)
|
||||
|
||||
it('supports setting the app details', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const iconPath = path.join(fixtures, 'assets', 'icon.ico')
|
||||
|
||||
expect(() => {
|
||||
|
|
@ -1276,7 +1273,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('BrowserWindow.fromId(id)', () => {
|
||||
afterEach(closeAllWindows)
|
||||
it('returns the window with id', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
expect(BrowserWindow.fromId(w.id).id).to.equal(w.id)
|
||||
})
|
||||
})
|
||||
|
|
@ -1285,7 +1282,7 @@ describe('BrowserWindow module', () => {
|
|||
afterEach(closeAllWindows)
|
||||
|
||||
it('returns the window with the webContents', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const found = BrowserWindow.fromWebContents(w.webContents)
|
||||
expect(found!.id).to.equal(w.id)
|
||||
})
|
||||
|
|
@ -1313,7 +1310,7 @@ describe('BrowserWindow module', () => {
|
|||
|
||||
it('returns the window with the browserView', () => {
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const bv = new BrowserView
|
||||
const bv = new BrowserView()
|
||||
w.setBrowserView(bv)
|
||||
expect(BrowserWindow.fromBrowserView(bv)!.id).to.equal(w.id)
|
||||
// if BrowserView isn't explicitly destroyed, it will crash in GC later
|
||||
|
|
@ -1321,14 +1318,13 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('returns undefined if not attached', () => {
|
||||
const bv = new BrowserView
|
||||
const bv = new BrowserView()
|
||||
expect(BrowserWindow.fromBrowserView(bv)).to.be.null('BrowserWindow associated with bv')
|
||||
// if BrowserView isn't explicitly destroyed, it will crash in GC later
|
||||
bv.destroy()
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
describe('BrowserWindow.setOpacity(opacity)', () => {
|
||||
afterEach(closeAllWindows)
|
||||
|
||||
|
|
@ -1398,7 +1394,7 @@ describe('BrowserWindow module', () => {
|
|||
const w = new BrowserWindow({
|
||||
show: false,
|
||||
width: 400,
|
||||
height: 400,
|
||||
height: 400
|
||||
})
|
||||
const size = w.getSize()
|
||||
expect(size).to.deep.equal([400, 400])
|
||||
|
|
@ -1492,6 +1488,7 @@ describe('BrowserWindow module', () => {
|
|||
afterEach(closeAllWindows)
|
||||
it('can be set on a window', () => {
|
||||
expect(() => {
|
||||
/* eslint-disable no-new */
|
||||
new BrowserWindow({
|
||||
tabbingIdentifier: 'group1'
|
||||
})
|
||||
|
|
@ -1499,6 +1496,7 @@ describe('BrowserWindow module', () => {
|
|||
tabbingIdentifier: 'group2',
|
||||
frame: false
|
||||
})
|
||||
/* eslint-enable no-new */
|
||||
}).not.to.throw()
|
||||
})
|
||||
})
|
||||
|
|
@ -1723,7 +1721,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
describe('"sandbox" option', () => {
|
||||
function waitForEvents<T>(emitter: {once: Function}, events: string[], callback: () => void) {
|
||||
function waitForEvents<T> (emitter: {once: Function}, events: string[], callback: () => void) {
|
||||
let count = events.length
|
||||
for (const event of events) {
|
||||
emitter.once(event, () => {
|
||||
|
|
@ -1967,7 +1965,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('event handling', () => {
|
||||
let w: BrowserWindow = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false, webPreferences: {sandbox: true}})
|
||||
w = new BrowserWindow({ show: false, webPreferences: { sandbox: true } })
|
||||
})
|
||||
it('works for window events', (done) => {
|
||||
waitForEvents(w, [
|
||||
|
|
@ -2191,7 +2189,7 @@ describe('BrowserWindow module', () => {
|
|||
done()
|
||||
})
|
||||
w.loadFile(path.join(fixtures, 'api', 'native-window-open-iframe.html'))
|
||||
});
|
||||
})
|
||||
ifit(!process.env.ELECTRON_SKIP_NATIVE_MODULE_TESTS)('loads native addons correctly after reload', async () => {
|
||||
w.loadFile(path.join(__dirname, 'fixtures', 'api', 'native-window-open-native-addon.html'))
|
||||
{
|
||||
|
|
@ -2250,7 +2248,7 @@ describe('BrowserWindow module', () => {
|
|||
show: false,
|
||||
webPreferences: {
|
||||
nodeIntegration: true,
|
||||
nativeWindowOpen: true,
|
||||
nativeWindowOpen: true
|
||||
}
|
||||
})
|
||||
w.loadFile(path.join(fixtures, 'api', 'native-window-open-argv.html'))
|
||||
|
|
@ -2280,7 +2278,7 @@ describe('BrowserWindow module', () => {
|
|||
})))
|
||||
})
|
||||
afterEach(async () => {
|
||||
await Promise.all(protocols.map(([scheme,]) => {
|
||||
await Promise.all(protocols.map(([scheme]) => {
|
||||
return new Promise(resolve => protocol.unregisterProtocol(scheme, () => resolve()))
|
||||
}))
|
||||
})
|
||||
|
|
@ -2366,7 +2364,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('beforeunload handler', () => {
|
||||
let w: BrowserWindow = null as unknown as BrowserWindow
|
||||
beforeEach(() => {
|
||||
w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
})
|
||||
afterEach(closeAllWindows)
|
||||
it('returning undefined would not prevent close', (done) => {
|
||||
|
|
@ -2594,7 +2592,7 @@ describe('BrowserWindow module', () => {
|
|||
afterEach(closeAllWindows)
|
||||
|
||||
it('emits when window.open is called', (done) => {
|
||||
const w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
w.webContents.once('new-window', (e, url, frameName, disposition, options, additionalFeatures) => {
|
||||
e.preventDefault()
|
||||
expect(url).to.equal('http://host/')
|
||||
|
|
@ -2618,7 +2616,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('emits when link with target is called', (done) => {
|
||||
const w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
w.webContents.once('new-window', (e, url, frameName) => {
|
||||
e.preventDefault()
|
||||
expect(url).to.equal('http://host/')
|
||||
|
|
@ -2632,14 +2630,14 @@ describe('BrowserWindow module', () => {
|
|||
ifdescribe(process.platform !== 'linux')('max/minimize events', () => {
|
||||
afterEach(closeAllWindows)
|
||||
it('emits an event when window is maximized', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
w.once('maximize', () => { done() })
|
||||
w.show()
|
||||
w.maximize()
|
||||
})
|
||||
|
||||
it('emits an event when window is unmaximized', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
w.once('unmaximize', () => { done() })
|
||||
w.show()
|
||||
w.maximize()
|
||||
|
|
@ -2647,7 +2645,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('emits an event when window is minimized', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
w.once('minimize', () => { done() })
|
||||
w.show()
|
||||
w.minimize()
|
||||
|
|
@ -2656,10 +2654,10 @@ describe('BrowserWindow module', () => {
|
|||
|
||||
describe('beginFrameSubscription method', () => {
|
||||
it('does not crash when callback returns nothing', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
w.loadFile(path.join(fixtures, 'api', 'frame-subscriber.html'))
|
||||
w.webContents.on('dom-ready', () => {
|
||||
w.webContents.beginFrameSubscription(function (data) {
|
||||
w.webContents.beginFrameSubscription(function () {
|
||||
// Pending endFrameSubscription to next tick can reliably reproduce
|
||||
// a crash which happens when nothing is returned in the callback.
|
||||
setTimeout(() => {
|
||||
|
|
@ -2671,7 +2669,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('subscribes to frame updates', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
let called = false
|
||||
w.loadFile(path.join(fixtures, 'api', 'frame-subscriber.html'))
|
||||
w.webContents.on('dom-ready', () => {
|
||||
|
|
@ -2690,7 +2688,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('subscribes to frame updates (only dirty rectangle)', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
let called = false
|
||||
let gotInitialFullSizeFrame = false
|
||||
const [contentWidth, contentHeight] = w.getContentSize()
|
||||
|
|
@ -2727,7 +2725,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('throws error when subscriber is not well defined', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
expect(() => {
|
||||
w.webContents.beginFrameSubscription(true, true as any)
|
||||
// TODO(zcbenz): gin is weak at guessing parameter types, we should
|
||||
|
|
@ -2756,7 +2754,7 @@ describe('BrowserWindow module', () => {
|
|||
afterEach(closeAllWindows)
|
||||
|
||||
it('should save page to disk', async () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
await w.loadFile(path.join(fixtures, 'pages', 'save_page', 'index.html'))
|
||||
await w.webContents.savePage(savePageHtmlPath, 'HTMLComplete')
|
||||
|
||||
|
|
@ -2807,7 +2805,7 @@ describe('BrowserWindow module', () => {
|
|||
// only applicable to windows: https://github.com/electron/electron/issues/6036
|
||||
ifdescribe(process.platform === 'win32')('on windows', () => {
|
||||
it('should restore a normal visible window from a fullscreen startup state', async () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
await w.loadURL('about:blank')
|
||||
const shown = emittedOnce(w, 'show')
|
||||
// start fullscreen and hidden
|
||||
|
|
@ -2821,7 +2819,7 @@ describe('BrowserWindow module', () => {
|
|||
expect(w.isFullScreen()).to.be.false('fullscreen')
|
||||
})
|
||||
it('should keep window hidden if already in hidden state', async () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
await w.loadURL('about:blank')
|
||||
const leftFullScreen = emittedOnce(w, 'leave-full-screen')
|
||||
w.setFullScreen(false)
|
||||
|
|
@ -2853,6 +2851,7 @@ describe('BrowserWindow module', () => {
|
|||
w.once('sheet-begin', () => {
|
||||
done()
|
||||
})
|
||||
// eslint-disable-next-line no-new
|
||||
new BrowserWindow({
|
||||
modal: true,
|
||||
parent: w
|
||||
|
|
@ -2871,18 +2870,18 @@ describe('BrowserWindow module', () => {
|
|||
|
||||
describe('parent option', () => {
|
||||
it('sets parent window', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const c = new BrowserWindow({show: false, parent: w})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false, parent: w })
|
||||
expect(c.getParentWindow()).to.equal(w)
|
||||
})
|
||||
it('adds window to child windows of parent', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const c = new BrowserWindow({show: false, parent: w})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false, parent: w })
|
||||
expect(w.getChildWindows()).to.deep.equal([c])
|
||||
})
|
||||
it('removes from child windows of parent when window is closed', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const c = new BrowserWindow({show: false, parent: w})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false, parent: w })
|
||||
c.once('closed', () => {
|
||||
// The child window list is not immediately cleared, so wait a tick until it's ready.
|
||||
setTimeout(() => {
|
||||
|
|
@ -2894,8 +2893,8 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('should not affect the show option', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const c = new BrowserWindow({show: false, parent: w})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false, parent: w })
|
||||
expect(c.isVisible()).to.be.false('child is visible')
|
||||
expect(c.getParentWindow().isVisible()).to.be.false('parent is visible')
|
||||
})
|
||||
|
|
@ -2903,8 +2902,8 @@ describe('BrowserWindow module', () => {
|
|||
|
||||
describe('win.setParentWindow(parent)', () => {
|
||||
it('sets parent window', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const c = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false })
|
||||
expect(w.getParentWindow()).to.be.null('w.parent')
|
||||
expect(c.getParentWindow()).to.be.null('c.parent')
|
||||
c.setParentWindow(w)
|
||||
|
|
@ -2913,8 +2912,8 @@ describe('BrowserWindow module', () => {
|
|||
expect(c.getParentWindow()).to.be.null('c.parent')
|
||||
})
|
||||
it('adds window to child windows of parent', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const c = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false })
|
||||
expect(w.getChildWindows()).to.deep.equal([])
|
||||
c.setParentWindow(w)
|
||||
expect(w.getChildWindows()).to.deep.equal([c])
|
||||
|
|
@ -2922,8 +2921,8 @@ describe('BrowserWindow module', () => {
|
|||
expect(w.getChildWindows()).to.deep.equal([])
|
||||
})
|
||||
it('removes from child windows of parent when window is closed', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const c = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false })
|
||||
c.once('closed', () => {
|
||||
// The child window list is not immediately cleared, so wait a tick until it's ready.
|
||||
setTimeout(() => {
|
||||
|
|
@ -2939,14 +2938,14 @@ describe('BrowserWindow module', () => {
|
|||
// The isEnabled API is not reliable on macOS.
|
||||
ifdescribe(process.platform !== 'darwin')('modal option', () => {
|
||||
it('disables parent window', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false, parent: w, modal: true })
|
||||
expect(w.isEnabled()).to.be.true('w.isEnabled')
|
||||
c.show()
|
||||
expect(w.isEnabled()).to.be.false('w.isEnabled')
|
||||
})
|
||||
it('re-enables an enabled parent window when closed', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false, parent: w, modal: true })
|
||||
c.once('closed', () => {
|
||||
expect(w.isEnabled()).to.be.true('w.isEnabled')
|
||||
|
|
@ -2956,7 +2955,7 @@ describe('BrowserWindow module', () => {
|
|||
c.close()
|
||||
})
|
||||
it('does not re-enable a disabled parent window when closed', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false, parent: w, modal: true })
|
||||
c.once('closed', () => {
|
||||
expect(w.isEnabled()).to.be.false('w.isEnabled')
|
||||
|
|
@ -2967,7 +2966,7 @@ describe('BrowserWindow module', () => {
|
|||
c.close()
|
||||
})
|
||||
it('disables parent window recursively', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const c = new BrowserWindow({ show: false, parent: w, modal: true })
|
||||
const c2 = new BrowserWindow({ show: false, parent: w, modal: true })
|
||||
c.show()
|
||||
|
|
@ -3086,7 +3085,7 @@ describe('BrowserWindow module', () => {
|
|||
})
|
||||
|
||||
it('is true when the main frame is loading', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
w.webContents.on('did-start-loading', () => {
|
||||
expect(w.webContents.isLoadingMainFrame()).to.be.true('isLoadingMainFrame')
|
||||
done()
|
||||
|
|
@ -3094,7 +3093,7 @@ describe('BrowserWindow module', () => {
|
|||
w.webContents.loadURL(serverUrl)
|
||||
})
|
||||
it('is false when only a subframe is loading', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
w.webContents.once('did-stop-loading', () => {
|
||||
expect(w.webContents.isLoadingMainFrame()).to.be.false('isLoadingMainFrame')
|
||||
w.webContents.on('did-start-loading', () => {
|
||||
|
|
@ -3110,7 +3109,7 @@ describe('BrowserWindow module', () => {
|
|||
w.webContents.loadURL(serverUrl)
|
||||
})
|
||||
it('is true when navigating to pages from the same origin', (done) => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
w.webContents.once('did-stop-loading', () => {
|
||||
expect(w.webContents.isLoadingMainFrame()).to.be.false('isLoadingMainFrame')
|
||||
w.webContents.on('did-start-loading', () => {
|
||||
|
|
@ -3466,7 +3465,7 @@ describe('BrowserWindow module', () => {
|
|||
describe('window.getMediaSourceId()', () => {
|
||||
afterEach(closeAllWindows)
|
||||
it('returns valid source id', async () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
const shown = emittedOnce(w, 'show')
|
||||
w.show()
|
||||
await shown
|
||||
|
|
@ -3480,7 +3479,7 @@ describe('BrowserWindow module', () => {
|
|||
ifdescribe(!process.env.ELECTRON_SKIP_NATIVE_MODULE_TESTS)('window.getNativeWindowHandle()', () => {
|
||||
afterEach(closeAllWindows)
|
||||
it('returns valid handle', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
// The module's source code is hosted at
|
||||
// https://github.com/electron/node-is-valid-window
|
||||
const isValidWindow = require('is-valid-window')
|
||||
|
|
@ -3502,7 +3501,7 @@ describe('BrowserWindow module', () => {
|
|||
|
||||
const showLastPanel = () => {
|
||||
// this is executed in the devtools context, where UI is a global
|
||||
const {UI} = (window as any)
|
||||
const { UI } = (window as any)
|
||||
const lastPanelId = UI.inspectorView._tabbedPane._tabs.peekLast().id
|
||||
UI.inspectorView.showPanel(lastPanelId)
|
||||
}
|
||||
|
|
@ -3556,7 +3555,7 @@ describe('BrowserWindow module', () => {
|
|||
let message: any
|
||||
let w: BrowserWindow
|
||||
before(async () => {
|
||||
w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
const p = new Promise(resolve => ipcMain.once('answer', (event, message) => {
|
||||
resolve(message)
|
||||
}))
|
||||
|
|
@ -3602,7 +3601,7 @@ describe('BrowserWindow module', () => {
|
|||
let message: any
|
||||
let w: BrowserWindow
|
||||
before(async () => {
|
||||
w = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true}})
|
||||
w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
|
||||
showLastDevToolsPanel(w)
|
||||
w.loadURL('about:blank')
|
||||
w.webContents.openDevTools({ mode: 'undocked' })
|
||||
|
|
@ -3686,7 +3685,7 @@ describe('BrowserWindow module', () => {
|
|||
ifdescribe(process.platform === 'darwin')('previewFile', () => {
|
||||
afterEach(closeAllWindows)
|
||||
it('opens the path in Quick Look on macOS', () => {
|
||||
const w = new BrowserWindow({show: false})
|
||||
const w = new BrowserWindow({ show: false })
|
||||
expect(() => {
|
||||
w.previewFile(__filename)
|
||||
w.closeFilePreview()
|
||||
|
|
@ -3871,7 +3870,7 @@ describe('BrowserWindow module', () => {
|
|||
|
||||
describe('window.webContents.isPainting()', () => {
|
||||
it('returns whether is currently painting', (done) => {
|
||||
w.webContents.once('paint', function (event, rect, data) {
|
||||
w.webContents.once('paint', function () {
|
||||
expect(w.webContents.isPainting()).to.be.true('isPainting')
|
||||
done()
|
||||
})
|
||||
|
|
@ -3895,7 +3894,7 @@ describe('BrowserWindow module', () => {
|
|||
w.webContents.on('dom-ready', () => {
|
||||
w.webContents.stopPainting()
|
||||
w.webContents.startPainting()
|
||||
w.webContents.once('paint', function (event, rect, data) {
|
||||
w.webContents.once('paint', function () {
|
||||
expect(w.webContents.isPainting()).to.be.true('isPainting')
|
||||
done()
|
||||
})
|
||||
|
|
@ -3907,7 +3906,7 @@ describe('BrowserWindow module', () => {
|
|||
// TODO(codebytere): remove in Electron v8.0.0
|
||||
describe('window.webContents.getFrameRate()', () => {
|
||||
it('has default frame rate', (done) => {
|
||||
w.webContents.once('paint', function (event, rect, data) {
|
||||
w.webContents.once('paint', function () {
|
||||
expect(w.webContents.getFrameRate()).to.equal(60)
|
||||
done()
|
||||
})
|
||||
|
|
@ -3920,7 +3919,7 @@ describe('BrowserWindow module', () => {
|
|||
it('sets custom frame rate', (done) => {
|
||||
w.webContents.on('dom-ready', () => {
|
||||
w.webContents.setFrameRate(30)
|
||||
w.webContents.once('paint', function (event, rect, data) {
|
||||
w.webContents.once('paint', function () {
|
||||
expect(w.webContents.getFrameRate()).to.equal(30)
|
||||
done()
|
||||
})
|
||||
|
|
@ -3931,7 +3930,7 @@ describe('BrowserWindow module', () => {
|
|||
|
||||
describe('window.webContents.FrameRate', () => {
|
||||
it('has default frame rate', (done) => {
|
||||
w.webContents.once('paint', function (event, rect, data) {
|
||||
w.webContents.once('paint', function () {
|
||||
expect(w.webContents.frameRate).to.equal(60)
|
||||
done()
|
||||
})
|
||||
|
|
@ -3941,7 +3940,7 @@ describe('BrowserWindow module', () => {
|
|||
it('sets custom frame rate', (done) => {
|
||||
w.webContents.on('dom-ready', () => {
|
||||
w.webContents.frameRate = 30
|
||||
w.webContents.once('paint', function (event, rect, data) {
|
||||
w.webContents.once('paint', function () {
|
||||
expect(w.webContents.frameRate).to.equal(30)
|
||||
done()
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue