diff options
author | Stefan Giehl <stefan@matomo.org> | 2021-09-01 16:37:38 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-01 16:37:38 +0300 |
commit | a3ee690ea3863ff16a828ac0afbc77243bb45f5b (patch) | |
tree | 77f3341e86608894b1020725700b348bbcd44567 /plugins/Overlay | |
parent | ba1facfd1ecb4e618f3162aedbdb3170e9461e50 (diff) |
Use newer version of Puppeteer for UI tests (#17880)
* Use latest version of Puppeteer for UI tests
* use newer node on travis
* test
* use waitForTimeout / waitForSelector instead of waitFor
* Handle BC for removed waitFor method
* Updates expected UI test files
* update submodules
* improve/fix some UI tests
* Updates expected UI test files
* improve/fix some UI tests
* update url-parse dependency
* simplify some UI tests
* update screenshot
* avoid using merged assets that are broken
* fix expected compare exit code
* don't use merged assets for TwoFactorAuth UI tests
it seems due to too many requests to login, logout and other pages merging the CoreJS assets somehow fails, and results in returning an empty file. Even the reload fails to serve the correct content, so maybe the file, the content should be written to, is somehow locked. Disabling the merged assets seems to fix this issue for this tests. Locally the tests are also running correctly with merged assets.
* improve handling of automatic css / js reloading in UI tests
* increase timeouts of TwoFactorAuth UI tests
* fix 2fa ui test
* revert change
* update new screenshot
* updates UI screenshots
* submodule updates
Diffstat (limited to 'plugins/Overlay')
10 files changed, 26 insertions, 26 deletions
diff --git a/plugins/Overlay/tests/UI/Overlay_spec.js b/plugins/Overlay/tests/UI/Overlay_spec.js index 70f916c1f0..2d2c9e7960 100644 --- a/plugins/Overlay/tests/UI/Overlay_spec.js +++ b/plugins/Overlay/tests/UI/Overlay_spec.js @@ -74,7 +74,7 @@ describe("Overlay", function () { await page.evaluate(function(){ $('.dropdown-toggle', $('iframe').contents())[0].click(); }); - await page.waitFor(1000); + await page.waitForTimeout(1000); await removeOptOutIframe(); expect(await page.screenshot({ fullPage: true })).to.matchImage('page_new_links'); @@ -102,7 +102,7 @@ describe("Overlay", function () { $('#overlayDateRangeSelect').val('day;yesterday').trigger('change'); }); - await page.waitFor('.overlayMainMetrics,.overlayNoData'); + await page.waitForSelector('.overlayMainMetrics,.overlayNoData'); await page.waitForNetworkIdle(); await removeOptOutIframe(); @@ -113,7 +113,7 @@ describe("Overlay", function () { await page.evaluate(function(){ $('#overlayRowEvolution').click(); }); - await page.waitFor(500); // for modal to appear + await page.waitForTimeout(500); // for modal to appear await page.waitForNetworkIdle(); await page.evaluate(function () { $('.jqplot-xaxis').hide(); // xaxis will change every day so hide it @@ -125,10 +125,10 @@ describe("Overlay", function () { it("should open transitions popup when transitions link clicked", async function() { await page.click('button.ui-dialog-titlebar-close'); - await page.waitFor('#overlayTransitions'); + await page.waitForSelector('#overlayTransitions'); await page.click('#overlayTransitions'); await page.waitForNetworkIdle(); - await page.waitFor(2000); + await page.waitForTimeout(2000); await removeOptOutIframe(); expect(await page.screenshot({ fullPage: true })).to.matchImage('transitions'); @@ -138,10 +138,10 @@ describe("Overlay", function () { await page.goto(urlWithSegment); await page.waitForNetworkIdle(); - await page.waitFor(2000); + await page.waitForTimeout(2000); const frame = page.frames().find(f => f.name() === 'overlayIframe'); - await frame.waitFor('.PIS_LinkTag'); + await frame.waitForSelector('.PIS_LinkTag'); await removeOptOutIframe(); expect(await page.screenshot({ fullPage: true })).to.matchImage('loaded_with_segment'); @@ -153,7 +153,7 @@ describe("Overlay", function () { testEnvironment.save(); await page.goto(baseUrl + '&token_auth=a4ca4238a0b923820dcc509a6f75849f' + hash); - await page.waitFor('.overlayMainMetrics,.overlayNoData'); + await page.waitForSelector('.overlayMainMetrics,.overlayNoData'); await removeOptOutIframe(); expect(await page.screenshot({ fullPage: true })).to.matchImage('framed_loaded'); diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png index 0196affde9..546d19452e 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ae853425f91e6c6a48ea52f649e68ccb729a7da29940029f68fcf44e976cdbe -size 108795 +oid sha256:6c87f9c4fc7dda4389d292b5a57d81fb827914b9b5e047c4378efa0616b6f92e +size 108840 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png index 0196affde9..546d19452e 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ae853425f91e6c6a48ea52f649e68ccb729a7da29940029f68fcf44e976cdbe -size 108795 +oid sha256:6c87f9c4fc7dda4389d292b5a57d81fb827914b9b5e047c4378efa0616b6f92e +size 108840 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png index 01f31d8034..96d641e061 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fce72411ddd693022a38639f0be4c000d53fdf4b9b3591c43c710e037869ada -size 106338 +oid sha256:4325d7a68e6995c176d0ecb3bb71fe206362d4c469fcb0f79998a8614ecfc9ab +size 106348 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png index b8bfe42027..a4f80d5663 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf1bf009951ed867e2161e17534b042d1c7ea13ea78cc0a0696a017dae1d801e -size 211836 +oid sha256:a701ee45201215b8ec896f20ed39e31d5f53c7a797b893cd6b6251ceea55fbaf +size 211791 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png index 350eb5dc32..a0fa94a612 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7715360cb3b14279139ccae621e1803203deec1f6d88a8f3f6113e14f790e4b -size 115273 +oid sha256:93e75037f960563ccb410347395323cec9b15e11f8623152a2ca7643820b6a1b +size 115324 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png index 50da428837..c39aaba1d9 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7c873292bf318a732ce524d36db32059cb76db48f99a1cdf83861daf9c4a7b2 -size 112572 +oid sha256:da9eb1f73eebeb6dd1511a4337ccffba3297c36ff71fe8c69849070faa7b3dd0 +size 112605 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png index 22c1e60812..0bac002c40 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:412b4fb646ab220c7b477a13adda252b3aeb5b90e746d6b942010e898726f891 -size 213915 +oid sha256:7206af018288375c9d07cdbfbf025c3da5be80a4bc80b2a0879bee9cfe3b0f23 +size 213892 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png index 91d5cab8f1..d9cb6994e6 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:256821270feb48a1820ac1cdb44410fcb8d6d1dc25cd73eeb99de787b08f5844 -size 100399 +oid sha256:ebc9efab191105b84d0f5794c561be8cd431e511c34b5886d7539642938310dc +size 100448 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png index 36c037c0fc..45e6ad7568 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b895a2e3cda3b098f6c0de1a0bb069320ae0f33f8bc24427d1bd4e74ece4729 -size 150463 +oid sha256:3c0144378fd29bba131acaf0e4bacbc64cc7d6d4ca3c4965e65531096c841eb1 +size 150476 |