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

spec: node-integration should work in web-preferences

Browse source
This commit is contained in:
Cheng Zhao 2015-09-10 15:30:41 +08:00
commit d4cbf7cadb
4 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

39
spec/api-browser-window-spec.coffee
View file

@ -182,15 +182,36 @@ describe 'browser-window module', ->
assert.equal after[0], size.width assert.equal after[0], size.width
assert.equal after[1], size.height assert.equal after[1], size.height
describe '"preload" options', -> describe '"web-preferences" option', ->
it 'loads the script before other scripts in window', (done) -> afterEach ->
preload = path.join fixtures, 'module', 'set-global.js' remote.require('ipc').removeAllListeners('answer')
remote.require('ipc').once 'preload', (event, test) ->
assert.equal(test, 'preload') describe '"preload" option', ->
done() it 'loads the script before other scripts in window', (done) ->
w.destroy() preload = path.join fixtures, 'module', 'set-global.js'
w = new BrowserWindow(show: false, width: 400, height: 400, preload: preload) remote.require('ipc').once 'answer', (event, test) ->
w.loadUrl 'file://' + path.join(fixtures, 'api', 'preload.html') assert.equal(test, 'preload')
done()
w.destroy()
w = new BrowserWindow
show: false
'web-preferences':
preload: preload
w.loadUrl 'file://' + path.join(fixtures, 'api', 'preload.html')
describe '"node-integration" option', ->
it 'disables node integration when specified to false', (done) ->
preload = path.join fixtures, 'module', 'send-later.js'
remote.require('ipc').once 'answer', (event, test) ->
assert.equal(test, 'undefined')
done()
w.destroy()
w = new BrowserWindow
show: false
'web-preferences':
preload: preload
'node-integration': false
w.loadUrl 'file://' + path.join(fixtures, 'api', 'blank.html')
describe 'beforeunload handler', -> describe 'beforeunload handler', ->
it 'returning true would not prevent close', (done) -> it 'returning true would not prevent close', (done) ->

5
spec/fixtures/api/blank.html vendored Normal file
View file

@ -0,0 +1,5 @@
<html>
<script type="text/javascript" charset="utf-8">
window;
</script>
</html>

2
spec/fixtures/api/preload.html vendored
View file

@ -3,7 +3,7 @@
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
if (!window.test) if (!window.test)
window.test = 'window' window.test = 'window'
require('ipc').send('preload', window.test); require('ipc').send('answer', window.test);
</script> </script>
</body> </body>
</html> </html>

4
spec/fixtures/module/send-later.js vendored Normal file
View file

@ -0,0 +1,4 @@
var ipc = require('ipc');
window.onload = function() {
ipc.send('answer', typeof window.process);
}