From 3e28eff75513445ade42143d3fc11b8bd967ef4b Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 9 Feb 2015 14:22:11 -0800
Subject: [PATCH] Remove logic for different promise types in waitsForPromise

I added that logic when using the selenium-webdriver library, but
then switched to using webdriverio, which has the same Promise
interface as Q.
---
 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 1c5348594..484ade2d9 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -305,13 +305,13 @@ window.waitsForPromise = (args...) ->
   window.waitsFor timeout, (moveOn) ->
     promise = fn()
     if shouldReject
-      (promise.catch ? promise.thenCatch).call(promise, moveOn)
+      promise.catch.call(promise, moveOn)
       promise.then ->
         jasmine.getEnv().currentSpec.fail("Expected promise to be rejected, but it was resolved")
         moveOn()
     else
       promise.then(moveOn)
-      (promise.catch ? promise.thenCatch).call promise, (error) ->
+      promise.catch.call promise, (error) ->
         jasmine.getEnv().currentSpec.fail("Expected promise to be resolved, but it was rejected with #{jasmine.pp(error)}")
         moveOn()