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

spec: Fix error when refreshing

Browse source
This commit is contained in:
Cheng Zhao 2015-05-04 12:51:28 +08:00
parent 0d4d2080ca
commit a04222f398
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -227,6 +227,7 @@ describe 'browser-window module', ->
describe 'dom-ready event', -> describe 'dom-ready event', ->
it 'emits when document is loaded', (done) -> it 'emits when document is loaded', (done) ->
ipc = remote.require 'ipc'
server = http.createServer (req, res) -> server = http.createServer (req, res) ->
action = url.parse(req.url, true).pathname action = url.parse(req.url, true).pathname
if action == '/logo.png' if action == '/logo.png'
@ -237,7 +238,8 @@ describe 'browser-window module', ->
, 2000 , 2000
server.close() server.close()
server.listen 62542, '127.0.0.1' server.listen 62542, '127.0.0.1'
remote.require('ipc').on 'dom-ready', (e, state) -> ipc.on 'dom-ready', (e, state) ->
ipc.removeAllListeners 'dom-ready'
assert.equal state, 'interactive' assert.equal state, 'interactive'
done() done()
w.webContents.on 'did-finish-load', -> w.webContents.on 'did-finish-load', ->

8
spec/webview-spec.coffee
View file

@ -181,15 +181,15 @@ describe '<webview> tag', ->
describe '<webview>.reload()', -> describe '<webview>.reload()', ->
it 'should emit beforeunload handler', (done) -> it 'should emit beforeunload handler', (done) ->
webview.addEventListener 'did-finish-load', (e) ->
webview.reload()
listener = (e) -> listener = (e) ->
assert.equal e.channel, 'onbeforeunload' assert.equal e.channel, 'onbeforeunload'
webview.removeEventListener 'ipc-message', listener webview.removeEventListener 'ipc-message', listener
done() done()
webview.addEventListener 'console-message', (e) -> listener2 = (e) ->
console.log(e) webview.reload()
webview.removeEventListener 'did-finish-load', listener2
webview.addEventListener 'ipc-message', listener webview.addEventListener 'ipc-message', listener
webview.addEventListener 'did-finish-load', listener2
webview.setAttribute 'nodeintegration', 'on' webview.setAttribute 'nodeintegration', 'on'
webview.src = "file://#{fixtures}/pages/beforeunload-false.html" webview.src = "file://#{fixtures}/pages/beforeunload-false.html"
document.body.appendChild webview document.body.appendChild webview