From 2ac83b4a40fd0b86e05455e164a6cbbc835f59db Mon Sep 17 00:00:00 2001
From: Brian Mann <brian@backbonerails.com>
Date: Tue, 29 Aug 2017 15:35:33 -0400
Subject: [PATCH] server: do use Promise cancellation, fixes failing tests

---
 packages/server/lib/environment.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/server/lib/environment.coffee b/packages/server/lib/environment.coffee
index 0755ea98ef..d72eb759eb 100644
--- a/packages/server/lib/environment.coffee
+++ b/packages/server/lib/environment.coffee
@@ -32,6 +32,9 @@ try
 env = process.env["CYPRESS_ENV"] or= pkg.env ? "development"
 
 Promise.config({
+  ## uses cancellation for automation timeouts
+  cancellation: true
+
   ## enable long stack traces in dev
   longStackTraces: env is "development"
 })