add waitFor msg

emberjs · Apr 5, 2018 · de208ec · de208ec
1 parent dc1ec8e
commit de208ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/addon-test-support/@ember/test-helpers/dom/wait-for.js b/addon-test-support/@ember/test-helpers/dom/wait-for.js
@@ -15,7 +15,7 @@ import { nextTickPromise } from '../-utils';
   @param {number} [options.count=null] the number of elements that should match the provided selector (null means one or more)
   @returns {Element|Array<Element>} the element (or array of elements) that were being waited upon
 */
-export default function waitFor(selector, { timeout = 1000, count = null } = {}) {
+export default function waitFor(selector, { timeout = 1000, count = null, timeoutMessage = 'waitFor timed out' } = {}) {
   return nextTickPromise().then(() => {
     if (!selector) {
       throw new Error('Must pass a selector to `waitFor`.');
@@ -32,6 +32,6 @@ export default function waitFor(selector, { timeout = 1000, count = null } = {})
     } else {
       callback = () => getElement(selector);
     }
-    return waitUntil(callback, { timeout });
+    return waitUntil(callback, { timeout, timeoutMessage });
   });
 }
diff --git a/tests/unit/dom/wait-for-test.js b/tests/unit/dom/wait-for-test.js
@@ -71,11 +71,11 @@ module('DOM Helper: waitFor', function(hooks) {
 
     let start = Date.now();
     try {
-      await waitFor('.something', { timeout: 100 });
+      await waitFor('.something', { timeout: 100, timeoutMessage: '.something timed out' });
     } catch (error) {
       let end = Date.now();
       assert.ok(end - start >= 100, 'timed out after correct time');
-      assert.equal(error.message, 'waitUntil timed out');
+      assert.equal(error.message, '.something timed out');
     }
   });
 });