From 90abedabfec1dfa697759803993288d9c6de4bd8 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Tue, 23 Oct 2018 11:11:35 -0400 Subject: [PATCH] Fix RSVP.Promise overriding Promise in native promise detection. --- addon-test-support/@ember/test-helpers/-utils.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addon-test-support/@ember/test-helpers/-utils.js b/addon-test-support/@ember/test-helpers/-utils.js index 122b7969c..6d1843a9d 100644 --- a/addon-test-support/@ember/test-helpers/-utils.js +++ b/addon-test-support/@ember/test-helpers/-utils.js @@ -1,4 +1,5 @@ -import { Promise } from 'rsvp'; +/* globals Promise */ +import { Promise as RSVPPromise } from 'rsvp'; export const nextTick = typeof Promise === 'undefined' ? setTimeout : cb => Promise.resolve().then(cb); @@ -6,10 +7,10 @@ export const futureTick = setTimeout; /** @private - @returns {Promise} promise which resolves on the next turn of the event loop + @returns {Promise} Promise which can not be forced to be ran synchronously */ export function nextTickPromise() { - return new Promise(resolve => { + return new RSVPPromise(resolve => { nextTick(resolve); }); }