feat: JSHandles as argument for waitFor and return the success value #1712
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JoelEinbinder
force-pushed
the
wait_for_value
branch
from
7b093dd
to
814126c
Compare
aslushnikov
approved these changes
Jan 3, 2018
lib/FrameManager.js
Outdated
| * @param {string|number} polling | ||
| * @param {number} timeout | ||
| */ | ||
| constructor(frame, predicateBody, polling, timeout) { | ||
| constructor(frame, predicateBody, polling, timeout, ...args) { |
There was a problem hiding this comment.
nit: missing jsdoc for args
lib/FrameManager.js
Outdated
| else if (typeof polling === 'number') | ||
| await pollInterval(polling); | ||
| return !timedOut; | ||
| return await pollInterval(polling); | ||
|
|
||
| /** | ||
| * @return {!Promise} |
lib/FrameManager.js
Outdated
| let timedOut = false; | ||
| setTimeout(() => timedOut = true, timeout); | ||
| if (polling === 'raf') | ||
| await pollRaf(); | ||
| return await pollRaf(); | ||
| else if (polling === 'mutation') |
lib/FrameManager.js
Outdated
| } catch (e) { | ||
| error = e; | ||
| } | ||
|
|
||
| if (this._terminated || runCount !== this._runCount) | ||
| if (this._terminated || runCount !== this._runCount) { | ||
| success && await success.dispose(); |
lib/FrameManager.js
Outdated
| * @param {!Object=} options | ||
| * @return {!Promise} | ||
| */ | ||
| waitForFunction(pageFunction, options = {}, ...args) { | ||
| const timeout = options.timeout || 30000; | ||
| const polling = options.polling || 'raf'; | ||
| const predicateCode = 'return ' + helper.evaluationString(pageFunction, ...args); | ||
| return new WaitTask(this, predicateCode, polling, timeout).promise; | ||
| if (helper.isString(pageFunction)) |
There was a problem hiding this comment.
let's move this to the waitTask
igorshapiro
pushed a commit
to WiserSolutions/puppeteer
that referenced
this pull request
Jan 16, 2018
This patch: - teaches page.waitFor* methods to accept JSHandles - starts returning JSHandles from page.waitFor* calls. BREAKING CHANGE: this patch starts allocating `JSHandle`/`ElementHandle` instances for every call to `page.waitFor*` functions. These handles should be disposed manually to avoid memory consumption. Fixes puppeteer#1703, fixes puppeteer#1654, fixes puppeteer#1724.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1703
#1654