Răsfoiți Sursa

Increase all test timeouts to 300 ms

simov 7 ani în urmă
părinte
comite
cd3e9f808a
5 a modificat fișierele cu 52 adăugiri și 49 ștergeri
  1. 13 10
      test/origin-csp.js
  2. 5 5
      test/origin-encoding.js
  3. 4 4
      test/origin-match.js
  4. 27 27
      test/popup-options.js
  5. 3 3
      test/utils/defaults.js

+ 13 - 10
test/origin-csp.js

@@ -29,7 +29,7 @@ module.exports = ({extensions, popup, advanced, content}) => {
       // go to page serving content with strict csp
       await content.goto('http://localhost:3000/csp-no-header-no-path')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
     })
     it('non matching urls should be skipped', async () => {
       t.strictEqual(
@@ -59,7 +59,7 @@ module.exports = ({extensions, popup, advanced, content}) => {
       // go to page serving content with strict csp
       await content.goto('http://localhost:3000/csp-match-header')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
     })
     it('non matching urls cannot be checked for enabled csp', async () => {
       t.strictEqual(
@@ -89,7 +89,7 @@ module.exports = ({extensions, popup, advanced, content}) => {
       // go to page serving content with strict csp
       await content.goto('http://localhost:3000/csp-match-path')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
     })
     it('webRequest.onHeadersReceived event is enabled', async () => {
       t.strictEqual(
@@ -111,11 +111,12 @@ module.exports = ({extensions, popup, advanced, content}) => {
       if (await advanced.evaluate(() => state.origins['http://localhost:3000'].csp)) {
         await advanced.click('.m-list li:nth-of-type(2) .m-switch')
       }
+      await advanced.waitFor(300)
 
       // go to page serving content with strict csp
       await content.goto('http://localhost:3000/csp-match-path')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() => {
@@ -137,11 +138,12 @@ module.exports = ({extensions, popup, advanced, content}) => {
       if (!await advanced.evaluate(() => state.origins['http://localhost:3000'].csp)) {
         await advanced.click('.m-list li:nth-of-type(2) .m-switch')
       }
+      await advanced.waitFor(300)
 
       // go to page serving content with strict csp
       await content.goto('http://localhost:3000/csp-match-path')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -158,11 +160,12 @@ module.exports = ({extensions, popup, advanced, content}) => {
       if (await advanced.evaluate(() => state.origins['http://localhost:3000'].csp)) {
         await advanced.click('.m-list li:nth-of-type(2) .m-switch')
       }
+      await advanced.waitFor(300)
 
       // go to page serving content with strict csp
       await content.goto('http://localhost:3000/csp-match-path')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() => {
@@ -188,7 +191,7 @@ module.exports = ({extensions, popup, advanced, content}) => {
         await advanced.click('.m-list li:nth-of-type(2) .m-switch')
       }
       await advanced.reload()
-      await advanced.waitFor(200)
+      await advanced.waitFor(300)
 
       // expand origin
       await advanced.click('.m-list li:nth-of-type(2)')
@@ -209,7 +212,7 @@ module.exports = ({extensions, popup, advanced, content}) => {
         await advanced.click('.m-list li:nth-of-type(2) .m-switch')
       }
       await advanced.reload()
-      await advanced.waitFor(200)
+      await advanced.waitFor(300)
 
       // expand origin
       await advanced.click('.m-list li:nth-of-type(2)')
@@ -252,7 +255,7 @@ module.exports = ({extensions, popup, advanced, content}) => {
             .querySelectorAll('extensions-item'))[0].shadowRoot
             .querySelector('#enable-toggle').click()
       })
-      await extensions.waitFor(200)
+      await extensions.waitFor(300)
       // check
       t.equal(
         await extensions.evaluate(() =>
@@ -269,7 +272,7 @@ module.exports = ({extensions, popup, advanced, content}) => {
       // go to page serving content with strict csp
       await content.goto('http://localhost:3000/csp-match-path')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
     })
     it('the tab is reloaded on event page wakeup', async () => {
       t.strictEqual(

+ 5 - 5
test/origin-encoding.js

@@ -26,7 +26,7 @@ module.exports = ({popup, advanced, content}) => {
       // with no content-type header set
       await content.goto('http://localhost:3000/encoding-no-content-type')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
     })
     it('do not override if content-type header is missing', async () => {
       t.equal(
@@ -51,7 +51,7 @@ module.exports = ({popup, advanced, content}) => {
       // with no charset set in the content-type header
       await content.goto('http://localhost:3000/encoding-no-charset')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
     })
     it('do not override if charset is missing in content-type header', async () => {
       t.equal(
@@ -76,7 +76,7 @@ module.exports = ({popup, advanced, content}) => {
       // with UTF-8 charset set in content-type header
       await content.goto('http://localhost:3000/encoding-wrong-charset')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
     })
     it('when encoding override is disabled', async () => {
       t.equal(
@@ -103,7 +103,7 @@ module.exports = ({popup, advanced, content}) => {
       // with UTF-8 charset set in content-type header
       await content.goto('http://localhost:3000/encoding-wrong-charset')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
     })
     it('use encoding set for the origin', async () => {
       t.equal(
@@ -123,7 +123,7 @@ module.exports = ({popup, advanced, content}) => {
     before(async () => {
       await advanced.bringToFront()
       await advanced.reload()
-      await advanced.waitFor(200)
+      await advanced.waitFor(300)
       // expand origin
       await advanced.click('.m-list li:nth-of-type(2)')
     })

+ 4 - 4
test/origin-match.js

@@ -30,7 +30,7 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/markdown
       await content.goto('http://localhost:3000/correct-content-type')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -63,7 +63,7 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/markdown
       await content.goto('http://localhost:3000/correct-content-type')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -77,7 +77,7 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/x-markdown
       await content.goto('http://localhost:3000/correct-content-type-variation')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -111,7 +111,7 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/plain
       await content.goto('http://localhost:3000/wrong-content-type')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>

+ 27 - 27
test/popup-options.js

@@ -21,7 +21,7 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/markdown
       await content.goto('http://localhost:3000/correct-content-type')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -55,7 +55,7 @@ module.exports = ({popup, advanced, content}) => {
       await content.bringToFront()
       await popup.click('button:nth-of-type(1)')
       // content auto reloads
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -99,7 +99,7 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/markdown
       await content.goto('http://localhost:3000/correct-content-type')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -117,7 +117,7 @@ module.exports = ({popup, advanced, content}) => {
       await content.bringToFront()
       await popup.select('.m-panel:nth-of-type(1) select', 'github-dark')
       // content auto reloads
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -134,7 +134,7 @@ module.exports = ({popup, advanced, content}) => {
       // reload popup
       await popup.bringToFront()
       await popup.reload()
-      await popup.waitFor(200)
+      await popup.waitFor(300)
 
       t.equal(
         await popup.evaluate(() =>
@@ -169,7 +169,7 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/markdown
       await content.goto('http://localhost:3000/compiler-options-marked')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -186,7 +186,7 @@ module.exports = ({popup, advanced, content}) => {
       // gfm switch
       await popup.click('.m-panel:nth-of-type(2) .m-switch:nth-of-type(2)')
       // content auto reloads
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -201,7 +201,7 @@ module.exports = ({popup, advanced, content}) => {
       // reload popup
       await popup.bringToFront()
       await popup.reload()
-      await popup.waitFor(200)
+      await popup.waitFor(300)
 
       t.equal(
         await popup.evaluate(() =>
@@ -243,7 +243,7 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/markdown
       await content.goto('http://localhost:3000/compiler-options-remark')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -273,7 +273,7 @@ module.exports = ({popup, advanced, content}) => {
       await content.bringToFront()
       await popup.select('.m-panel:nth-of-type(2) select', 'remark')
       // content auto reloads
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -302,14 +302,14 @@ module.exports = ({popup, advanced, content}) => {
       // redraw popup
       await popup.bringToFront()
       await popup.reload()
-      await popup.waitFor(200)
+      await popup.waitFor(300)
 
       // disable gfm
       await content.bringToFront()
       // gfm switch
       await popup.click('.m-panel:nth-of-type(2) .m-switch:nth-of-type(4)')
       // content auto reloads
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.equal(
         await content.evaluate(() =>
@@ -324,7 +324,7 @@ module.exports = ({popup, advanced, content}) => {
       // reload popup
       await popup.bringToFront()
       await popup.reload()
-      await popup.waitFor(200)
+      await popup.waitFor(300)
 
       t.equal(
         await popup.evaluate(() =>
@@ -366,7 +366,7 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/markdown
       await content.goto('http://localhost:3000/content-options-toc')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -383,7 +383,7 @@ module.exports = ({popup, advanced, content}) => {
       // toc switch
       await popup.click('.m-panel:nth-of-type(3) .m-switch:nth-of-type(3)')
       // content auto reloads
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.deepStrictEqual(
         await content.evaluate(() =>
@@ -414,17 +414,17 @@ module.exports = ({popup, advanced, content}) => {
       // go to page serving markdown as text/markdown
       await content.goto('http://localhost:3000/content-options-scroll')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       // scroll down 200px
       await content.evaluate(() =>
         document.querySelector('body').scrollTop = 200
       )
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       // reload page
       await content.reload()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -441,7 +441,7 @@ module.exports = ({popup, advanced, content}) => {
       // scroll switch
       await popup.click('.m-panel:nth-of-type(3) .m-switch:nth-of-type(2)')
       // content auto reloads
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -455,11 +455,11 @@ module.exports = ({popup, advanced, content}) => {
       await content.evaluate(() =>
         document.querySelector('body').scrollTop = 200
       )
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       // reload page
       await content.reload()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -473,7 +473,7 @@ module.exports = ({popup, advanced, content}) => {
     it('scroll to anchor', async () => {
       // click on header link
       await content.click('h2 a')
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -489,7 +489,7 @@ module.exports = ({popup, advanced, content}) => {
       await content.evaluate(() =>
         document.querySelector('body').scrollTop += 200
       )
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -503,7 +503,7 @@ module.exports = ({popup, advanced, content}) => {
 
       // reload page
       await content.reload()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       t.strictEqual(
         await content.evaluate(() =>
@@ -528,19 +528,19 @@ module.exports = ({popup, advanced, content}) => {
 
       await content.goto('about:blank')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       // go to test page
       await content.goto('http://localhost:3000/popup-autoreload')
       await content.bringToFront()
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       // enable autoreload
       await content.bringToFront()
       // autoreload switch
       await popup.click('.m-panel:nth-of-type(3) .m-switch:nth-of-type(5)')
       // content auto reloads
-      await content.waitFor(200)
+      await content.waitFor(300)
 
       // TODO: wait for https://github.com/GoogleChrome/puppeteer/pull/2812
       // update autoreload interval

+ 3 - 3
test/utils/defaults.js

@@ -4,7 +4,7 @@ module.exports = async ({popup, advanced, content}) => {
   await popup.bringToFront()
   // defaults button
   await popup.click('button:nth-of-type(2)')
-  await popup.waitFor(200)
+  await popup.waitFor(300)
 
   // advanced
   await advanced.bringToFront()
@@ -27,7 +27,7 @@ module.exports = async ({popup, advanced, content}) => {
   await advanced.select('.m-select', 'http')
   await advanced.type('[type=text]', 'localhost:3000')
   await advanced.click('button')
-  await advanced.waitFor(200)
+  await advanced.waitFor(300)
 
   // expand origin
   if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
@@ -37,5 +37,5 @@ module.exports = async ({popup, advanced, content}) => {
   // content
   await content.bringToFront()
   await content.goto('about:blank')
-  await content.waitFor(200)
+  await content.waitFor(300)
 }