From 5702987acea90e057aa47f8616aa1537ac07c94b Mon Sep 17 00:00:00 2001 From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com> Date: Wed, 3 Feb 2021 03:26:45 +0100 Subject: [PATCH] refactor(waitFor): replaced .waitFor by its successor .waitForTimeout (#1277) --- capture/engine_scripts/puppet/clickAndHoverHelper.js | 10 +++++----- core/util/runPuppet.js | 4 ++-- .../engine_scripts/puppet/clickAndHoverHelper.js | 6 +++--- .../engine_scripts/puppet/clickAndHoverHelper.js | 8 ++++---- .../engine_scripts/puppet/clickAndHoverHelper.js | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/capture/engine_scripts/puppet/clickAndHoverHelper.js b/capture/engine_scripts/puppet/clickAndHoverHelper.js index 81ff30e8f..17e4a2b32 100644 --- a/capture/engine_scripts/puppet/clickAndHoverHelper.js +++ b/capture/engine_scripts/puppet/clickAndHoverHelper.js @@ -7,31 +7,31 @@ module.exports = async (page, scenario) => { if (keyPressSelector) { for (const keyPressSelectorItem of [].concat(keyPressSelector)) { - await page.waitFor(keyPressSelectorItem.selector); + await page.waitForTimeout(keyPressSelectorItem.selector); await page.type(keyPressSelectorItem.selector, keyPressSelectorItem.keyPress); } } if (hoverSelector) { for (const hoverSelectorIndex of [].concat(hoverSelector)) { - await page.waitFor(hoverSelectorIndex); + await page.waitForTimeout(hoverSelectorIndex); await page.hover(hoverSelectorIndex); } } if (clickSelector) { for (const clickSelectorIndex of [].concat(clickSelector)) { - await page.waitFor(clickSelectorIndex); + await page.waitForTimeout(clickSelectorIndex); await page.click(clickSelectorIndex); } } if (postInteractionWait) { - await page.waitFor(postInteractionWait); + await page.waitForTimeout(postInteractionWait); } if (scrollToSelector) { - await page.waitFor(scrollToSelector); + await page.waitForTimeout(scrollToSelector); await page.evaluate(scrollToSelector => { document.querySelector(scrollToSelector).scrollIntoView(); }, scrollToSelector); diff --git a/core/util/runPuppet.js b/core/util/runPuppet.js index 903833913..a8b3bb8ed 100644 --- a/core/util/runPuppet.js +++ b/core/util/runPuppet.js @@ -132,13 +132,13 @@ async function processScenarioView (scenario, variantOrScenarioLabelSafe, scenar // --- WAIT FOR SELECTOR --- if (scenario.readySelector) { - await page.waitFor(scenario.readySelector); + await page.waitForTimeout(scenario.readySelector); } // // --- DELAY --- if (scenario.delay > 0) { - await page.waitFor(scenario.delay); + await page.waitForTimeout(scenario.delay); } // --- REMOVE SELECTORS --- diff --git a/examples/Jenkins/Sample/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js b/examples/Jenkins/Sample/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js index 269f72830..12231f91f 100644 --- a/examples/Jenkins/Sample/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js +++ b/examples/Jenkins/Sample/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js @@ -4,16 +4,16 @@ module.exports = async (page, scenario) => { const postInteractionWait = scenario.postInteractionWait; // selector [str] | ms [int] if (hoverSelector) { - await page.waitFor(hoverSelector); + await page.waitForTimeout(hoverSelector); await page.hover(hoverSelector); } if (clickSelector) { - await page.waitFor(clickSelector); + await page.waitForTimeout(clickSelector); await page.click(clickSelector); } if (postInteractionWait) { - await page.waitFor(postInteractionWait); + await page.waitForTimeout(postInteractionWait); } }; diff --git a/examples/responsiveDemo/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js b/examples/responsiveDemo/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js index 7ff027bae..50ebf4184 100644 --- a/examples/responsiveDemo/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js +++ b/examples/responsiveDemo/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js @@ -6,24 +6,24 @@ module.exports = async (page, scenario) => { if (hoverSelector) { for (const hoverSelectorIndex of [].concat(hoverSelector)) { - await page.waitFor(hoverSelectorIndex); + await page.waitForTimeout(hoverSelectorIndex); await page.hover(hoverSelectorIndex); } } if (clickSelector) { for (const clickSelectorIndex of [].concat(clickSelector)) { - await page.waitFor(clickSelectorIndex); + await page.waitForTimeout(clickSelectorIndex); await page.click(clickSelectorIndex); } } if (postInteractionWait) { - await page.waitFor(postInteractionWait); + await page.waitForTimeout(postInteractionWait); } if (scrollToSelector) { - await page.waitFor(scrollToSelector); + await page.waitForTimeout(scrollToSelector); await page.evaluate(scrollToSelector => { document.querySelector(scrollToSelector).scrollIntoView(); }, scrollToSelector); diff --git a/test/configs/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js b/test/configs/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js index 13a88ee71..d06ecccac 100644 --- a/test/configs/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js +++ b/test/configs/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js @@ -7,27 +7,27 @@ module.exports = async (page, scenario) => { if (keyPressSelector) { for (const keyPressSelectorItem of [].concat(keyPressSelector)) { - await page.waitFor(keyPressSelectorItem.selector); + await page.waitForTimeout(keyPressSelectorItem.selector); await page.type(keyPressSelectorItem.selector, keyPressSelectorItem.keyPress); } } if (hoverSelector) { - await page.waitFor(hoverSelector); + await page.waitForTimeout(hoverSelector); await page.hover(hoverSelector); } if (clickSelector) { - await page.waitFor(clickSelector); + await page.waitForTimeout(clickSelector); await page.click(clickSelector); } if (postInteractionWait) { - await page.waitFor(postInteractionWait); + await page.waitForTimeout(postInteractionWait); } if (scrollToSelector) { - await page.waitFor(scrollToSelector); + await page.waitForTimeout(scrollToSelector); await page.evaluate(scrollToSelector => { document.querySelector(scrollToSelector).scrollIntoView(); }, scrollToSelector);