From 3f905ff25fb4e7ddb0012e37880ebbd71143493f Mon Sep 17 00:00:00 2001 From: Pedro Date: Fri, 15 Jun 2018 13:17:09 +0900 Subject: [PATCH 1/2] I think waitFor returns a Promise now --- API.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API.md b/API.md index c572b62cb..33daa755f 100644 --- a/API.md +++ b/API.md @@ -339,7 +339,7 @@ interim DOM states (e.g. loading states, pending promises, etc). - `options.count` **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** the number of elements that should match the provided selector (null means one or more) (optional, default `null`) - `options.timeoutMessage` (optional, default `'waitFor timed out'`) -Returns **([Element](https://developer.mozilla.org/docs/Web/API/Element) \| [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Element](https://developer.mozilla.org/docs/Web/API/Element)>)** the element (or array of elements) that were being waited upon +Returns Promise resolves when settled ### waitUntil From 43ac2bb08947406b9d3d0af1d3b00ab45d78021d Mon Sep 17 00:00:00 2001 From: Pedro Cambra Date: Wed, 20 Jun 2018 16:36:40 +0900 Subject: [PATCH 2/2] Generated docs with yarn --- API.md | 2 +- addon-test-support/@ember/test-helpers/dom/wait-for.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/API.md b/API.md index 33daa755f..decfe29a3 100644 --- a/API.md +++ b/API.md @@ -339,7 +339,7 @@ interim DOM states (e.g. loading states, pending promises, etc). - `options.count` **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** the number of elements that should match the provided selector (null means one or more) (optional, default `null`) - `options.timeoutMessage` (optional, default `'waitFor timed out'`) -Returns Promise resolves when settled +Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<([Element](https://developer.mozilla.org/docs/Web/API/Element) \| [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Element](https://developer.mozilla.org/docs/Web/API/Element)>)>** resolves when the element(s) appear on the page ### waitUntil diff --git a/addon-test-support/@ember/test-helpers/dom/wait-for.js b/addon-test-support/@ember/test-helpers/dom/wait-for.js index d09eb169f..2520d5d9d 100644 --- a/addon-test-support/@ember/test-helpers/dom/wait-for.js +++ b/addon-test-support/@ember/test-helpers/dom/wait-for.js @@ -13,7 +13,7 @@ import { nextTickPromise } from '../-utils'; @param {Object} [options] the options to be used @param {number} [options.timeout=1000] the time to wait (in ms) for a match @param {number} [options.count=null] the number of elements that should match the provided selector (null means one or more) - @returns {Element|Array} the element (or array of elements) that were being waited upon + @return {Promise} resolves when the element(s) appear on the page */ export default function waitFor( selector,