github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition in spec

Browse Source
This commit is contained in:
Corey Johnson & Kevin Sawicki
2013-02-22 16:31:50 -08:00
parent 8e6ae81169
commit 2c986fdbfc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spec/app/editor-spec.coffee
View File

@@ -308,10 +308,11 @@ describe "Editor", ->
spyOn(atom, "confirm")
contentsConflictedHandler = jasmine.createSpy("contentsConflictedHandler")
editSession.on 'contents-conflicted', contentsConflictedHandler
fs.write(path, "a file change")
waitsFor "file to trigger contents-changed event", (done) ->
editSession.one 'contents-conflicted', done
waitsFor ->
contentsConflictedHandler.callCount > 0
runs ->
expect(atom.confirm).toHaveBeenCalled()