build: fix the build with enable_run_as_node disabled (#15711)

This commit is contained in:
Alexey Kuzmin
2019-01-11 17:02:06 +01:00
committed by Shelley Vohr
parent ca218b6395
commit 3cb9aadb80
5 changed files with 46 additions and 3 deletions

View File

@@ -12,6 +12,8 @@ const remote = require('electron').remote
const { ipcMain, BrowserWindow } = remote
const features = process.atomBinding('features')
describe('asar package', function () {
const fixtures = path.join(__dirname, 'fixtures')
@@ -844,6 +846,12 @@ describe('asar package', function () {
})
describe('child_process.fork', function () {
before(function () {
if (!features.isRunAsNodeEnabled()) {
this.skip()
}
})
it('opens a normal js file', function (done) {
const child = ChildProcess.fork(path.join(fixtures, 'asar', 'a.asar', 'ping.js'))
child.on('message', function (msg) {
@@ -1040,6 +1048,12 @@ describe('asar package', function () {
})
describe('process.env.ELECTRON_NO_ASAR', function () {
before(function () {
if (!features.isRunAsNodeEnabled()) {
this.skip()
}
})
it('disables asar support in forked processes', function (done) {
const forked = ChildProcess.fork(path.join(__dirname, 'fixtures', 'module', 'no-asar.js'), [], {
env: {
@@ -1205,6 +1219,11 @@ describe('asar package', function () {
})
it('is available in forked scripts', function (done) {
if (!features.isRunAsNodeEnabled()) {
this.skip()
done()
}
const child = ChildProcess.fork(path.join(fixtures, 'module', 'original-fs.js'))
child.on('message', function (msg) {
assert.strictEqual(msg, 'object')

View File

@@ -5,6 +5,7 @@ const fs = require('fs')
const { remote } = require('electron')
const { BrowserWindow } = remote
const { closeWindow } = require('./window-helpers')
const features = process.atomBinding('features')
const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
@@ -17,7 +18,12 @@ describe('modules support', () => {
require('runas')
})
it('can be required in node binary', (done) => {
it('can be required in node binary', function (done) {
if (!features.isRunAsNodeEnabled()) {
this.skip()
done()
}
const runas = path.join(fixtures, 'module', 'runas.js')
const child = require('child_process').fork(runas)
child.on('message', (msg) => {

View File

@@ -6,6 +6,7 @@ const fs = require('fs')
const path = require('path')
const os = require('os')
const { ipcRenderer, remote } = require('electron')
const features = process.atomBinding('features')
const isCI = remote.getGlobal('isCi')
chai.use(dirtyChai)
@@ -14,6 +15,12 @@ describe('node feature', () => {
const fixtures = path.join(__dirname, 'fixtures')
describe('child_process', () => {
beforeEach(function () {
if (!features.isRunAsNodeEnabled()) {
this.skip()
}
})
describe('child_process.fork', () => {
it('works in current process', (done) => {
const child = ChildProcess.fork(path.join(fixtures, 'module', 'ping.js'))
@@ -208,6 +215,12 @@ describe('node feature', () => {
describe('inspector', () => {
let child = null
beforeEach(function () {
if (!features.isRunAsNodeEnabled()) {
this.skip()
}
})
afterEach(() => {
if (child !== null) child.kill()
})
@@ -299,7 +312,7 @@ describe('node feature', () => {
describe('net.connect', () => {
before(function () {
if (process.platform !== 'darwin') {
if (!features.isRunAsNodeEnabled() || process.platform !== 'darwin') {
this.skip()
}
})