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

DRY up logic to check if native modules should be loaded

Browse source
This commit is contained in:
Kevin Sawicki 2017-05-25 16:40:15 -07:00
parent 90964290a6
commit 5cf4995f2e
4 changed files with 55 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

33
spec/webview-spec.js
View file

@ -7,6 +7,7 @@ const {app, session, getGuestWebContents, ipcMain, BrowserWindow, webContents} =
const {closeWindow} = require('./window-helpers')
const isCI = remote.getGlobal('isCi')
const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
describe('<webview> tag', function () {
this.timeout(3 * 60 * 1000)
@ -171,23 +172,23 @@ describe('<webview> tag', function () {
document.body.appendChild(webview)
})
if (process.platform !== 'win32' || process.execPath.toLowerCase().indexOf('\\out\\d\\') === -1) {
it('loads native modules when navigation happens', function (done) {
var listener = function () {
webview.removeEventListener('did-finish-load', listener)
var listener2 = function (e) {
assert.equal(e.message, 'function')
done()
}
webview.addEventListener('console-message', listener2)
webview.reload()
it('loads native modules when navigation happens', function (done) {
if (!nativeModulesEnabled) return done()
var listener = function () {
webview.removeEventListener('did-finish-load', listener)
var listener2 = function (e) {
assert.equal(e.message, 'function')
done()
}
webview.addEventListener('did-finish-load', listener)
webview.setAttribute('nodeintegration', 'on')
webview.src = 'file://' + fixtures + '/pages/native-module.html'
document.body.appendChild(webview)
})
}
webview.addEventListener('console-message', listener2)
webview.reload()
}
webview.addEventListener('did-finish-load', listener)
webview.setAttribute('nodeintegration', 'on')
webview.src = 'file://' + fixtures + '/pages/native-module.html'
document.body.appendChild(webview)
})
})
describe('preload attribute', function () {