When promise resolution throws an exception, waitsForPromise is halted

This commit is contained in:
Corey Johnson & Nathan Sobo
2012-07-12 11:45:44 -07:00
parent 0d50066dad
commit 1331cfb749

View File

@@ -99,13 +99,14 @@ window.waitsForPromise = (args...) ->
promise = fn()
if shouldReject
promise.fail(moveOn)
promise.done -> throw new Error("Expected promise to be rejected, but it was resolved")
promise.done ->
jasmine.getEnv().currentSpec.fail("Expected promise to be rejected, but it was resolved")
moveOn()
else
promise.done(moveOn)
promise.fail ->
debugger
throw new Error("Expected promise to be resolved, but it was rejected")
jasmine.getEnv().currentSpec.fail("Expected promise to be resolved, but it was rejected")
moveOn()
window.resetTimeouts = ->
window.now = 0