From 1eb684ac0e97946be7a86fcb6a712ab036c6352e Mon Sep 17 00:00:00 2001
From: bekzod <bekzod@me.com>
Date: Sun, 16 Jul 2017 14:27:33 +0500
Subject: [PATCH] possible fix for #15490

---
 packages/ember-testing/lib/test/promise.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ember-testing/lib/test/promise.js b/packages/ember-testing/lib/test/promise.js
index a5e2624017e..72c67c7c777 100644
--- a/packages/ember-testing/lib/test/promise.js
+++ b/packages/ember-testing/lib/test/promise.js
@@ -9,8 +9,10 @@ export default class TestPromise extends RSVP.Promise {
     lastPromise = this;
   }
 
-  then(onFulfillment, ...args) {
-    return super.then(result => isolate(onFulfillment, result), ...args);
+  then(_onFulfillment, ...args) {
+    let onFulfillment = typeof _onFulfillment === 'function' ?
+      result => isolate(_onFulfillment, result) : null;
+    return super.then(onFulfillment, ...args);
   }
 }