chore: Replace deprecated waitFor with waitForTimeout (#441)

* replacing deprecated waitFor for waitForTimeout * injecting waitForTimeout 4 older v. compatibility * 2nd Co-authored-by: Josep Alsina <josepalsinasio@gmail.com>
berstend · Mar 14, 2021 · 1e8840c · 1e8840c
1 parent 1575f1a
commit 1e8840c
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 21 deletions.
diff --git a/packages/puppeteer-extra-plugin-adblocker/readme.md b/packages/puppeteer-extra-plugin-adblocker/readme.md
@@ -47,7 +47,7 @@ puppeteer.launch({ headless: true }).then(async (browser) => {
   // Visit a page, ads are blocked automatically!
   await page.goto('https://www.google.com/search?q=rent%20a%20car')
 
-  await page.waitFor(5 * 1000)
+  await page.waitForTimeout(5 * 1000)
   await page.screenshot({ path: 'response.png', fullPage: true })
 
   console.log(`All done, check the screenshots. ✨`)
@@ -69,7 +69,7 @@ puppeteer
   .then(async (browser) => {
     const page = await browser.newPage()
     await page.goto('https://www.vanityfair.com')
-    await page.waitFor(60 * 1000)
+    await page.waitForTimeout(60 * 1000)
     await browser.close()
   })
 ```

diff --git a/packages/puppeteer-extra-plugin-devtools/readme.md b/packages/puppeteer-extra-plugin-devtools/readme.md
@@ -34,7 +34,7 @@ puppeteer.launch().then(async browser => {
 
   const page = await browser.newPage()
   await page.goto('https://www.google.com')
-  await page.waitFor(60 * 1000)
+  await page.waitForTimeout(60 * 1000)
   browser.close()
 })
 ```

diff --git a/packages/puppeteer-extra-plugin-stealth/evasions/iframe.contentWindow/index.test.js b/packages/puppeteer-extra-plugin-stealth/evasions/iframe.contentWindow/index.test.js
@@ -263,6 +263,8 @@ test('regression: new method will not break recaptcha popup', async t => {
     .launch({ headless: true })
   const page = await browser.newPage()
 
+  page.waitForTimeout = page.waitForTimeout || page.waitFor
+
   await page.goto('https://www.fbdemo.com/invisible-captcha/index.html')
 
   await page.type('#tswname', 'foo')
@@ -272,7 +274,8 @@ test('regression: new method will not break recaptcha popup', async t => {
     'In the depth of winter, I finally learned that within me there lay an invincible summer.'
   )
   await page.click('#tswsubmit')
-  await page.waitFor(1000)
+  await page.waitForTimeout(1000)
+
 
   const { hasRecaptchaPopup } = await page.evaluate(() => {
     const hasRecaptchaPopup = !!document.querySelectorAll(
@@ -290,11 +293,12 @@ test('regression: old method indeed did break recaptcha popup', async t => {
   const browser = await vanillaPuppeteer.launch({ headless: true })
   const page = await browser.newPage()
 
+  page.waitForTimeout = page.waitForTimeout || page.waitFor
   // Old method
   await page.evaluateOnNewDocument(() => {
     // eslint-disable-next-line
     Object.defineProperty(HTMLIFrameElement.prototype, 'contentWindow', {
-      get: function() {
+      get: function () {
         return window
       }
     })
@@ -309,7 +313,7 @@ test('regression: old method indeed did break recaptcha popup', async t => {
     'In the depth of winter, I finally learned that within me there lay an invincible summer.'
   )
   await page.click('#tswsubmit')
-  await page.waitFor(1000)
+  await page.waitForTimeout(1000)
 
   const { hasRecaptchaPopup } = await page.evaluate(() => {
     const hasRecaptchaPopup = !!document.querySelectorAll(

diff --git a/packages/puppeteer-extra-plugin-stealth/readme.md b/packages/puppeteer-extra-plugin-stealth/readme.md
@@ -36,7 +36,7 @@ puppeteer.launch({ headless: true }).then(async browser => {
   console.log('Running tests..')
   const page = await browser.newPage()
   await page.goto('https://bot.sannysoft.com')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: 'testresult.png', fullPage: true })
   await browser.close()
   console.log(`All done, check the screenshot. ✨`)
@@ -59,7 +59,7 @@ puppeteer
   .then(async browser => {
     const page = await browser.newPage()
     await page.goto('https://bot.sannysoft.com')
-    await page.waitFor(5000)
+    await page.waitForTimeout(5000)
     await page.screenshot({ path: 'stealth.png', fullPage: true })
     await browser.close()
   })

diff --git a/packages/puppeteer-extra-plugin-stealth/stealthtests/headful-chrome-stealth.js b/packages/puppeteer-extra-plugin-stealth/stealthtests/headful-chrome-stealth.js
@@ -16,7 +16,7 @@ async function main() {
   const page = await browser.newPage()
   await page.setViewport({ width: 800, height: 600 })
   await page.goto('https://bot.sannysoft.com/')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: screenshotPath, fullPage: true })
 
   await browser.close()

diff --git a/packages/puppeteer-extra-plugin-stealth/stealthtests/headful-chrome-vanilla.js b/packages/puppeteer-extra-plugin-stealth/stealthtests/headful-chrome-vanilla.js
@@ -14,7 +14,7 @@ async function main() {
   const page = await browser.newPage()
   await page.setViewport({ width: 800, height: 600 })
   await page.goto('https://bot.sannysoft.com/')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: screenshotPath, fullPage: true })
 
   await browser.close()

diff --git a/packages/puppeteer-extra-plugin-stealth/stealthtests/headful-chromium-stealth.js b/packages/puppeteer-extra-plugin-stealth/stealthtests/headful-chromium-stealth.js
@@ -13,7 +13,7 @@ async function main() {
   const page = await browser.newPage()
   await page.setViewport({ width: 800, height: 600 })
   await page.goto('https://bot.sannysoft.com/')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: screenshotPath, fullPage: true })
 
   await browser.close()

diff --git a/packages/puppeteer-extra-plugin-stealth/stealthtests/headful-chromium-vanilla.js b/packages/puppeteer-extra-plugin-stealth/stealthtests/headful-chromium-vanilla.js
@@ -11,7 +11,7 @@ async function main() {
   const page = await browser.newPage()
   await page.setViewport({ width: 800, height: 600 })
   await page.goto('https://bot.sannysoft.com/')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: screenshotPath, fullPage: true })
 
   await browser.close()

diff --git a/packages/puppeteer-extra-plugin-stealth/stealthtests/headless-chrome-stealth.js b/packages/puppeteer-extra-plugin-stealth/stealthtests/headless-chrome-stealth.js
@@ -16,7 +16,7 @@ async function main() {
   const page = await browser.newPage()
   await page.setViewport({ width: 800, height: 600 })
   await page.goto('https://bot.sannysoft.com/')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: screenshotPath, fullPage: true })
 
   await browser.close()

diff --git a/packages/puppeteer-extra-plugin-stealth/stealthtests/headless-chrome-vanilla.js b/packages/puppeteer-extra-plugin-stealth/stealthtests/headless-chrome-vanilla.js
@@ -14,7 +14,7 @@ async function main() {
   const page = await browser.newPage()
   await page.setViewport({ width: 800, height: 600 })
   await page.goto('https://bot.sannysoft.com/')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: screenshotPath, fullPage: true })
 
   await browser.close()

diff --git a/packages/puppeteer-extra-plugin-stealth/stealthtests/headless-chromium-stealth.js b/packages/puppeteer-extra-plugin-stealth/stealthtests/headless-chromium-stealth.js
@@ -13,7 +13,7 @@ async function main() {
   const page = await browser.newPage()
   await page.setViewport({ width: 800, height: 600 })
   await page.goto('https://bot.sannysoft.com/')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: screenshotPath, fullPage: true })
 
   await browser.close()

diff --git a/packages/puppeteer-extra-plugin-stealth/stealthtests/headless-chromium-vanilla.js b/packages/puppeteer-extra-plugin-stealth/stealthtests/headless-chromium-vanilla.js
@@ -11,7 +11,7 @@ async function main() {
   const page = await browser.newPage()
   await page.setViewport({ width: 800, height: 600 })
   await page.goto('https://bot.sannysoft.com/')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: screenshotPath, fullPage: true })
 
   await browser.close()

diff --git a/packages/puppeteer-extra/readme.md b/packages/puppeteer-extra/readme.md
@@ -38,12 +38,12 @@ puppeteer.launch({ headless: true }).then(async browser => {
 
   console.log(`Testing adblocker plugin..`)
   await page.goto('https://www.vanityfair.com')
-  await page.waitFor(1000)
+  await page.waitForTimeout(1000)
   await page.screenshot({ path: 'adblocker.png', fullPage: true })
 
   console.log(`Testing the stealth plugin..`)
   await page.goto('https://bot.sannysoft.com')
-  await page.waitFor(5000)
+  await page.waitForTimeout(5000)
   await page.screenshot({ path: 'stealth.png', fullPage: true })
 
   console.log(`All done, check the screenshots. ✨`)
@@ -88,7 +88,7 @@ puppeteer
   .then(async browser => {
     const page = await browser.newPage()
     await page.goto('https://bot.sannysoft.com')
-    await page.waitFor(5000)
+    await page.waitForTimeout(5000)
     await page.screenshot({ path: 'stealth.png', fullPage: true })
     await browser.close()
   })
@@ -160,7 +160,7 @@ puppeteer
   .then(async browser => {
     const page = await browser.newPage()
     await page.goto('https://www.spacejam.com/archive/spacejam/movie/jam.htm')
-    await page.waitFor(10 * 1000)
+    await page.waitForTimeout(10 * 1000)
     await browser.close()
   })
 ```
@@ -254,7 +254,7 @@ const launch = async () => {
     .then(async browser => {
       const page = await browser.newPage()
       await page.goto('https://www.spacejam.com/archive/spacejam/movie/jam.htm')
-      await page.waitFor(10 * 1000)
+      await page.waitForTimeout(10 * 1000)
       await browser.close()
     })
 }