From 1331cfb74994d5c395964c23772153ffdbc3ab90 Mon Sep 17 00:00:00 2001
From: Corey Johnson & Nathan Sobo <cj+nathan@github.com>
Date: Thu, 12 Jul 2012 11:45:44 -0700
Subject: [PATCH] When promise resolution throws an exception, waitsForPromise
 is halted

---
 spec/spec-helper.coffee | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 6c6472894..8fc7fcbd0 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -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