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

spec: Suppress beginFrameSubscription on CI

Browse source
This commit is contained in:
Cheng Zhao 2015-09-21 11:43:10 +08:00
parent 7807d878d2
commit a567d7a0b6
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -305,13 +305,12 @@ describe 'browser-window module', ->
w.loadUrl url w.loadUrl url
describe 'beginFrameSubscription method', -> describe 'beginFrameSubscription method', ->
@timeout 10000 # It is not very reliable on Travis CI.
return if process.env.TRAVIS is 'true'
it 'subscribes frame updates', (done) -> it 'subscribes frame updates', (done) ->
called = false
w.loadUrl "file://#{fixtures}/api/blank.html" w.loadUrl "file://#{fixtures}/api/blank.html"
w.webContents.beginFrameSubscription (data) -> w.webContents.beginFrameSubscription (data) ->
return if called
called = true
assert.notEqual data.length, 0 assert.notEqual data.length, 0
w.webContents.endFrameSubscription() w.webContents.endFrameSubscription()
done() done()

4
spec/chromium-spec.coffee
View file

@ -62,7 +62,7 @@ describe 'chromium feature', ->
ipc.removeAllListeners 'opener' ipc.removeAllListeners 'opener'
it 'is null for main window', (done) -> it 'is null for main window', (done) ->
ipc.on 'opener', (event, opener) -> ipc.once 'opener', (event, opener) ->
assert.equal opener, null assert.equal opener, null
done() done()
BrowserWindow = remote.require 'browser-window' BrowserWindow = remote.require 'browser-window'
@ -70,7 +70,7 @@ describe 'chromium feature', ->
w.loadUrl url w.loadUrl url
it 'is not null for window opened by window.open', (done) -> it 'is not null for window opened by window.open', (done) ->
ipc.on 'opener', (event, opener) -> ipc.once 'opener', (event, opener) ->
b.close() b.close()
done(if opener isnt null then undefined else opener) done(if opener isnt null then undefined else opener)
b = window.open url, '', 'show=no' b = window.open url, '', 'show=no'