Skip to content

Commit

Permalink
Use ipc helper instead of remote module
Browse files Browse the repository at this point in the history
  • Loading branch information
inukshuk committed Nov 25, 2021
1 parent 6f027d8 commit 1c456a1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
14 changes: 7 additions & 7 deletions test/renderer/opts_test.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
'use strict'

const assert = require('assert')
const remote = require('electron').remote
const { ipcRenderer } = require('electron')

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

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

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

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

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

it('--url custom page loaded', () => {
Expand Down
6 changes: 6 additions & 0 deletions test/support/requireMain.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
const { ipcMain } = require('electron')

global.requiredMain = true
global.requiredMainBeforeReady = !require('electron').app.isReady()

ipcMain.handle('get-global', async (event, name) =>
global[name]
)

0 comments on commit 1c456a1

Please sign in to comment.