From 4fff6221bd20ef685ab28617bd6e7a5aaafd2d56 Mon Sep 17 00:00:00 2001 From: Daniel Hengeveld Date: Thu, 14 Jan 2016 20:47:02 -0500 Subject: [PATCH] Add option for custom label to waitsForPromise --- spec/spec-helper.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index 67883511b..c252fbdb7 100644 --- a/spec/spec-helper.coffee +++ b/spec/spec-helper.coffee @@ -209,12 +209,13 @@ addCustomMatchers = (spec) -> window.waitsForPromise = (args...) -> if args.length > 1 - {shouldReject, timeout} = args[0] + {shouldReject, timeout, label} = args[0] else + label = 'promise to be resolved or rejected' shouldReject = false fn = _.last(args) - window.waitsFor timeout, (moveOn) -> + window.waitsFor label, timeout, (moveOn) -> promise = fn() if shouldReject promise.catch.call(promise, moveOn)