From a3ee690ea3863ff16a828ac0afbc77243bb45f5b Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Wed, 1 Sep 2021 15:37:38 +0200 Subject: 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 --- plugins/Dashboard/tests/UI/DashboardManager_spec.js | 8 ++++---- plugins/Dashboard/tests/UI/Dashboard_spec.js | 18 +++++++++--------- .../DashboardManager_create_new.png | 4 ++-- .../expected-screenshots/DashboardManager_expanded.png | 4 ++-- .../expected-screenshots/DashboardManager_removed.png | 4 ++-- .../DashboardManager_widget_list_shown.png | 4 ++-- .../DashboardManager_widget_preview.png | 2 +- .../expected-screenshots/Dashboard_change_layout.png | 2 +- .../Dashboard_invalid_token_auth.png | 4 ++-- .../UI/expected-screenshots/Dashboard_removed.png | 4 ++-- .../tests/UI/expected-screenshots/Dashboard_rename.png | 4 ++-- .../tests/UI/expected-screenshots/Dashboard_reset.png | 4 ++-- .../Dashboard_widget_add_widget.png | 4 ++-- .../expected-screenshots/Dashboard_widget_maximise.png | 4 ++-- .../Dashboard_widget_minimised.png | 4 ++-- .../Dashboard_widget_unmaximise.png | 4 ++-- 16 files changed, 39 insertions(+), 39 deletions(-) (limited to 'plugins/Dashboard') diff --git a/plugins/Dashboard/tests/UI/DashboardManager_spec.js b/plugins/Dashboard/tests/UI/DashboardManager_spec.js index 2b23b6575d..5207523176 100644 --- a/plugins/Dashboard/tests/UI/DashboardManager_spec.js +++ b/plugins/Dashboard/tests/UI/DashboardManager_spec.js @@ -64,7 +64,7 @@ describe("DashboardManager", function () { it("should create new dashboard with new default widget selection when create dashboard process completed", async function() { await page.click('.dashboard-manager .title'); await page.click('li[data-action="createDashboard"]'); - await page.waitFor('#createDashboardName', { visible: true }); + await page.waitForSelector('#createDashboardName', { visible: true }); // try to type the text a few times, as it sometimes doesn't get the full value var name = 'newdash2'; @@ -73,7 +73,7 @@ describe("DashboardManager", function () { $('#createDashboardName').val(''); }); await page.type('#createDashboardName', name); - await page.waitFor(500); // sometimes the text doesn't seem to type fast enough + await page.waitForTimeout(500); // sometimes the text doesn't seem to type fast enough var value = await page.evaluate(function() { return $('#createDashboardName').attr('value'); @@ -89,7 +89,7 @@ describe("DashboardManager", function () { await page.mouse.move(-10, -10); await page.waitForNetworkIdle(); - await page.waitFor('.widget'); + await page.waitForSelector('.widget'); await page.waitForNetworkIdle(); expect(await page.screenshot({ fullPage: true })).to.matchImage('create_new'); @@ -102,7 +102,7 @@ describe("DashboardManager", function () { await button.click(); await page.mouse.move(-10, -10); - await page.waitFor(500); + await page.waitForTimeout(500); await page.waitForNetworkIdle(); expect(await page.screenshot({ fullPage: true })).to.matchImage('removed'); diff --git a/plugins/Dashboard/tests/UI/Dashboard_spec.js b/plugins/Dashboard/tests/UI/Dashboard_spec.js index 03c5b8bccc..7d7e36d0f4 100644 --- a/plugins/Dashboard/tests/UI/Dashboard_spec.js +++ b/plugins/Dashboard/tests/UI/Dashboard_spec.js @@ -74,7 +74,7 @@ describe("Dashboard", function () { await col2.hover(); await page.mouse.up(); await page.waitForNetworkIdle(); - await page.waitFor(100); + await page.waitForTimeout(100); await page.mouse.move(-10, -10); await page.waitForNetworkIdle(); @@ -173,7 +173,7 @@ describe("Dashboard", function () { await button.click(); await page.mouse.move(-10, -10); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await page.screenshot({ fullPage: true })).to.matchImage('widget_move_removed'); }); @@ -185,7 +185,7 @@ describe("Dashboard", function () { var button = await page.jQuery('.modal.open .modal-footer a:contains(Save)'); await button.click(); await page.mouse.move(-10, -10); - await page.waitFor(500); // animation + await page.waitForTimeout(1500); // animation expect(await page.screenshot({ fullPage: true })).to.matchImage('change_layout'); }); @@ -194,7 +194,7 @@ describe("Dashboard", function () { await page.click('.dashboard-manager .title'); await page.click('li[data-action="renameDashboard"]'); await page.evaluate(() => $('#newDashboardName').val('newname')); - await page.waitFor(250); + await page.waitForTimeout(250); var button = await page.jQuery('.modal.open .modal-footer a:contains(Save)'); await button.click(); await page.mouse.move(-10, -10); @@ -206,7 +206,7 @@ describe("Dashboard", function () { it("should copy dashboard successfully when copy dashboard process completed", async function() { await page.click('.dashboard-manager .title'); await page.click('li[data-action="copyDashboardToUser"]'); - await page.waitFor(100); // wait for animation + await page.waitForTimeout(100); // wait for animation await page.evaluate(function () { $('#copyDashboardName').val(''); }); @@ -243,7 +243,7 @@ describe("Dashboard", function () { var button = await page.jQuery('.modal.open .modal-footer a:contains(Yes)'); await button.click(); await page.mouse.move(-10, -10); - await page.waitFor(200); + await page.waitForTimeout(200); await page.waitForNetworkIdle(); expect(await page.screenshot({ fullPage: true })).to.matchImage('removed'); @@ -255,7 +255,7 @@ describe("Dashboard", function () { await page.click('li[data-action="setAsDefaultWidgets"]'); var button = await page.jQuery('.modal.open .modal-footer a:contains(Yes)'); await button.click(); - await page.waitFor(200); + await page.waitForTimeout(200); await page.waitForNetworkIdle(); expect(await page.screenshot({ fullPage: true })).to.matchImage('default_widget_selection_changed'); @@ -264,7 +264,7 @@ describe("Dashboard", function () { it("should create new dashboard with new default widget selection when create dashboard process completed", async function() { await page.click('.dashboard-manager .title'); await page.click('li[data-action="createDashboard"]'); - await page.waitFor('#createDashboardName', { visible: true }); + await page.waitForSelector('#createDashboardName', { visible: true }); // try to type the text a few times, as it sometimes doesn't get the full value var name = 'newdash2'; @@ -273,7 +273,7 @@ describe("Dashboard", function () { $('#createDashboardName').val(''); }); await page.type('#createDashboardName', name); - await page.waitFor(500); // sometimes the text doesn't seem to type fast enough + await page.waitForTimeout(500); // sometimes the text doesn't seem to type fast enough var value = await page.evaluate(function() { return $('#createDashboardName').attr('value'); diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png index 64f5a4acf0..e137896427 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6871a707b2f371d945c83f6c1b89356903a35936ac6e11e0de2613f5935ad2e1 -size 313601 +oid sha256:2db0147a760b37a63f5cf42a5020c0640d1e0832042a94772478a9cb7278cc90 +size 313984 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png index 67cf53e8ea..bcb3eeac30 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76e1d243ec2d998e3df1d1e105c88c3842eb51f41e9e7d42679774a38e66665a -size 52938 +oid sha256:3f0f616f47aa8424b0ecf9c059b39de13e5017fbd868b11fb6fd552a1151b265 +size 52940 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index e72dec5ced..144da4d624 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b8964d6bce6a334af86bf7ef4afa9b63215fa3d073585e2f056fc41b2d87db7 -size 480691 +oid sha256:c22573b452593809c2d43f595585f2a4ee94a921b0ebdea1836268abe5df59de +size 481373 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png index 66e942016b..f3d1023422 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a722db3c7277f4d261ac07593b525b989128472ff40f941dd28646979ef0442 -size 66489 +oid sha256:d0669faad6b479fc5cc66e11bf3acef5e54f26d6daeb083dcd9e52d2703c18b9 +size 66488 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png index a0cc85a5bd..33252d0a78 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52c5a0f945beb09577e1edc28f5bdf054432a085bac72b685af453344f43f36f +oid sha256:592f35df58fc2d0a901315a355dca652145fa769da901dad0a79fe2ddbe93738 size 78661 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png index 04683d6e2f..411b3ea678 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:686d56b9c62a53560de8238223ddd1e85e09ce2e665a43669fc08f61d21532b9 +oid sha256:23f2a458e09d6ace2c9f3c0eaff05dd21d24af6c281afed78e4db4e32dafed0c size 28593 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png index 85d70b8561..28eb224427 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0a794e8662f2ccfca7bc51a9a46e3cf2e5a771ee42831e3e8dca23e7cb67dec -size 32310 +oid sha256:62fc2afd2afafb0c31effa327eff0050496ebe55af35f3b8b31aabe33b916922 +size 32321 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index cc56a272d4..e9a80e99e9 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e02cbdcd04e9dc92c0a6edbc2adf7f78f105393c5dcc0bfa536b2bf0b6416ef2 -size 744193 +oid sha256:3c96a8a6ce4dab0ec2f4138ed3a70c0280e99632739c9b1d94b519a30881c15a +size 743925 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png index 1ca48b5333..c836a70c1b 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a853f2995666c3dd4ec5ba6a16868cf1b28ba117b90de697e4e497d573aeaa1 -size 29215 +oid sha256:f9922fc549ac8536f8867058477ede868cca547ec1ce9a10efff8dac23d714ae +size 29214 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png index 3c5d1590ab..3c356037f2 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95ece5261a337dc4f73d6a912350196c1fb8f0cea61a74c258ae0647db8699cd -size 375293 +oid sha256:a6df239036c205d8108be7c52a58a05e8f61c8bd8df202e1cabdcb5ec3c052bf +size 375134 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png index 3ad96c2af8..b8ff6fbf31 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:912f3968c867310296b81871770524c79780c161ac9814b8d769e8cea164c05f -size 213697 +oid sha256:c2b997ee6136c0d06b4f68259bf9324d4902f09c86a392f45ee87c618fd92b2c +size 212811 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png index aec55094b1..1b9ad6f428 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:793785094f8d249d2c8627fee92a556490f75c54853972703fa474b37f3a6aee -size 32998 +oid sha256:79b8b2c3f2fbaacaed1e5c5384f3cd4ee0b4b66ec38e81f069a1908d1e325d3c +size 33007 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png index e9cae85db1..fd03e9cfc6 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b555268f689ccf2ca223b8a8200be68f7fb67a0deed852684f302c99ba988dc6 -size 22143 +oid sha256:65784789084d9929fd11e2edaecb0f1dddd8effb7a36a3e693d0fdf1255ba531 +size 22158 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png index 18ab0dabc0..265213cb5d 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64c141ebdaefca852da48b9ac8cfbac3da7a8db76b545efcfa44a34b759b62d0 -size 31196 +oid sha256:8c5ef999d10b65a1fc9de30f8e36a57adeaca0518c0deaba3c7b9a585e50d93a +size 31224 -- cgit v1.2.3