Skip to content

Commit 1c456a1

Browse files
committed
Use ipc helper instead of remote module
1 parent 6f027d8 commit 1c456a1

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

test/renderer/opts_test.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
'use strict'
22

33
const assert = require('assert')
4-
const remote = require('electron').remote
4+
const { ipcRenderer } = require('electron')
55

66
describe('mocha.opts', () => {
77
it('--require modules are loaded in renderer', () => {
88
assert.strictEqual(true, window.required)
99
})
1010

11-
it('--require modules are not loaded in main', () => {
12-
assert.strictEqual(undefined, remote.getGlobal('required'))
11+
it('--require modules are not loaded in main', async () => {
12+
assert.strictEqual(undefined, await ipcRenderer.invoke('get-global', 'required'))
1313
})
1414

1515
it('--script modules are loaded', () => {
1616
assert.strictEqual(true, window.preloaded)
1717
})
1818

19-
it('--require-main modules are loaded in the main process', () => {
20-
assert.strictEqual(true, remote.getGlobal('requiredMain'))
19+
it('--require-main modules are loaded in the main process', async () => {
20+
assert.strictEqual(true, await ipcRenderer.invoke('get-global', 'requiredMain'))
2121
})
2222

23-
it('--require-main modules are loaded before "ready"', () => {
24-
assert.strictEqual(true, remote.getGlobal('requiredMainBeforeReady'))
23+
it('--require-main modules are loaded before "ready"', async () => {
24+
assert.strictEqual(true, await ipcRenderer.invoke('get-global', 'requiredMainBeforeReady'))
2525
})
2626

2727
it('--url custom page loaded', () => {

test/support/requireMain.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1+
const { ipcMain } = require('electron')
2+
13
global.requiredMain = true
24
global.requiredMainBeforeReady = !require('electron').app.isReady()
5+
6+
ipcMain.handle('get-global', async (event, name) =>
7+
global[name]
8+
)

0 commit comments

Comments
 (0)