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

test: tsify affinity spec (#19961)

Browse source
This commit is contained in:
Jeremy Apthorp 2019-08-29 09:59:27 -07:00 • committed by GitHub
commit 609403fba6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

45
spec/api-browser-window-affinity-spec.js → spec-main/api-browser-window-affinity-spec.ts
View file

@ -1,19 +1,16 @@
'use strict' import { expect } from 'chai'
import * as path from 'path'
const { expect } = require('chai') import { ipcMain, BrowserWindow, WebPreferences } from 'electron'
const path = require('path') import { closeWindow } from './window-helpers'
const { remote } = require('electron')
const { ipcMain, BrowserWindow } = remote
const { closeWindow } = require('./window-helpers')
describe('BrowserWindow with affinity module', () => { describe('BrowserWindow with affinity module', () => {
const fixtures = path.resolve(__dirname, 'fixtures') const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures')
const myAffinityName = 'myAffinity' const myAffinityName = 'myAffinity'
const myAffinityNameUpper = 'MYAFFINITY' const myAffinityNameUpper = 'MYAFFINITY'
const anotherAffinityName = 'anotherAffinity' const anotherAffinityName = 'anotherAffinity'
async function createWindowWithWebPrefs (webPrefs) { async function createWindowWithWebPrefs (webPrefs: WebPreferences) {
const w = new BrowserWindow({ const w = new BrowserWindow({
show: false, show: false,
width: 400, width: 400,
@ -24,16 +21,16 @@ describe('BrowserWindow with affinity module', () => {
return w return w
} }
function testAffinityProcessIds (name, webPreferences = {}) { function testAffinityProcessIds (name: string, webPreferences: WebPreferences = {}) {
describe(name, () => { describe(name, () => {
let mAffinityWindow let mAffinityWindow: BrowserWindow
before(async () => { before(async () => {
mAffinityWindow = await createWindowWithWebPrefs({ affinity: myAffinityName, ...webPreferences }) mAffinityWindow = await createWindowWithWebPrefs({ affinity: myAffinityName, ...webPreferences })
}) })
after(async () => { after(async () => {
await closeWindow(mAffinityWindow, { assertSingleWindow: false }) await closeWindow(mAffinityWindow, { assertNotWindows: false })
mAffinityWindow = null mAffinityWindow = null as unknown as BrowserWindow
}) })
it('should have a different process id than a default window', async () => { it('should have a different process id than a default window', async () => {
@ -42,7 +39,7 @@ describe('BrowserWindow with affinity module', () => {
const wcID = w.webContents.getOSProcessId() const wcID = w.webContents.getOSProcessId()
expect(affinityID).to.not.equal(wcID, 'Should have different OS process IDs') expect(affinityID).to.not.equal(wcID, 'Should have different OS process IDs')
await closeWindow(w, { assertSingleWindow: false }) await closeWindow(w, { assertNotWindows: false })
}) })
it(`should have a different process id than a window with a different affinity '${anotherAffinityName}'`, async () => { it(`should have a different process id than a window with a different affinity '${anotherAffinityName}'`, async () => {
@ -51,7 +48,7 @@ describe('BrowserWindow with affinity module', () => {
const wcID = w.webContents.getOSProcessId() const wcID = w.webContents.getOSProcessId()
expect(affinityID).to.not.equal(wcID, 'Should have different OS process IDs') expect(affinityID).to.not.equal(wcID, 'Should have different OS process IDs')
await closeWindow(w, { assertSingleWindow: false }) await closeWindow(w, { assertNotWindows: false })
}) })
it(`should have the same OS process id than a window with the same affinity '${myAffinityName}'`, async () => { it(`should have the same OS process id than a window with the same affinity '${myAffinityName}'`, async () => {
@ -60,7 +57,7 @@ describe('BrowserWindow with affinity module', () => {
const wcID = w.webContents.getOSProcessId() const wcID = w.webContents.getOSProcessId()
expect(affinityID).to.equal(wcID, 'Should have the same OS process ID') expect(affinityID).to.equal(wcID, 'Should have the same OS process ID')
await closeWindow(w, { assertSingleWindow: false }) await closeWindow(w, { assertNotWindows: false })
}) })
it(`should have the same OS process id than a window with an equivalent affinity '${myAffinityNameUpper}' (case insensitive)`, async () => { it(`should have the same OS process id than a window with an equivalent affinity '${myAffinityNameUpper}' (case insensitive)`, async () => {
@ -69,7 +66,7 @@ describe('BrowserWindow with affinity module', () => {
const wcID = w.webContents.getOSProcessId() const wcID = w.webContents.getOSProcessId()
expect(affinityID).to.equal(wcID, 'Should have the same OS process ID') expect(affinityID).to.equal(wcID, 'Should have the same OS process ID')
await closeWindow(w, { assertSingleWindow: false }) await closeWindow(w, { assertNotWindows: false })
}) })
}) })
} }
@ -83,7 +80,7 @@ describe('BrowserWindow with affinity module', () => {
const affinityWithNodeTrue = 'affinityWithNodeTrue' const affinityWithNodeTrue = 'affinityWithNodeTrue'
const affinityWithNodeFalse = 'affinityWithNodeFalse' const affinityWithNodeFalse = 'affinityWithNodeFalse'
function testNodeIntegration (present) { function testNodeIntegration (present: boolean) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
ipcMain.once('answer', (event, typeofProcess, typeofBuffer) => { ipcMain.once('answer', (event, typeofProcess, typeofBuffer) => {
if (present) { if (present) {
@ -107,7 +104,7 @@ describe('BrowserWindow with affinity module', () => {
nodeIntegration: false nodeIntegration: false
}) })
]) ])
await closeWindow(w, { assertSingleWindow: false }) await closeWindow(w, { assertNotWindows: false })
}) })
it('disables node integration when first window is false', async () => { it('disables node integration when first window is false', async () => {
const [, w1] = await Promise.all([ const [, w1] = await Promise.all([
@ -127,8 +124,8 @@ describe('BrowserWindow with affinity module', () => {
}) })
]) ])
await Promise.all([ await Promise.all([
closeWindow(w1, { assertSingleWindow: false }), closeWindow(w1, { assertNotWindows: false }),
closeWindow(w2, { assertSingleWindow: false }) closeWindow(w2, { assertNotWindows: false })
]) ])
}) })
@ -141,7 +138,7 @@ describe('BrowserWindow with affinity module', () => {
nodeIntegration: true nodeIntegration: true
}) })
]) ])
await closeWindow(w, { assertSingleWindow: false }) await closeWindow(w, { assertNotWindows: false })
}) })
it('enables node integration when first window is true', async () => { it('enables node integration when first window is true', async () => {
@ -162,8 +159,8 @@ describe('BrowserWindow with affinity module', () => {
}) })
]) ])
await Promise.all([ await Promise.all([
closeWindow(w1, { assertSingleWindow: false }), closeWindow(w1, { assertNotWindows: false }),
closeWindow(w2, { assertSingleWindow: false }) closeWindow(w2, { assertNotWindows: false })
]) ])
}) })
}) })