From 76a5da8be8f2ff79d32163f6eea344376d32d26f Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Thu, 22 Jan 2015 17:26:15 -0800 Subject: [PATCH] Make waitsForPromise() work with es6 promises as well as Q promises. --- spec/spec-helper.coffee | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index c51ef522f..11ee5fefa 100644 --- a/spec/spec-helper.coffee +++ b/spec/spec-helper.coffee @@ -298,13 +298,13 @@ window.waitsForPromise = (args...) -> window.waitsFor timeout, (moveOn) -> promise = fn() if shouldReject - promise.fail(moveOn) - promise.done -> + promise.catch(moveOn) + promise.then -> jasmine.getEnv().currentSpec.fail("Expected promise to be rejected, but it was resolved") moveOn() else - promise.done(moveOn) - promise.fail (error) -> + promise.then(moveOn) + promise.catch (error) -> jasmine.getEnv().currentSpec.fail("Expected promise to be resolved, but it was rejected with #{jasmine.pp(error)}") moveOn()