-
Notifications
You must be signed in to change notification settings - Fork 314
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4029 from 10up/feature/3853-v2
Update our blocks `apiVersion` from 2 to 3
- Loading branch information
Showing
13 changed files
with
173 additions
and
18 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /** | ||
| * Code taken from the Cypress iframe package. | ||
| * | ||
| * https://gitlab.com/kgroat/cypress-iframe | ||
| */ | ||
|
|
||
| const DEFAULT_OPTS = { | ||
| log: true, | ||
| timeout: 30000, | ||
| }; | ||
|
|
||
| const DEFAULT_IFRAME_SELECTOR = 'iframe'; | ||
|
|
||
| function sleep(timeout) { | ||
| return new Promise((resolve) => setTimeout(resolve, timeout)); // eslint-disable-line no-promise-executor-return | ||
| } | ||
|
|
||
| const frameLoaded = (selector, opts) => { | ||
| if (selector === undefined) { | ||
| selector = DEFAULT_IFRAME_SELECTOR; // eslint-disable-line no-param-reassign | ||
| } else if (typeof selector === 'object') { | ||
| opts = selector; // eslint-disable-line no-param-reassign | ||
| selector = DEFAULT_IFRAME_SELECTOR; // eslint-disable-line no-param-reassign | ||
| } | ||
|
|
||
| const fullOpts = { | ||
| ...DEFAULT_OPTS, | ||
| ...opts, | ||
| }; | ||
|
|
||
| const log = fullOpts.log | ||
| ? Cypress.log({ | ||
| name: 'frame loaded', | ||
| displayName: 'frame loaded', | ||
| message: [selector], | ||
| }).snapshot() | ||
| : null; | ||
|
|
||
| return cy.get(selector, { log: false }).then({ timeout: fullOpts.timeout }, async ($frame) => { | ||
| log?.set('$el', $frame); | ||
|
|
||
| if ($frame.length !== 1) { | ||
| throw new Error( | ||
| `cypress-iframe commands can only be applied to exactly one iframe at a time. Instead found ${$frame.length}`, | ||
| ); | ||
| } | ||
|
|
||
| const contentWindow = $frame.prop('contentWindow'); | ||
|
|
||
| const hasNavigated = fullOpts.url | ||
| ? () => | ||
| typeof fullOpts.url === 'string' | ||
| ? contentWindow.location.toString().includes(fullOpts.url) | ||
| : fullOpts.url?.test(contentWindow.location.toString()) | ||
| : () => contentWindow.location.toString() !== 'about:blank'; | ||
|
|
||
| while (!hasNavigated()) { | ||
| await sleep(100); // eslint-disable-line no-await-in-loop | ||
| } | ||
|
|
||
| if (contentWindow.document.readyState === 'complete') { | ||
| return $frame; | ||
| } | ||
|
|
||
| const loadLog = Cypress.log({ | ||
| name: 'Frame Load', | ||
| message: [contentWindow.location.toString()], | ||
| event: true, | ||
| }).snapshot(); | ||
|
|
||
| await new Promise((resolve) => { | ||
| Cypress.$(contentWindow).on('load', resolve); | ||
| }); | ||
|
|
||
| loadLog.end(); | ||
| log?.finish(); | ||
|
|
||
| return $frame; | ||
| }); | ||
| }; | ||
|
|
||
| export const getIframe = (selector, opts) => { | ||
| if (selector === undefined) { | ||
| selector = DEFAULT_IFRAME_SELECTOR; // eslint-disable-line no-param-reassign | ||
| } else if (typeof selector === 'object') { | ||
| opts = selector; // eslint-disable-line no-param-reassign | ||
| selector = DEFAULT_IFRAME_SELECTOR; // eslint-disable-line no-param-reassign | ||
| } | ||
|
|
||
| const fullOpts = { | ||
| ...DEFAULT_OPTS, | ||
| ...opts, | ||
| }; | ||
|
|
||
| const log = fullOpts.log | ||
| ? Cypress.log({ | ||
| name: 'iframe', | ||
| displayName: 'iframe', | ||
| message: [selector], | ||
| }).snapshot() | ||
| : null; | ||
|
|
||
| return frameLoaded(selector, { ...fullOpts, log: false }).then(($frame) => { | ||
| log?.set('$el', $frame).end(); | ||
| const contentWindow = $frame.prop('contentWindow'); | ||
| return Cypress.$(contentWindow.document.body); | ||
| }); | ||
| }; |