From 869fe71f7302c5101bb52743ce8d90e97baeb2b9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Mon, 23 Sep 2013 16:44:59 -0700
Subject: [PATCH] Accept timeout option to waitsForPromise

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

diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 1bb8d1104..aa5590a25 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -160,12 +160,12 @@ window.mousemoveEvent = (properties={}) ->
 
 window.waitsForPromise = (args...) ->
   if args.length > 1
-    { shouldReject } = args[0]
+    { shouldReject, timeout } = args[0]
   else
     shouldReject = false
   fn = _.last(args)
 
-  window.waitsFor (moveOn) ->
+  window.waitsFor timeout, (moveOn) ->
     promise = fn()
     if shouldReject
       promise.fail(moveOn)