From 44c93e0d4b24d40f66ab8bf92c94ce12d57b7475 Mon Sep 17 00:00:00 2001
From: Amiel Martin <amiel@actionsprout.com>
Date: Tue, 19 May 2015 16:22:36 -0700
Subject: [PATCH] [BUGFIX beta] Pass a label with Ember.Test.promise

This allows promises used in testing code to be labeled:

    return Ember.Test.promise((resolve) => Ember.run.later(resolve, 1000), "Stall tests for 1 second");
---
 packages/ember-testing/lib/test.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ember-testing/lib/test.js b/packages/ember-testing/lib/test.js
index daf6dc870ee..9b4f6bd714e 100644
--- a/packages/ember-testing/lib/test.js
+++ b/packages/ember-testing/lib/test.js
@@ -173,9 +173,11 @@ var Test = {
     @public
     @method promise
     @param {Function} resolver The function used to resolve the promise.
+    @param {String} label An optional string for identifying the promise.
   */
-  promise(resolver) {
-    return new Test.Promise(resolver);
+  promise(resolver, label) {
+    var fullLabel = `Ember.Test.promise: ${label || "<Unknown Promise>"}`;
+    return new Test.Promise(resolver, fullLabel);
   },
 
   /**