Merge pull request #11226 from amiel/label-test-promises

[BUGFIX beta] Pass label to Ember.Test.Promise
emberjs · May 20, 2015 · a96dda1 · a96dda1
2 parents 0d56900 + 44c93e0
commit a96dda1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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);
   },
 
   /**