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 | |
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
527 files changed, 1586 insertions, 1421 deletions
diff --git a/plugins/Actions/tests/UI/ActionsDataTable_spec.js b/plugins/Actions/tests/UI/ActionsDataTable_spec.js index 97d54c5a27..927ea0b354 100644 --- a/plugins/Actions/tests/UI/ActionsDataTable_spec.js +++ b/plugins/Actions/tests/UI/ActionsDataTable_spec.js @@ -32,7 +32,7 @@ describe("ActionsDataTable", function () { await page.mouse.move(-10, -10); await page.waitForNetworkIdle(); - await page.waitFor(250); // rendering + await page.waitForTimeout(250); // rendering expect(await page.screenshot({ fullPage: true })).to.matchImage('subtables_loaded'); }); @@ -41,7 +41,7 @@ describe("ActionsDataTable", function () { await page.click('.dropdownConfigureIcon'); await page.mouse.move(-10, -10); const element = await page.$('.tableConfiguration'); - await page.waitFor(250); // rendering + await page.waitForTimeout(250); // rendering expect(await element.screenshot()).to.matchImage('configuration_options'); }); @@ -77,6 +77,7 @@ describe("ActionsDataTable", function () { }); it("should generate a proper title for the visitor log segmented by the current row", async function() { + await page.mouse.move(-10, -10); const row = 'tr:contains("thankyou") '; const first = await page.jQuery(row + 'td.column:first'); await first.hover(); @@ -100,14 +101,14 @@ describe("ActionsDataTable", function () { await page.click('.ui-widget .ui-dialog-titlebar-close'); const elem = await page.jQuery('tr:contains("thankyou") td.column:eq(2)'); await elem.hover(); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await page.screenshot({ fullPage: true })).to.matchImage('unique_pageview_percentages'); }); it("should show the search when clicking on the search icon", async function() { await page.click('.dataTableAction.searchAction'); await page.mouse.move(-10, -10); - await page.waitFor(500); + await page.waitForTimeout(500); expect(await page.screenshot({ fullPage: true })).to.matchImage('search_visible'); }); diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png index 2f5974dd40..c621596a24 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a2e33653941467df83ccc1b7c5169b3b5c2cd6dd2fed001fc6856e95486d45f -size 389213 +oid sha256:943efef6a111645bba99408ba8816c7fb2e9ecd1063dfd0c1637f73a925fac81 +size 390107 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png index 905eb18e12..c2204eafed 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c74c99414e935ba4de637ba8c72f6ba00e3da4d5bf7823c8e45ceb22a9bd2d05 -size 364044 +oid sha256:bf88c02a14c5de403939674beca872b1f13b05e0d0deec24b39daa6436cff2f6 +size 363615 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png index 01ce3704fb..7f729a68ac 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b2d07948a40d582b2d4b24f62b572d63147d51707f19075c3aa4cbbf78435ac -size 70301 +oid sha256:b260e5f90a4499cc9b063eba4cfe91647b79d14b90dc485457f0100911b5f407 +size 70885 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png index e2249a8a91..da3003396f 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be56bbd7fb1ea9cc83fa730d62d44b60aa95f8a5f747b4b3a39198e3b1f046bd -size 472673 +oid sha256:3c8be898a1e002b1996e5c38ccb567fda47535f7eefe498be0232a70bec7613c +size 466574 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png index de87bfc468..3a3b481f1c 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:587b0818c65f965018b541098049a9314fa3b16dd8e98131ba433f3296ee1e53 -size 363592 +oid sha256:91becfb0f5f7248177de3b6b67031ed4b1bda81444934aed484b4ca5c52ca05d +size 363443 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png index 54429cb145..69458ca509 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4fb372053d8e8165b7c2fc16f5c9aad4fb4932ec1995c6f89890f0df322ba53 -size 59044 +oid sha256:a5b865302ec248e7543b088de9d247e92f3ad62c693079922690071faae00f53 +size 60606 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png index a390215f7d..9b366cda08 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84aa7e78abe2ca4bda44439eac489cbc89e9fca3057eb9ba43996d48c83ca3a3 -size 71162 +oid sha256:3bb6510f04c528d103db45e9f27ff49d12e0edfb60ebbebe56cd471ef51ce4ae +size 73526 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png index 7b154d056d..dd959ebf2f 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:830fb714b7f3b133c79284c43c18ed233ed4b4e7247e698d7f9927f41404e5a6 -size 51559 +oid sha256:0214c0907c223d219ba6230e1ad23d65c44c8af59f5d17102979d07482961cb8 +size 53377 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png index 1900ebb4ca..b9bc676535 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b903108f502f76fae4b852ca9f9816e9488509e8e9e262e7496ab4cf91b2349 -size 56710 +oid sha256:12a5c28c5dcdfaa3198dfd3ebd626caea03da7a23954028bd447f12442565611 +size 62507 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png index 64b8952690..cd8e55ae87 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b78b9de5fd88065f15184c8f994c140c1a0cc2a5e09a086d71be965503a076a0 -size 377619 +oid sha256:924ae218a7fd6cb96012cf4b970cca14304949ca242eea9381a203f8d96a3056 +size 377602 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png index be3cfd436f..cc50053822 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bba08d576cf0d1d0854039942065bcdbba420a2d351236f614dad47e3e9732e -size 63783 +oid sha256:cecbdebfc18409f6dabaad7411f581b3e315343be10373b8e432a8e0548358fc +size 67984 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png index c901e9734d..8bb3ecb49a 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b79b18faee2bc3ee3a43452b38b9eba5c92e535d88b11d0c13a6ac8bc17ff6ac -size 379373 +oid sha256:71e3e2238b43afca2a5b7fd52709871e13e174b853be160097282bd426f4a8d6 +size 379466 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png index 7b154d056d..dd959ebf2f 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:830fb714b7f3b133c79284c43c18ed233ed4b4e7247e698d7f9927f41404e5a6 -size 51559 +oid sha256:0214c0907c223d219ba6230e1ad23d65c44c8af59f5d17102979d07482961cb8 +size 53377 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png index 54429cb145..bd80dfbca1 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4fb372053d8e8165b7c2fc16f5c9aad4fb4932ec1995c6f89890f0df322ba53 -size 59044 +oid sha256:d85c80162da86999958ea5d891663788c0da334beb8a111d18811567155a855c +size 64592 diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement -Subproject 89715ebabd08baf78954fdac603a0ed3030d8f8 +Subproject 2f7e2e748d08b5d6a571566b69e1f5d7f130d20 diff --git a/plugins/Bandwidth b/plugins/Bandwidth -Subproject a04b8c3de354b8547e2d54ee3e748c1d102175b +Subproject de286cf0fc8673184f572aaa0854f94be1289b2 diff --git a/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js b/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js index 398e9bb0a7..d5e66f101a 100644 --- a/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js +++ b/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js @@ -42,7 +42,7 @@ describe("TrackingFailures", function () { it('should show widget with failures', async function () { generateTrackingFailures(); - await page.waitFor(500); + await page.waitForTimeout(500); await page.goto(widgetUrl); expect(await page.screenshot({ fullPage: true })).to.matchImage('widget_with_failures'); }); @@ -50,7 +50,7 @@ describe("TrackingFailures", function () { it('should show manage page with failures', async function () { await page.goto(manageUrl); await page.waitForSelector('.matomoTrackingFailures td'); - await page.waitFor(250); + await page.waitForTimeout(250); const elem = await page.$('.matomoTrackingFailures'); expect(await elem.screenshot()).to.matchImage('manage_with_failures'); @@ -61,8 +61,8 @@ describe("TrackingFailures", function () { $('.matomoTrackingFailures table tbody tr:nth-child(2) .icon-delete').click(); }); - const elem = await page.waitFor('.modal.open'); - await page.waitFor(500); + const elem = await page.waitForSelector('.modal.open'); + await page.waitForTimeout(500); expect(await elem.screenshot()).to.matchImage('manage_with_failures_delete_one_ask_confirmation'); }); @@ -70,9 +70,9 @@ describe("TrackingFailures", function () { await confirmModal(); await page.waitForNetworkIdle(); - await page.waitFor('.matomoTrackingFailures td .icon-delete'); + await page.waitForSelector('.matomoTrackingFailures td .icon-delete'); - await page.waitFor(500); // animation + await page.waitForTimeout(500); // animation const elem = await page.$('.matomoTrackingFailures'); expect(await elem.screenshot()).to.matchImage('manage_with_failures_delete_one_confirmed'); @@ -80,15 +80,15 @@ describe("TrackingFailures", function () { it('should show ask to confirm delete all', async function () { await page.click('.matomoTrackingFailures .deleteAllFailures'); - await page.waitFor('.modal.open'); - await page.waitFor(500); + await page.waitForSelector('.modal.open'); + await page.waitForTimeout(500); expect(await (await page.$('.modal.open')).screenshot()).to.matchImage('manage_with_failures_delete_all_ask_confirmation'); }); it('should show nothing when confirmed', async function () { await confirmModal(); - await page.waitFor('.matomoTrackingFailures td .icon-ok'); - await page.waitFor(500); + await page.waitForSelector('.matomoTrackingFailures td .icon-ok'); + await page.waitForTimeout(500); const frame = await page.waitForSelector('.matomoTrackingFailures'); expect(await frame.screenshot()).to.matchImage('manage_with_failures_delete_all_confirmed'); }); diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_admin_svg.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_admin_svg.png index f7543585ec..c9684eaf96 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_admin_svg.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_admin_svg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31ca5ec6e91ec9bf22ccea61cb7a667f58192ab1e510410b644cf5bb23898a29 -size 11117 +oid sha256:5aa33b34d1c2aa38ec3a0f456c3ef689b41ec54dc667580cc1856893bd5de6ed +size 11191 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_login_svg.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_login_svg.png index 3a9780f16d..d25de0587b 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_login_svg.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_login_svg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15e04ef417d01b8f669585040da0311c31dff60c3af98129741ddd0227d1f63c -size 3955 +oid sha256:4694c1f7d384f46610e74b6f9f79e5515acf599689e0802515f48c81ff1174a6 +size 3976 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_unsubscribe_svg.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_unsubscribe_svg.png index 3a9780f16d..d25de0587b 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_unsubscribe_svg.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_unsubscribe_svg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15e04ef417d01b8f669585040da0311c31dff60c3af98129741ddd0227d1f63c -size 3955 +oid sha256:4694c1f7d384f46610e74b6f9f79e5515acf599689e0802515f48c81ff1174a6 +size 3976 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png index 6572fd23e4..1d34f107f8 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c07d50aed2ae2caa61b554574cab3e127c6ec6483df31dc6d399fc2b3cdd1475 -size 24509 +oid sha256:1167f33855f98e5975c84a75b0cfb7792c9397fa5c2f4c772e7c8126db291b5d +size 25268 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png index 0f44eb186f..5da1e75278 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d48b5544ece3f513ef643a21d68d0683ce6671b02e75f68018fe3fca1f5d109e -size 72115 +oid sha256:3c5c028cb5846b7051b2d91ee75a4bcfa245f38828374aca2d5451363641082e +size 74261 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png index 6572fd23e4..1d34f107f8 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c07d50aed2ae2caa61b554574cab3e127c6ec6483df31dc6d399fc2b3cdd1475 -size 24509 +oid sha256:1167f33855f98e5975c84a75b0cfb7792c9397fa5c2f4c772e7c8126db291b5d +size 25268 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png index b855252a4b..1a773098ea 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc8775d82cda2eb4fcc4d0bf4d404e367f2336ce41c03128894823746fc6a71f -size 46526 +oid sha256:9b2d05c767a1368b7639a7abbb4290dd5d6233cf967abee30c641c846120ffa1 +size 46633 diff --git a/plugins/CoreHome/tests/UI/SingleMetricView_spec.js b/plugins/CoreHome/tests/UI/SingleMetricView_spec.js index 7884bf087e..93b1959894 100644 --- a/plugins/CoreHome/tests/UI/SingleMetricView_spec.js +++ b/plugins/CoreHome/tests/UI/SingleMetricView_spec.js @@ -28,7 +28,7 @@ describe('SingleMetricView', function () { var elem = await page.waitForSelector('#widgetCoreVisualizationssingleMetricViewcolumn'); await page.waitForNetworkIdle(); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await elem.screenshot()).to.matchImage('loaded'); }); @@ -41,7 +41,7 @@ describe('SingleMetricView', function () { $('#dashboardWidgetsArea .jqplot-seriespicker-popover label:contains(Revenue)').click(); }); await page.waitForNetworkIdle(); - await page.waitFor(250); + await page.waitForTimeout(250); var elem = await page.waitForSelector('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn'); expect(await elem.screenshot()).to.matchImage('formatted_metric'); @@ -51,12 +51,12 @@ describe('SingleMetricView', function () { await page.evaluate(function(){ $('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn .jqplot-seriespicker').last().trigger('mouseenter'); }); - await page.waitFor(250); + await page.waitForTimeout(250); await page.evaluate(function(){ $('#dashboardWidgetsArea .jqplot-seriespicker-popover label:contains(_x)').click() }); await page.waitForNetworkIdle(); - await page.waitFor(250); + await page.waitForTimeout(250); var elem = await page.$('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn'); expect(await elem.screenshot()).to.matchImage('goal_metric'); @@ -67,12 +67,12 @@ describe('SingleMetricView', function () { await page.evaluate(function(){ $('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn .jqplot-seriespicker').trigger('mouseenter'); }); - await page.waitFor(250); + await page.waitForTimeout(250); await page.evaluate(function(){ $('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn .jqplot-seriespicker-popover label:contains(Revenue)').click() }); await page.waitForNetworkIdle(); - await page.waitFor(250); + await page.waitForTimeout(250); var elem = await page.$('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn'); expect(await elem.screenshot()).to.matchImage('range'); diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close.png b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close.png index 3d32433f03..1dbdb3ed8f 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ab00ad8715daf05847c359e48ab19e7e82b26f40edd79e1445c0167a59e12a6 -size 5887 +oid sha256:f166fb1cc0d58fc6d8edaacffbb70310d85328353921a8820ab023af6c1875e3 +size 5884 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close_reload.png b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close_reload.png index 3d32433f03..1dbdb3ed8f 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close_reload.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close_reload.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ab00ad8715daf05847c359e48ab19e7e82b26f40edd79e1445c0167a59e12a6 -size 5887 +oid sha256:f166fb1cc0d58fc6d8edaacffbb70310d85328353921a8820ab023af6c1875e3 +size 5884 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_loaded.png b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_loaded.png index fefd4863d1..d955c28822 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_loaded.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:003ae9a97b33f35347d699eb03700e0a38bd153b5d58e32e8991a18b590bede0 -size 17049 +oid sha256:79240e5a37b12a4f6f296cac0d2e3c4e7785bb30e14f90c04bbf999797e87e70 +size 17041 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_reloaded.png b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_reloaded.png index f063ecc752..667c716495 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_reloaded.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_reloaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30518830c1a132dbe2978eae8e5022a9c61f7705121bb1048f37e5283d50c8f4 -size 11767 +oid sha256:eeedebf0a2a1a06debf6d0610db9666999d82e3a90af851fded7016a5b944300 +size 11760 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png index 965c8818ef..26ce8b42b5 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d1c17811b2347ffac0c2609378c3ccef2bae94b34d638e63db45a228a190caf -size 6494 +oid sha256:fb9305159cdcbf107a6747b315cba146214a1f73f404c200aa37d6734706ccc2 +size 6485 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png index 947165fc2e..e6cdfa9a26 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:285156337a075fc6523c05e7b4617472b55be269797a74bfe2c2183a67dc93ef -size 8956 +oid sha256:33bbb2c1fe617afaf7dc2216e981057698abe7679814ca3d4a729517b7859b33 +size 8952 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png index c3a8d28729..9dcc86fc15 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37d9eb86e57ebdcdaf5a0ab5faeb7ee6a71de6b2d7a7576d451b0fb823325155 -size 4753 +oid sha256:da10b7861b5b8208164116aebb716bb8d6028701544c7430bf172d9b328fbe74 +size 4741 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png index 08ec15bc4f..5cb9e50b39 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aa84abbc6d84620b272ed3db58367463ed27f7f2e6cda1ef10f19bad2e5833d -size 5016 +oid sha256:b4bc0c7c4e99fd8d622f86462379886fb124959392c19487c36829525f51944d +size 5019 diff --git a/plugins/CorePluginsAdmin/tests/UI/TagManagerTeaser_spec.js b/plugins/CorePluginsAdmin/tests/UI/TagManagerTeaser_spec.js index a9ac485f90..752c2fed50 100644 --- a/plugins/CorePluginsAdmin/tests/UI/TagManagerTeaser_spec.js +++ b/plugins/CorePluginsAdmin/tests/UI/TagManagerTeaser_spec.js @@ -63,7 +63,7 @@ describe("TagManagerTeaser", function () { await page.click('#login_form_submit'); await page.waitForNetworkIdle(); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await page.screenshotSelector('.pageWrap')).to.matchImage('super_user_activate_plugin'); }); @@ -80,7 +80,7 @@ describe("TagManagerTeaser", function () { setAdminUser(); await page.click('.activateTagManager .dontShowAgainBtn'); await page.waitForNetworkIdle(); - await page.waitFor('.widget'); + await page.waitForSelector('.widget'); await page.waitForNetworkIdle(); expect(await page.screenshotSelector('.pageWrap')).to.matchImage('admin_page_disable'); }); diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png index 7ed039d102..c26ef930b1 100644 --- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png +++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4dc5e649c001e476256d37d51c2f4bf5dd5d3c6d5b9f7977c5e90ab11fb0d0b -size 181456 +oid sha256:06a762ba654863e8641f1989fdb66ac9c4d49f40b5c0ebc22c1ff7181c0993cd +size 181407 diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png index 4854fe425d..0908ac8ef9 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69c0b4ae3f17972ecb5e70ac99483e67e500b53c9ed0d29276e3cc134eb13f92 -size 348771 +oid sha256:88d2b601b770783a3cb9a71357859c6bf7ef48775ce2b7e59412ad6abb8099a9 +size 348613 diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png index 21e97f858c..7e62977a0f 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ddf010f6ba6b6e68ea16635d67b2ca2c20024035c3aff81b3c4ae2e751b0b96 -size 350350 +oid sha256:abe28d78c7cf52bcfd71a3b77641db7dbcdb428157ba10d7f07ea59e324576d1 +size 350194 diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png index c0486b0ddf..5ae9d1d17a 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54250cb246a4d53bce07ae13c935a2ef8cac06dadfebff14181d5ced2ecb3a3a -size 83276 +oid sha256:505f9dce5bb643558c218dbcf53be6ed963531694ea66fcf39083659f9df419f +size 83145 diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 2af4a1d48dc6d67101c75f0bd7cccd8ba69c2b1 +Subproject 08391126914fe1e1cfb270571371fad37d82b43 diff --git a/plugins/CustomDimensions/tests/UI/CustomDimensions_spec.js b/plugins/CustomDimensions/tests/UI/CustomDimensions_spec.js index 1aed4a0176..329c32fda5 100644 --- a/plugins/CustomDimensions/tests/UI/CustomDimensions_spec.js +++ b/plugins/CustomDimensions/tests/UI/CustomDimensions_spec.js @@ -24,27 +24,28 @@ describe("CustomDimensions", function () { var popupSelector = '.ui-dialog:visible'; async function capturePageWrap (screenName, test) { - await test(); - var elem = await page.jQuery('.pageWrap'); - expect(await elem.screenshot()).to.matchImage(screenName); + await captureSelector(screenName, '.pageWrap', test) } async function captureSelector (screenName, selector, test) { + await page.webpage.setViewport({ + width: 1350, + height: 768, + }); await test(); - var elem = await page.jQuery(selector); - expect(await elem.screenshot()).to.matchImage(screenName); + expect(await page.screenshotSelector(selector)).to.matchImage(screenName); } async function closeOpenedPopover() { - await page.waitFor(100); + await page.waitForTimeout(100); const closeButton = await page.jQuery('.ui-dialog:visible .ui-icon-closethick:visible'); if (!closeButton) { return; } await closeButton.click(); - await page.waitFor(100); + await page.waitForTimeout(100); } async function triggerRowAction(labelToClick, nameOfRowActionToTrigger) @@ -52,11 +53,11 @@ describe("CustomDimensions", function () { var rowToMatch = 'td.label:contains(' + labelToClick + '):first'; await (await page.jQuery('table.dataTable tbody ' + rowToMatch)).hover(); - await page.waitFor(50); + await page.waitForTimeout(50); await (await page.jQuery(rowToMatch + ' a.'+ nameOfRowActionToTrigger + ':visible')).hover(); // necessary to get popover to display await (await page.jQuery(rowToMatch + ' a.' + nameOfRowActionToTrigger + ':visible')).click(); await page.mouse.move(-10, -10); - await page.waitFor(250); // wait for animation + await page.waitForTimeout(250); // wait for animation await page.waitForNetworkIdle(); } @@ -86,7 +87,7 @@ describe("CustomDimensions", function () { await page.goto( "?" + urlBase + "#?" + generalParams + "&category=Goals_Goals&subcategory=General_Overview"); await (await page.jQuery('.reportsByDimensionView .dimension:contains(MyName1)')).click(); await page.waitForNetworkIdle(); - await page.waitFor(100); + await page.waitForTimeout(100); }); }); @@ -108,12 +109,13 @@ describe("CustomDimensions", function () { it('should offer only segmented visitor log and row action for first level entries', async function () { await capturePageWrap('report_actions_rowactions', async function () { - await (await page.jQuery('td.label:contains(en):first')).hover(); + await page.hover('tr:first-child td.label'); }); }); it('should be able to render insights', async function () { await capturePageWrap('report_action_insights', async function () { + await page.mouse.move(0, 0); await page.evaluate(function(){ $('[data-footer-icon-id="insightsVisualization"]').click(); }); @@ -146,7 +148,7 @@ describe("CustomDimensions", function () { await (await page.jQuery('.dataTable .subDataTable .value:contains(en):first')).click(); await page.waitForNetworkIdle(); await (await page.jQuery('td.label:contains(en_US)')).hover(); - await page.waitFor(100); + await page.waitForTimeout(100); }); }); @@ -169,9 +171,9 @@ describe("CustomDimensions", function () { await page.goto(reportUrlDimension3); await (await page.jQuery('.dataTable .subDataTable .value:contains(en):first')).click(); await page.waitForNetworkIdle(); - await page.waitFor(100); + await page.waitForTimeout(100); await (await page.jQuery('td.label:contains(en_US)')).hover(); - await page.waitFor(100); + await page.waitForTimeout(100); await triggerRowAction('en_US', 'actionTransitions'); }); }); diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png index 5a8af9f5c5..e60fa0e00f 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8bbb87ed594a62115a605fe4887f13a1dbbb8637544763e77855f843e1f1869 -size 28747 +oid sha256:adedd01ca10b9805ae9a40a88936d2ce80e09430918cd0a5cf85172f9f1482d9 +size 30844 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_insights.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_insights.png index f4c4bca85e..30fff46fd4 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_insights.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_insights.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed42e651e67b065861556c898c2fe001b8c1a41a9511c70594d000466ab66744 -size 31867 +oid sha256:602134cce513f2284c9e1481fe52dd23304b8919c8e2571e11578850237d77f5 +size 30740 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png index 2520f01035..6765908e4c 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62c436230351fa8304633315b2f2967195a00b43257a944283d74921be736bdc -size 53014 +oid sha256:502c692ae468f9d294ae83902c8222afb4fc3f7a8d1b3dea53bca2505f21c9c4 +size 56262 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png index 01224b4494..416b66d07d 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:932a692a8708986cf165484598f4cfa6774ecef70aa4d463f3519d1f3a9b637c -size 74177 +oid sha256:6368680ecc7e5982ddd961fe1b3dc1d257d68879d2122f8e382e15de21679391 +size 74140 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png index 3f7086c9fe..82e5e940f7 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0e85ea9d85f3c1b0ce1fc5ea9d017b73bb69320d7632419230010f5bb3130e -size 83646 +oid sha256:e80673f1b62256a6760afd19ac8eb13c07413c4fff615a49d9259fa7a2be9546 +size 83644 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png index 8ac2bd6eac..35aeb50e8f 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b583778122329745abd12f69cdc51006fa889677e0055341b5171db17b0b411f -size 31887 +oid sha256:de9a7441eeec02ed6c0eaacf58fb14fe14fcd851edc0d5acbfdbff7eb08217fc +size 33729 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png index 19405f4018..65a5718b17 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cfc899633bead41bffc486b99434c27ef987892213b1e12aceb7f85a13d2bb3 -size 64404 +oid sha256:bf25b1aa3ca129e0b54df11e5de08097256e911946a4e4ff086b6d70621773a2 +size 64439 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png index d0fc011e38..6559166c58 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:859274ab2a28c233cd91f61b4e42900a4f3554b948c37cb9f47ccd51eb984a56 -size 118695 +oid sha256:c43ccaa361c22602defc19b854b2319ffb027e7a3e618b4347a86b4b2b797d43 +size 118687 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png index 42bbd023f2..54ee01d97a 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa2ad7bedc67e12b50977b5eb03186961af944ecd335ee44aa75baeae73ad208 -size 69652 +oid sha256:bec61778342a5246850e71f6f9a6971824d93f98ad76ad67df5417c8adb1782e +size 71713 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png index c7fb6f8559..b360054aec 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e863697a73b5e7e3fc61e75926e8b48103da6d0cac0844adcc65af14773c176 -size 23463 +oid sha256:f6fac7d21dd5e7e737c965de7d3355a908b249a395e23bae391c06ddaaf69674 +size 24312 diff --git a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png index 4f877c54fe..d1bb119c5b 100644 --- a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png +++ b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f65f9eebd4ddc3692742e6855bf681c83ed01e4d7f83bfd76d23d6226816e2f2 -size 227709 +oid sha256:db63ee6ac4e4f3ccf4128086087ae8bb00a3fff17fff1320483c7365730a18a3 +size 232259 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 diff --git a/plugins/DeviceDetectorCache b/plugins/DeviceDetectorCache -Subproject ec65d1736713a8b984f3ad5ad48cac293d07561 +Subproject 3a4ec60ab1d7d18bffc88a2bbb0293ba3380516 diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png index c198d9febd..c1a2898f64 100644 --- a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png +++ b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b468903e5e1aa258f41b7f4327354ee4a72fd8e6b91ccdeaf8e1e364f15892fa -size 463061 +oid sha256:579f0b7e6e66f5bd4ec11b730b76f6b2b410781eef8878403fb8201bcad0458a +size 464227 diff --git a/plugins/Feedback/tests/UI/FeedbackPopup_spec.js b/plugins/Feedback/tests/UI/FeedbackPopup_spec.js index 5073ff9594..cdfbbeb36e 100644 --- a/plugins/Feedback/tests/UI/FeedbackPopup_spec.js +++ b/plugins/Feedback/tests/UI/FeedbackPopup_spec.js @@ -24,7 +24,7 @@ describe("FeedbackPopup", function () { await page.goto(url); await page.waitForNetworkIdle(); - var modal = await page.waitFor('.modal.open', { visible: true }); + var modal = await page.waitForSelector('.modal.open', { visible: true }); expect(await modal.screenshot()).to.matchImage('feedback_popup'); // Click on the "Remind me in 90 days" button = the popup shouldn't appear for the next test diff --git a/plugins/Feedback/tests/UI/ReferBanner_spec.js b/plugins/Feedback/tests/UI/ReferBanner_spec.js index 7b0364f111..84b8c1bb33 100644 --- a/plugins/Feedback/tests/UI/ReferBanner_spec.js +++ b/plugins/Feedback/tests/UI/ReferBanner_spec.js @@ -24,7 +24,7 @@ describe("ReferBannerTest", function () { await page.goto(url); await page.waitForNetworkIdle(); - var banner = await page.waitFor('.refer-banner', { visible: true }); + var banner = await page.waitForSelector('.refer-banner', { visible: true }); expect(await banner.screenshot()).to.matchImage('feedback_popup'); }); }); diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png index 6cc0baaa47..7ca34edd9d 100644 --- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png +++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdae452443e888644ea410706b751f8931d93f1760db6fed533059caef0d742c -size 269138 +oid sha256:37bddab33dbd00a473c45f015a96bf420c6b3d9f21e0b4e668e0d569fb9d471f +size 269098 diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png index 47b7b15d4e..a6c7a12fe9 100644 --- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png +++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:569affdd2877633a19212a4d409a2254f76593e1f1d5629a2caf6703586495be -size 27962 +oid sha256:d5e4c0571a535a90244639b4d6f68c9679f53300dd0f1eedd3ac6024d3e0571a +size 27936 diff --git a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png index 03067a11d8..ef70542040 100644 --- a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png +++ b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:280a9c6d9e2a7fda228368cc2c0a38919a6d7d46568f7082cb4cc123b3216a93 -size 151547 +oid sha256:62c638edcde3ecbe2dfd2fda9d3866f82f380db4a52f750c60e1f49d6eb969b0 +size 151176 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png index 89f503a929..79d4e0e32e 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2554655af0da05aaa8bf264ec54d14b93f7c2cb57f03367f8f1c27a0fa508696 -size 235575 +oid sha256:3d1146cfd0c79d6c5d40ed44cb620fb53d9459b26e667e2c36cdf0bbb49f5583 +size 237627 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png index 970b4baa4f..abc3f12601 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1d87b1483312d63ac5f18f2db086fd2a35eea2213cf2866122b9f8970c36149 -size 44306 +oid sha256:0fb592393904c7bfe7c6eb25e5724c0220d244ef8e58bdcaa05d6e4c70758215 +size 45937 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png index dc5f5b5941..32cccd8f30 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6614f18a029016b58b878f8c924a18035b184b37879bb4d0605773490604422 -size 55967 +oid sha256:97d80a1084b8ef6662a4d1190b4b8b24f718f80f102d36421f9edaa086598b06 +size 57602 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png index aa77762378..30effbb7cc 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17647c289e082f0e9e1250e7564c80acb7fa5c1a9e0097e724ef717688a74f16 -size 65215 +oid sha256:fef06d503975ea6f1e8be4e4b1c619ad769a80d230c867a482894ea8f2130af8 +size 66891 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png index 0cccd30d8c..9260c2e11b 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad5bd993d8ac509429d42a87ba484f08e2891e7ef23505f95e1dbc91d0c77c6b -size 236944 +oid sha256:0c3f2db19b7892b71e573b04a3eaf034350ca5f47a5cb2747a7042e041fb86d5 +size 238543 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png index 292e6c48e0..4901a35469 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9181e8c0225ed4d89b25c7979716327986ec6b505103b6f76d263750dd54d18a -size 77143 +oid sha256:e895f33367d187ad234215ba3f3fdb8774bbae5079beb8f71fb847f6c918bfb9 +size 78768 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png index adc59a73bb..e1f2b3d87e 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00a5682d9d547a8c77e62027796d034d958b24a29a24ee34d46def9a480d0eac -size 81993 +oid sha256:e28e405e304b02f9c9e5ec12fd77130b62bfa3997e0a32900ebf18209a7a533c +size 83655 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png index e7774f4d4c..0c52e06d4d 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fede79745ca8c90d989a556286416183272296f9b22f22d521857c5d44f09904 -size 50371 +oid sha256:4e563cc9ff0f28ca1b0445416a8de79dc4c46bce6ee6a15480aeeb2abba8e789 +size 52347 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png index ec6425699e..e080240816 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c78f147d8c04386354fd67e6d3b5797dbc67ee24a03cda796d5ada4f4994bd17 -size 95702 +oid sha256:c8eb9f5ddc08af2e4ef54c497ec15d444c0da1c59a7cdc9804903acfadafe24e +size 96913 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png index 0d91c6de13..34da9e6696 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:164373455dbeae733fbac1f187d902f44852bd7291522e79835cbd4e1c92d5fc -size 111499 +oid sha256:482d82c55db4807aacc9576e4b2aff98b558cd3f95f156853254cba303e7a1ec +size 113296 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png index 8aaca962c7..ed09de8e15 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bc403833c1e39337e016129e653589b9fc9fc421584a5395be8860a3058c5f4 -size 109618 +oid sha256:af9729f0c9222deec706649748d40d8d4b4b71c6a35d3bb9842b83ca2ec07a95 +size 110963 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png index 4e144e1496..1a12421ecc 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:045de8fcb76c9a5d77aa8d97069926d3b31b045b0698f2f804e46fdf92a1e44d -size 274313 +oid sha256:0fc783ae07f00e3cc8a782288eae50ec1120018690e2120927e855fed69841fc +size 273637 diff --git a/plugins/IntranetMeasurable/tests/UI/IntranetMeasurable_spec.js b/plugins/IntranetMeasurable/tests/UI/IntranetMeasurable_spec.js index 17357ab2ee..46063f9108 100644 --- a/plugins/IntranetMeasurable/tests/UI/IntranetMeasurable_spec.js +++ b/plugins/IntranetMeasurable/tests/UI/IntranetMeasurable_spec.js @@ -26,7 +26,7 @@ describe("IntranetMeasurable", function () { it("should show intranet selection", async function () { await page.goto(url); await (await page.jQuery('.SitesManager .addSite:first')).click(); - await page.waitFor(500); + await page.waitForTimeout(500); const elem = await page.$('.modal.open'); expect(await elem.screenshot()).to.matchImage('add_new_dialog'); @@ -35,7 +35,7 @@ describe("IntranetMeasurable", function () { it("should load intranet specific fields", async function () { await (await page.jQuery('.modal.open .btn:contains(Intranet)')).click(); await page.waitForNetworkIdle(); - await page.waitFor(250); + await page.waitForTimeout(250); await page.evaluate(function () { $('.form-help:contains(UTC time is)').hide(); diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png index 3509f3fceb..cbfc4f027e 100644 --- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png +++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f51b2683c2e1ab32986beb154bc519ad9b605050d3d08bc213fcb5ceaa4708e -size 8851 +oid sha256:bdfcc21b1beecf04a25776751532d54379a401cda39ade6989025064fe33f06c +size 8545 diff --git a/plugins/Live/tests/UI/DeactivatedFeatures_spec.js b/plugins/Live/tests/UI/DeactivatedFeatures_spec.js index 508dfbe26f..d98a38d730 100644 --- a/plugins/Live/tests/UI/DeactivatedFeatures_spec.js +++ b/plugins/Live/tests/UI/DeactivatedFeatures_spec.js @@ -48,7 +48,7 @@ describe("DeactivatedFeatures", function () { it('menu should contain visits log & realtime when enabled', async function () { await setFeatures(1, 0, 1); await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2009-01-04#?idSite=1&period=year&date=2009-01-04&category=General_Visitors&subcategory=General_Overview"); - await page.waitFor('#secondNavBar', {visible: true}); + await page.waitForSelector('#secondNavBar', {visible: true}); const vlog = await page.$('#secondNavBar .navbar a[href*="Live_VisitorLog"]'); expect(vlog).to.be.ok; @@ -63,7 +63,7 @@ describe("DeactivatedFeatures", function () { it('menu should not contain visits log & realtime when deactivated', async function () { await setFeatures(1, 1, 1); await page.reload(); - await page.waitFor('#secondNavBar', {visible: true}); + await page.waitForSelector('#secondNavBar', {visible: true}); const vlog = await page.$('#secondNavBar .navbar a[href*="Live_VisitorLog"]'); expect(vlog).to.be.not.ok; @@ -102,7 +102,7 @@ describe("DeactivatedFeatures", function () { it('menu should contain ecommerce log when visits log enabled', async function () { await setFeatures(1, 0, 1); await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2009-01-04#?idSite=1&period=year&date=2009-01-04&category=Goals_Ecommerce&subcategory=Goals_EcommerceLog"); - await page.waitFor('#secondNavBar', {visible: true}); + await page.waitForSelector('#secondNavBar', {visible: true}); const element = await page.$('#secondNavBar .navbar a[href*="Goals_EcommerceLog"]'); expect(element).to.be.ok; @@ -111,7 +111,7 @@ describe("DeactivatedFeatures", function () { it('menu should not contain ecommerce log when visits log deactivated', async function () { await setFeatures(1, 1, 1); await page.reload(); - await page.waitFor('#secondNavBar', {visible: true}); + await page.waitForSelector('#secondNavBar', {visible: true}); const element = await page.$('#secondNavBar .navbar a[href*="Goals_EcommerceLog"]'); expect(element).to.be.not.ok; @@ -128,7 +128,7 @@ describe("DeactivatedFeatures", function () { it('it should show profile link in visits log when enabled', async function () { await setFeatures(1, 0, 0); await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2012-08-09#?idSite=1&period=year&date=2012-08-09&category=General_Visitors&subcategory=Live_VisitorLog"); - await page.waitFor('.dataTableVizVisitorLog'); + await page.waitForSelector('.dataTableVizVisitorLog'); const element = await page.$('.dataTableVizVisitorLog .card .visitor-log-visitor-profile-link'); expect(element).to.be.ok; @@ -137,7 +137,7 @@ describe("DeactivatedFeatures", function () { it('it should not show profile link in visits log when disabled', async function () { await setFeatures(1, 0, 1); await page.reload(); - await page.waitFor('.dataTableVizVisitorLog'); + await page.waitForSelector('.dataTableVizVisitorLog'); const element = await page.$('.dataTableVizVisitorLog .card .visitor-log-visitor-profile-link'); expect(element).to.be.not.ok; @@ -146,7 +146,7 @@ describe("DeactivatedFeatures", function () { it('it should show button to test new segments with enabled visits log', async function () { await setFeatures(1, 0, 1); await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2012-07-09#?idSite=1&period=year&date=2012-07-09&category=General_Visitors&subcategory=General_Overview"); - await page.waitFor('.segmentationContainer'); + await page.waitForSelector('.segmentationContainer'); await page.click('.segmentationContainer'); await page.click('.add_new_segment'); @@ -157,7 +157,7 @@ describe("DeactivatedFeatures", function () { it('it should not show button to test new segments with disabled visits log', async function () { await setFeatures(1, 1, 1); await page.reload(); - await page.waitFor('.segmentationContainer'); + await page.waitForSelector('.segmentationContainer'); await page.click('.segmentationContainer'); await page.click('.add_new_segment'); @@ -171,7 +171,7 @@ describe("DeactivatedFeatures", function () { await page.waitForNetworkIdle(); await (await page.jQuery('#widgetDevicesDetectiongetOsVersions td.label:first')).hover(); - await page.waitFor('#widgetDevicesDetectiongetOsVersions .dataTableRowActions', {visible: true}); + await page.waitForSelector('#widgetDevicesDetectiongetOsVersions .dataTableRowActions', {visible: true}); const element = await page.$('#widgetDevicesDetectiongetOsVersions .dataTableRowActions .actionSegmentVisitorLog'); expect(element).to.be.ok; @@ -183,7 +183,7 @@ describe("DeactivatedFeatures", function () { await page.waitForNetworkIdle(); await (await page.jQuery('#widgetDevicesDetectiongetOsVersions td.label:first')).hover(); - await page.waitFor('#widgetDevicesDetectiongetOsVersions .dataTableRowActions', {visible: true}); + await page.waitForSelector('#widgetDevicesDetectiongetOsVersions .dataTableRowActions', {visible: true}); const element = await page.$('#widgetDevicesDetectiongetOsVersions .dataTableRowActions .actionSegmentVisitorLog'); expect(element).to.be.not.ok; @@ -195,7 +195,7 @@ describe("DeactivatedFeatures", function () { await page.waitForNetworkIdle(); await (await page.jQuery('.widgetpreview-categorylist li:contains("Visitors"):first')).hover(); - await page.waitFor('.widgetpreview-widgetlist', {visible: true}); + await page.waitForSelector('.widgetpreview-widgetlist', {visible: true}); const profile = await page.$('.widgetpreview-widgetlist [uniqueid=widgetLivegetVisitorProfilePopup]'); expect(profile).to.be.ok; @@ -216,7 +216,7 @@ describe("DeactivatedFeatures", function () { await page.waitForNetworkIdle(); await (await page.jQuery('.widgetpreview-categorylist li:contains("Visitors"):first')).hover(); - await page.waitFor('.widgetpreview-widgetlist', {visible: true}); + await page.waitForSelector('.widgetpreview-widgetlist', {visible: true}); const profile = await page.$('.widgetpreview-widgetlist [uniqueid=widgetLivegetVisitorProfilePopup]'); expect(profile).to.be.not.ok; @@ -234,7 +234,7 @@ describe("DeactivatedFeatures", function () { it('Goal overview contains segmented visitor log link when activated', async function () { await setFeatures(1, 0, 1); await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2012-08-08#?idSite=1&period=year&date=2012-08-08&category=Goals_Goals&subcategory=1"); - await page.waitFor('#widgetGoalsgoalConversionsOverviewidGoal1', {visible: true}); + await page.waitForSelector('#widgetGoalsgoalConversionsOverviewidGoal1', {visible: true}); const profile = await page.$('#widgetGoalsgoalConversionsOverviewidGoal1 a.segmentedlog'); expect(profile).to.be.ok; @@ -243,7 +243,7 @@ describe("DeactivatedFeatures", function () { it('Goal overview does not contain segmented visitor log link when disabled', async function () { await setFeatures(1, 1, 1); await page.reload(); - await page.waitFor('#widgetGoalsgoalConversionsOverviewidGoal1', {visible: true}); + await page.waitForSelector('#widgetGoalsgoalConversionsOverviewidGoal1', {visible: true}); const profile = await page.$('#widgetGoalsgoalConversionsOverviewidGoal1 a.segmentedlog'); expect(profile).to.be.not.ok; @@ -305,7 +305,7 @@ describe("DeactivatedFeatures", function () { it('menu should not contain visits log when deactivated globally', async function () { await setConfig(1, 1); await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2009-01-04#?idSite=1&period=year&date=2009-01-04&category=General_Visitors&subcategory=General_Overview"); - await page.waitFor('#secondNavBar', {visible: true}); + await page.waitForSelector('#secondNavBar', {visible: true}); const element = await page.$('#secondNavBar .navbar a[href*="Live_VisitorLog"]'); expect(element).to.be.not.ok; diff --git a/plugins/Live/tests/UI/Live_spec.js b/plugins/Live/tests/UI/Live_spec.js index 9e0ba37874..d31d470c6c 100644 --- a/plugins/Live/tests/UI/Live_spec.js +++ b/plugins/Live/tests/UI/Live_spec.js @@ -21,7 +21,7 @@ describe("Live", function () { await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2010-01-03#?idSite=1&period=year&date=2010-01-03&category=General_Visitors&subcategory=Live_VisitorLog"); await page.waitForNetworkIdle(); - await page.waitFor('.dataTableVizVisitorLog'); + await page.waitForSelector('.dataTableVizVisitorLog'); var report = await page.$('.reporting-page'); expect(await report.screenshot()).to.matchImage('visitor_log'); diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png index 7e03b3f7c4..50c5d91ecd 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa1d5a108f3089599ccdb091f89e779b6a032327d16aaefe84ce94e2ac06321c -size 386172 +oid sha256:5a606dc50663830984e0e30edb727860db7de042c9241e625009923210b89196 +size 386185 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png index dda52a344b..8264bbfaa6 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a77301420974e3f3194c752116bf22c6cd75882ad638f245efc048631374632 -size 51599 +oid sha256:f0086120e8f9548298357d45ffec30ceb507701687009fc69b9f64917388b970 +size 51598 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_content_actions.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_content_actions.png index 710eda75ee..701c3d9152 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_content_actions.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_content_actions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef5b12f774f5934f05b82e972ac8df8ee7ae3376e446aef3b5f6896657df32be -size 39891 +oid sha256:d9bd76f258af9a88e0cf58090d49593d5e4328d4c788d1e94d19a61d70d7797e +size 39886 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png index e686666fef..bb3c6f5196 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bbd83ebe4e1ba806261871abf562b27743ace121064c5ec143fc8b64e331eeb -size 102070 +oid sha256:a1b8136cf7a0607857f929eddafd7eaa2719284e94d99434e08ca4b5bde6034f +size 102065 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png index df19c3ecb6..96bf7578de 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28054cad7ff7bc20b613371a3ac9fe41dc2c36f7f5b2998ff508f8dad82ddc0c -size 423220 +oid sha256:87dfa7cbb02b66ff0ae21baf441e80cc612a45f3abb45ee533deef3839636132 +size 423221 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png index b2561c1d7b..69407fc7f8 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c2ddc545cc4767795cf9b4cecea826f9018be6353eae7e2a76c2ce20747dd8a +oid sha256:1e8980055f55066eed4f95bfb2e40e293a953a2478ca18ac15c2a7db3192dd7c size 311397 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png index d5c441a312..1545c63998 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9970312f1e90aaaeb333b100855f6d6c4f4164cc32abf40b40bd544f5e874e2c +oid sha256:69241c8e7ab81203abf8faffcb241616151ba000afa093a4efc052b04aba9408 size 449462 diff --git a/plugins/LogViewer b/plugins/LogViewer -Subproject 3204e829f960ccfc0a9ddb4b509dea5a4f6529e +Subproject f5d293176e05a220d050fe30a3fd1869b5d5b35 diff --git a/plugins/Login/tests/UI/Login_spec.js b/plugins/Login/tests/UI/Login_spec.js index 653f2149f0..968bea18eb 100644 --- a/plugins/Login/tests/UI/Login_spec.js +++ b/plugins/Login/tests/UI/Login_spec.js @@ -64,9 +64,9 @@ describe("Login", function () { it("should load correctly", async function() { await page.goto(""); await page.waitForNetworkIdle(); - await page.waitFor('input'); + await page.waitForSelector('input'); await page.mouse.click(0, 0); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await page.screenshot({ fullPage: true })).to.matchImage('login_form'); }); @@ -78,9 +78,9 @@ describe("Login", function () { $('#login_form_submit').click(); }); await page.waitForNetworkIdle(); - await page.waitFor('.notification'); + await page.waitForSelector('.notification'); await page.mouse.click(0, 0); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await page.screenshot({ fullPage: true })).to.matchImage('login_fail'); }); @@ -101,9 +101,9 @@ describe("Login", function () { it("should redirect to login when logout link clicked", async function() { await page.click("nav .right .icon-sign-out"); await page.waitForNetworkIdle(); - await page.waitFor('input'); + await page.waitForSelector('input'); await page.mouse.click(0, 0); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await page.screenshot({ fullPage: true })).to.matchImage('login_form_logout'); }); @@ -123,7 +123,7 @@ describe("Login", function () { it("should display password reset form when forgot password link clicked", async function() { await page.click("nav .right .icon-sign-out"); await page.waitForNetworkIdle(); - await page.waitFor("a#login_form_nav"); + await page.waitForSelector("a#login_form_nav"); await page.click("a#login_form_nav"); await page.waitForNetworkIdle(); @@ -135,7 +135,7 @@ describe("Login", function () { await page.type("#reset_form_password", "superUserPass2"); await page.click("#reset_form_submit"); await page.waitForNetworkIdle(); - await page.waitFor('.notification'); + await page.waitForSelector('.notification'); expect(await page.screenshot({ fullPage: true })).to.matchImage('password_reset_error'); }); diff --git a/plugins/Login/tests/UI/NoAccess_spec.js b/plugins/Login/tests/UI/NoAccess_spec.js index d829962daa..fe69896a2a 100644 --- a/plugins/Login/tests/UI/NoAccess_spec.js +++ b/plugins/Login/tests/UI/NoAccess_spec.js @@ -50,7 +50,7 @@ describe("NoAccess", function () { $('#login_form_submit').click(); }); - await page.waitFor(60500); // wait for session timeout + await page.waitForTimeout(60500); // wait for session timeout await page.click('#topmenu-corehome'); await page.waitForNetworkIdle(); diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedapi.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedapi.png index 6fadc05759..7d1919e08f 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedapi.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedapi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b59ee6a447784996410aba5a54c5e2cb03608ca2b59277aca245754f5095e34 +oid sha256:96d146d0451779db1b91b233b8e65a36406a096339ad3138ac3b6d693968f785 size 13253 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogin.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogin.png index 8d9da40589..9a42cde0a9 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogin.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7602b4dcf8fc4e77750e3335051d106415dbeea5082b154347245ac2e08dd0e -size 48281 +oid sha256:bf87c9ad23692ec0ffe133b3cd75aa2aafc729ccbb094e8628d6b99d0f802517 +size 48163 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogme.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogme.png index 8d9da40589..9a42cde0a9 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogme.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogme.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7602b4dcf8fc4e77750e3335051d106415dbeea5082b154347245ac2e08dd0e -size 48281 +oid sha256:bf87c9ad23692ec0ffe133b3cd75aa2aafc729ccbb094e8628d6b99d0f802517 +size 48163 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png index 72ff2004c8..5e12f8534c 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a144c6e43a86a9286defe3dfc1798408d85f51472f136983e42afe86edb1ec79 -size 49830 +oid sha256:0fb0f55731af170b52697c4ca0319c4cc66dab563fb7ec0cdaabd385180cbde6 +size 49836 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png index 449e5c19b9..1e1f1312db 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a731f0f05758fcd67663059bc5d4acf6677483501c1ad4d8e88703d12911c9d1 -size 67431 +oid sha256:7c13b6ae466331318983ff9f1fc50653c6f564be343df20a4e03fda7cb7b191a +size 67218 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png b/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png index 49f09695cb..2525c91025 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77164625203d044ec1d7058bdea51af51634f1c9c818ddf2f626944694824543 -size 29965 +oid sha256:d3ace83bcac411282ada8a81a209c30e70d3ea70f0db03ff6c06b889d6c60d58 +size 29973 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png b/plugins/Login/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png index 1fd4733ba8..bad0c494d8 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f668dbd2e6ed9b1ebbd825898c5957638825799668b23330454bef9d5f2b7440 -size 33192 +oid sha256:ae8fb99e397c00cb3cc44e55e064508985e28dce029a3e8cc6fbe3752c2da516 +size 33169 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png index 983318fb64..435afa8475 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b0f2591ce9a6bb387980941bf109f654f5ac79776fa253256ffbef6adcf0b71 -size 32034 +oid sha256:79c147975d2d9560ba63653449e0f2f0aabe58557bb4cd1dedaa9bcf376d6fd4 +size 32041 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png index 92b9b407b7..0e8689e442 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:747ed4268328512117426c37c653f0e812276f348ae72da7585c3dd9ca0e8278 -size 24643 +oid sha256:a5bad4d68be89fb9986d704e6a09cebfbd2536674f4ba780e1e656eacb13dadc +size 24653 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png index 92b9b407b7..0e8689e442 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:747ed4268328512117426c37c653f0e812276f348ae72da7585c3dd9ca0e8278 -size 24643 +oid sha256:a5bad4d68be89fb9986d704e6a09cebfbd2536674f4ba780e1e656eacb13dadc +size 24653 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_logme_disabled.png b/plugins/Login/tests/UI/expected-screenshots/Login_logme_disabled.png index 7d60d43c04..d82f273614 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_logme_disabled.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_logme_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f65dfc6e14865782065da6c644112ca2bfa50c16966b42e963a999e4ab97610 -size 41859 +oid sha256:ad7e8efb37f95b6938c6864869dab551479ab45614873b11d80c3060006462f5 +size 41697 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_logme_redirect_invalid.png b/plugins/Login/tests/UI/expected-screenshots/Login_logme_redirect_invalid.png index 3b8b2359ea..8c84e8146d 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_logme_redirect_invalid.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_logme_redirect_invalid.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:882e9ee5db5d65cba04c14b34f56058625c631df67d45b1dce3e46ac0231283b -size 62022 +oid sha256:e6857b08acc900c2889c681cdbbb8b467635da9f071c7152c86c6efac9f6d6cd +size 61861 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png index d185c34b07..02ff47119b 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fcc817e7ee5912d68b32cf776144b27dd98bc616f25b5c51c17728b1acb0e9e -size 35064 +oid sha256:a746bb9a3c3ce0d903932b0b9f02e5c023ce0eabd0ca4630dfa4f73681d8386e +size 35075 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png index be5bef5d82..444c34ef1c 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d1debd74ba8a5a1a2c39891f5e203f5b5aa41509308813b89ce88f29655c1d5 -size 29315 +oid sha256:75c01e8424d84fcffd001bdc461150ddc599f1442b509c8279443289296f8d8f +size 29322 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_confirm.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_confirm.png index 5cbabdf2f9..a8d316b14b 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_confirm.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec46909c1a4f613f345285313d8b3b41fc446d123bddc096a2d45759f2c14c0b -size 34444 +oid sha256:e1dc84be8b6ff77a388fb1f32ab9264a2f3b55f103117b2f697dd9fd6d4f00e3 +size 34453 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png index 0f411b3ed9..5518708478 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fe053b046f9d701b8fddb21ba3e266c808fbd58af106fe5d3b4a789da0860ec -size 38912 +oid sha256:e06a70d46e00b5b3ee12f67c404302873240d432d704d8ece727c495b8d1591f +size 38921 diff --git a/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_noaccess.png b/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_noaccess.png index 2391c68a79..1f36d7d639 100644 --- a/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_noaccess.png +++ b/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_noaccess.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c2bf876689974ba0e3bbd46b1dd309877f1838809344d37e28633cd4b8c0bc9 -size 31939 +oid sha256:8cad0d53718fdf9e776a22b2f0a1c9ced6b710585e085789e697f7a4f725f2af +size 31950 diff --git a/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_session_timeout.png b/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_session_timeout.png index cc31f29313..84a2b2ae4b 100644 --- a/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_session_timeout.png +++ b/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_session_timeout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8c62cd426bd1fc44e9456bd1d7b65a424e52bb01cc919ddff6f07442abb50e1 -size 34146 +oid sha256:c943113aa506b42f3055fd2735fefd42adeebdc53941039f4525d968d69bbc2e +size 34156 diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject 67ce24997dad02146dd3333d609eddb3bee314c +Subproject b92efcc78fe2a28e0a8e4462263be6f93faff19 diff --git a/plugins/Marketplace/tests/UI/Marketplace_spec.js b/plugins/Marketplace/tests/UI/Marketplace_spec.js index 00b0a29e10..b38dde471d 100644 --- a/plugins/Marketplace/tests/UI/Marketplace_spec.js +++ b/plugins/Marketplace/tests/UI/Marketplace_spec.js @@ -28,7 +28,7 @@ describe("Marketplace", function () { const elem = await page.waitForSelector('.card-title [piwik-plugin-name="' + pluginName + '"]'); await elem.click(); await page.waitForNetworkIdle(); - await page.waitFor('.ui-dialog .pluginDetails'); + await page.waitForSelector('.ui-dialog .pluginDetails'); } async function captureSelector(screenshotName, selector) @@ -205,7 +205,7 @@ describe("Marketplace", function () { await page.click('.marketplace-paid-intro'); // click outside so change event is triggered await page.click('#submit_license_key input'); await page.waitForNetworkIdle(); - await page.waitFor(200); + await page.waitForTimeout(200); await captureWithNotification(mode + '_invalid_license_key_entered'); }); diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png index c577b0fafa..3def75c148 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:988793ced1e9a478872bd673acd607be8901d6951c322b31226e6424f6d4ae8f -size 64335 +oid sha256:0b1d28443e8cca788567c8cf140d329f7bec728cd946f40918466397327fe365 +size 64450 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png index 3e4b1a8bfa..c86438059a 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71e854b225230373f15d4aa61017076ca9a3ba95bfd4fe2b26580cde993aa51e -size 47871 +oid sha256:13a70c9f7215c0642a04c663099fb27972dad0c9798745c16068ccbaf5f4dce8 +size 47971 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png index f6d2579c1c..1307bda852 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01de68e6fb414ace23c96991d629b17f1d0702bdf930f6bcc8f5de2ccdb4dc98 -size 45796 +oid sha256:84ebba9f15e638ef8331333d81d8ec96488cad172b06c83eb0e604d86852c576 +size 45888 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png index 72c8f15e63..91f98f5735 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:634329b245566bb0c9d186787e385f62231306ac6209c0674d5d0954e7dba42c -size 21996 +oid sha256:0489951df24323e1c0bd5a1c6b3cfcf28dc283c951198f4a5a841bd639c25cce +size 21995 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png index 3572d5c3b3..1edb8cb62c 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e88c5a8963588aacc177324f385c91d38a042fb6d5c71ebcff185936b9be9bd6 +oid sha256:67d5b6ba62eeaec71106f1fbfc14b59f4c9723833e640452e72fc9e778c2edb8 size 24025 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png index cf97096475..6f03142313 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a53b44050672b5bc722a3ba897e1611b271d61fe8c5986ddf447af86af8f4fa -size 107029 +oid sha256:4b54e9f8dc2c27eb149eac5d9196d6b9ae563e7abcedc110186864026405508b +size 107027 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png index 60519d6d20..f0348ee368 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87795ec9b8e6856457db7206bf6fa88b4662540a93478e1384a5ed9dd5837ece -size 90193 +oid sha256:9a391304e758ab0cff6daad85ad1daa47cd6ccc0c35fe17e6200bc896ceb3d01 +size 90192 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png index 631a11f55a..5ed4d5a73b 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd90a3a991cf25eff7f6cbb888deaaac9f246086feb7e8e3e2275d73f04eadfd -size 76180 +oid sha256:a8f4c2eccfb82d52d1f09ac6d4af7a8968c21c79a21096c92828ce8678ef5f6f +size 76181 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png index 902bfd00e6..47f4f73d96 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23ee17bc6882bdc8c154632207b1553d274758d955d35540861804b951d938bb -size 106455 +oid sha256:e1454b85549aa8618cc001515b30a712e1afd37c0783a204b3666bdcfde29f69 +size 106456 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png index 43dbdecdf6..5521860fab 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dfd6b2decc446b475a1eff2a93d937e546b520861ccbc65d3f0859cec4938fb +oid sha256:46cb19680cbd6081e728cc799c2bd5a7db6b256e1b90eb0aec576522f30c6ad8 size 90142 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png index 6961ba62d4..80e34ec955 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20a42aa2b08a30fe739e1b8e430025256c3c175cebd10703cda2738524e4883f +oid sha256:209cd3420c768d7189b4cbaeb2d7435ad0c3bd9a2c9ff8df2b929cb338dfb069 size 75797 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png index 67ad927c5b..e991011e85 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7734014cfad92514f7a47bf58ffc4592d3a2b6e42e22376480de52230a7f017 -size 91176 +oid sha256:d74386b723aee822d2386c4c6b102952a13970509f827ce01a09f76d5fc0d598 +size 91175 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png index b5d34a9324..98ed34ef97 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f20f760fd2d925ddc88fcc7bb567bb0157747a66f6eb9fda35e424916ce44223 -size 56241 +oid sha256:e7b962e21b83262b9f071da707dcf99883239a00aef690cb3a9728b12a75016e +size 56228 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png index b5d34a9324..98ed34ef97 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f20f760fd2d925ddc88fcc7bb567bb0157747a66f6eb9fda35e424916ce44223 -size 56241 +oid sha256:e7b962e21b83262b9f071da707dcf99883239a00aef690cb3a9728b12a75016e +size 56228 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png index 7845a39027..30fc2ac132 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88512c74a009c571a521727c2e8fc772f2b3a2dd9de3c15d7e41f42b3acb0cee -size 65473 +oid sha256:ed2d7cd62d9e6e32477756124df7155a5e6e682ba06639604478c48fcea4988d +size 65469 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png index 7845a39027..30fc2ac132 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88512c74a009c571a521727c2e8fc772f2b3a2dd9de3c15d7e41f42b3acb0cee -size 65473 +oid sha256:ed2d7cd62d9e6e32477756124df7155a5e6e682ba06639604478c48fcea4988d +size 65469 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png index 57ef576086..eaf6c692ac 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4611cd4efc8ce354eaec8cc76d1495e1884536b6f952f2ec589a419828eabe6a -size 66793 +oid sha256:42c4a75028c228db7e08ab9942cfcb83da26e9b8c144a9cf0b04ed6ba24bf914 +size 66783 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png index c9fd364467..b1c5f838ac 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ec4fac2f476aa8cddbf89404e3303a9f7296db48c13e0fad8f6ad1ff37e63f4 -size 66886 +oid sha256:7ae653825869011af8da4691ad7e29d5848f153a248c9d146d33d32f4e2feab2 +size 66882 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png index 9b42fce88f..5f22268c36 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2ee97122303e5b239be255f0fd42f4459cec2a0ae320a95f159e7920d5f667d -size 74328 +oid sha256:05fbdaf72bfde3fd9958cc8b72011244ddb27730d09aa1d805d077457241614d +size 75933 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png index 4225878d21..3652c14730 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:feaf4c4cdfca77795e6c3327a599be889ec4181a54362f1823e8deb092d779ed -size 80720 +oid sha256:0114db17ce137b48996c161f6afe7429539e01156f206c7be15661986ac49ade +size 82343 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png index f15b515e40..b479147c6c 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0492a19d58e8a94dad2e81dd885af338f6b81c294274c9aba8a20068ac055163 -size 53588 +oid sha256:fe46572fc2535a8950daf79dcecf5749efe2e6dd19e4a7d3ac419cb05470e082 +size 54797 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png index 10fd216eb1..087941d9c9 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e583c6f0580684c3d60fe19b6efb21cbbc4762f847826ca4aac6bd068316463 -size 822034 +oid sha256:1b3a87ad7dd6d416b7b2e368016ddb9494781e381adfe2597d0edbf7789f9599 +size 823436 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png index ddbe066dcb..5c30ccc3e4 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ee346ef13561007c67d21728dfc02c92a98942be80a004fc0097d2324af11ca -size 848621 +oid sha256:c9274a1fd72ec7562b807d1820e42a0024c11bbe50ff938d68ca0f31596fc976 +size 849857 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png index 5abc2f6ace..8108d2f3b9 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e94f70c08f67483bc32ed570e927e306fa1c757721d13d2e7866dfa7e2818f5 -size 840109 +oid sha256:9d765922d6d4b7dc83027a28b0d887cdd745038521507dee7daa9060fa55e949 +size 841322 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png index 881748af13..90ba410bf0 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21c27d27975c1012e09fc66218406fd6f83c8dc8909fc40df0c296b6dee600d3 -size 834643 +oid sha256:6df29c4584f2a504ccacb5fb41ffd500457ad6ec02d6138a398556d8e66dbba3 +size 835965 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png index 628ee438d8..0eb4ec5a23 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fff31e00d36c7727c6fcfbfcbe21d60f5c0cc94e2e0ca85234d1a69f6244ff97 -size 843776 +oid sha256:518f897c8a30a9533abb9c193cd35bd397c6c626389b2aaf8cc78362df28fe40 +size 845122 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png index 27728202a6..5c78442ebc 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f81df66dbe5ac0a178a0d7c619cbe8a2c86d76d1e19ea858067eeb59db94724e -size 164467 +oid sha256:8672f349e163b774a2e391e31d70a2abc751f18c70071361120b2282dca47092 +size 164466 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png index 69c3af4990..722d331f3c 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:babb545e93278d12e0d0899a46b4e9e8b42d285f3c9f9a67417b27eb5468f3af -size 161527 +oid sha256:786bea8d1726b113e8595e28c77bdad43a93f40b92962a69c343d888d748b2d2 +size 161520 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png index 47203bee06..480a053cb8 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d47e4600963d355dbdf42d6b0c052668a1c42316e7c4a08f486f0c264f7c5bb -size 34101 +oid sha256:f4de412d2b8c924ea7a40c368b751ce6ca077f16fff991fd31a3c4d406473f6c +size 33782 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png index 2ede6e355d..65a5a4ae0f 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddfe48afcb1a73a4f5a3ae4b0f79b601bae168b67de0940291ff5a8e61bcd070 -size 33722 +oid sha256:57f350e42f335e129b1df05d322628e44994ee03215879d7381809b3651f9334 +size 33254 diff --git a/plugins/Morpheus/tests/UI/Morpheus_spec.js b/plugins/Morpheus/tests/UI/Morpheus_spec.js index a6685d85ce..44f5de9302 100644 --- a/plugins/Morpheus/tests/UI/Morpheus_spec.js +++ b/plugins/Morpheus/tests/UI/Morpheus_spec.js @@ -18,13 +18,13 @@ describe("Morpheus", function () { it("should show all UI components and CSS classes", async function() { await page.goto(url); - await page.waitFor('.progressbar img'); + await page.waitForSelector('.progressbar img'); await page.evaluate(() => { $('img[src~=loading],.progressbar img').each(function () { $(this).hide(); }); }); - await page.waitFor(500); // wait for rendering + await page.waitForTimeout(500); // wait for rendering expect(await page.screenshot({ fullPage: true })).to.matchImage('load'); }); }); diff --git a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png index 9658f9a389..e9f27f7dff 100644 --- a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png +++ b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5aac1670a60d3d05918ac70af0f6f2fd519225a75b0c0f5ecdd4651532c77b59 -size 1669625 +oid sha256:194ae49ce59d719738177a06b90df92805753936160f23e5e12a32904ff20c47 +size 1670689 diff --git a/plugins/MultiSites/tests/UI/MultiSites_spec.js b/plugins/MultiSites/tests/UI/MultiSites_spec.js index d043ec0fda..5c6856cf28 100644 --- a/plugins/MultiSites/tests/UI/MultiSites_spec.js +++ b/plugins/MultiSites/tests/UI/MultiSites_spec.js @@ -44,7 +44,7 @@ describe("MultiSitesTest", function () { it('should load the all websites dashboard correctly', async function() { await page.goto("?" + generalParams + "&module=MultiSites&action=index"); - await page.waitFor(500); + await page.waitForTimeout(500); await page.waitForNetworkIdle(); expect(await page.screenshotSelector(selector)).to.matchImage('all_websites'); diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png index b75b6f2b4b..8344dbbe7c 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:827c39b6477d331340650288de48c389fa345115cf5cb52a1b1ae97cc2d83f43 -size 281242 +oid sha256:438e52f1fa6410fc55c8c3c9569ad075068bf3cac9798d96395705b8dec106db +size 283053 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png index 089787d20b..8434198e43 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f866b750ce195cbf1f250213de7d128e562d7bab2ec10a58c9365ce79595ee9b -size 56046 +oid sha256:154a12a32098b5a46b45f3c41f6a006e92edc80a159e4cd893e04ce0e1316ef8 +size 56207 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png index 8522855680..0f53d2cf80 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a477ea5a3e53e3a1e82181385159e312b79d97792f084868c62c9ef14225d41d -size 72809 +oid sha256:527984361b44bbf7d7903e1b8c37994df2fe08f2d32fe82bc56d1adbc121faff +size 73075 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png index a204ad66f1..c735b5fe75 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b46bed462c5fca2eda732e8e680eafd6edf147c38df617f2ce0b5222b7371216 -size 244905 +oid sha256:ca5cdfdbcc53b91c26c0d2a5fadd06857dedbd0b4dc608b865c5aa62a7b0d2ff +size 245998 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png index 1e521d9989..ad8f299b87 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0f8a6ba0033f2a3844dec327de82b547481f4b97b5bdd50b7d3955c9157b1fb -size 56046 +oid sha256:76e8dce8a637a01ee34e473ae69df607a2b5d88b549df997f5768ac934cc2093 +size 56231 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 diff --git a/plugins/PagePerformance/tests/UI/PagePerformance_spec.js b/plugins/PagePerformance/tests/UI/PagePerformance_spec.js index e7c7281832..43e9c3b235 100644 --- a/plugins/PagePerformance/tests/UI/PagePerformance_spec.js +++ b/plugins/PagePerformance/tests/UI/PagePerformance_spec.js @@ -34,7 +34,7 @@ describe("PagePerformance", function () { // hover first row const row = await page.waitForSelector('.dataTable tbody tr:first-child'); await row.hover(); - await page.waitFor(50); + await page.waitForTimeout(50); pageWrap = await page.$('.pageWrap'); expect(await pageWrap.screenshot()).to.matchImage('rowactions'); @@ -45,7 +45,7 @@ describe("PagePerformance", function () { await subtablerow.click(); await page.waitForNetworkIdle(); - await page.waitFor(200); + await page.waitForTimeout(200); // hover first row const row = await page.jQuery('tr.subDataTable:eq(1) + tr'); @@ -68,10 +68,10 @@ describe("PagePerformance", function () { const pageWrap = await page.waitForSelector('.ui-dialog'); await page.hover('.piwik-graph'); - await page.waitFor('.ui-tooltip', { visible: true }); + await page.waitForSelector('.ui-tooltip', { visible: true }); await ensureTooltipIsVisibleInScreenshot(); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await pageWrap.screenshot()).to.matchImage('pageurl_overlay'); }); @@ -82,7 +82,7 @@ describe("PagePerformance", function () { // hover visualization selection const icon = await page.jQuery('.activateVisualizationSelection'); await icon.click(); - await page.waitFor(500); // animation + await page.waitForTimeout(500); // animation expect(await page.screenshot({ fullPage: true })).to.matchImage('visualizations'); }); @@ -114,10 +114,10 @@ describe("PagePerformance", function () { pageWrap = await page.waitForSelector('.ui-dialog'); await page.hover('.piwik-graph'); - await page.waitFor('.ui-tooltip', { visible: true }); + await page.waitForSelector('.ui-tooltip', { visible: true }); await ensureTooltipIsVisibleInScreenshot(); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await pageWrap.screenshot()).to.matchImage('pagetitle_overlay'); }); diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png index 5631df0372..1b69a16338 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8ec7c876d639f0aad0f998eeced67a51198480895420f3fd8db2926f72d0a91 -size 121513 +oid sha256:682ee95a66dd23c16fcbc544537f937ed41d03b893cdd3f8767979784247f4e6 +size 129795 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png index 5472f84482..8dd5033705 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6ee3af8a32edc0ec828185a27c84bfb80872f514045c85a951b7e5e1267c868 -size 152079 +oid sha256:56c7894ea208305c18353344c9bde90366f386776e31dd80dda79b2e839fc1d2 +size 152088 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png index d62afb8d11..0a48c89ca8 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92ac5d7b67c03192a128cc55bcf76c48444855d07167802c930a0f393839f09e -size 151246 +oid sha256:bdf30fc712e58504d1ba01c750eb6da19741d443ab15de8664c379e49638fa1d +size 151258 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png index fa02298f77..e495622299 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f758598ab3331d661a9c391973993736ea0b929db8a8a72cefd80950c1cad8d5 -size 27851 +oid sha256:03f2d2581e12fe18b472bf19b0191ed72f99195c3993fb67e9f46279b2318705 +size 30487 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png index 2f45eb4d7a..8a268eb7f4 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d3e4999cee03fe42d264f6f43ef34e637ef88fbc1c5ce366a41fc1a90ee882d -size 32410 +oid sha256:63bf3433197a59c23f5706ef5b8479cd3f46b88e0a461f191f44577663108ebf +size 33491 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png index 4c941c1929..fde3a1623f 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9058a4edc52e3e5a8a598758e0f945d460747a5a6322036eb60eb0e216d326a9 -size 35306 +oid sha256:f774c17d50b119452eb7b663a4b37d4f634bef0ddd18ee65a805a633940cbffc +size 36640 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png index e5fc974b92..5beccecb15 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:279e3191c246816d9d8e4311f7609175cbc938716b351f1215bf8cbb58f26919 -size 40110 +oid sha256:58f88d69240f785fd22548ce805f31f03c80c326d2df5fbe7d48a0d41e1699cd +size 40328 diff --git a/plugins/PrivacyManager/tests/UI/PrivacyManager_spec.js b/plugins/PrivacyManager/tests/UI/PrivacyManager_spec.js index 7573d9902b..6e4410867a 100644 --- a/plugins/PrivacyManager/tests/UI/PrivacyManager_spec.js +++ b/plugins/PrivacyManager/tests/UI/PrivacyManager_spec.js @@ -23,7 +23,7 @@ describe("PrivacyManager", function () { async function setAnonymizeStartEndDate() { // make sure tests do not fail every day - await page.waitFor('input.anonymizeStartDate'); + await page.waitForSelector('input.anonymizeStartDate'); await page.evaluate(function () { $('input.anonymizeStartDate').val('2018-03-02').change(); $('input.anonymizeEndDate').val('2018-03-02').change(); @@ -44,7 +44,7 @@ describe("PrivacyManager", function () { { var elem = await page.jQuery('.modal.open .modal-footer a:contains('+button+')'); await elem.click(); - await page.waitFor(500); + await page.waitForTimeout(500); await page.waitForNetworkIdle(); } @@ -52,19 +52,19 @@ describe("PrivacyManager", function () { { await page.click('.findDataSubjects .btn'); await page.waitForNetworkIdle(); - await page.waitFor(250); + await page.waitForTimeout(250); } async function anonymizePastData() { await page.click('.anonymizePastData .btn'); - await page.waitFor(1000); // wait for animation + await page.waitForTimeout(1000); // wait for animation } async function deleteDataSubjects() { await page.evaluate(() => $('.deleteDataSubjects input').click()); - await page.waitFor(500); // wait for animation + await page.waitForTimeout(500); // wait for animation } async function enterSegmentMatchValue(value) { @@ -84,7 +84,7 @@ describe("PrivacyManager", function () { await page.waitForFunction('$("'+selector+'").length > 0'); var elem = await page.jQuery(selector); await elem.click(); - await page.waitFor(100); + await page.waitForTimeout(100); } async function selectActionColumn(title) @@ -182,7 +182,7 @@ describe("PrivacyManager", function () { await loadActionPage('privacySettings'); await page.click('[name="anonymizeLocation"] label'); await page.click('[name="anonymizeTheUserId"] label'); - await page.waitFor(500); + await page.waitForTimeout(500); await selectActionColumn('time_spent_ref_action'); await selectActionColumn('idaction_content_name'); @@ -192,7 +192,7 @@ describe("PrivacyManager", function () { it('should confirm anonymize location and action column', async function() { await anonymizePastData(); await selectModalButton('Yes'); - await page.waitFor(1000); + await page.waitForTimeout(1000); await setAnonymizeStartEndDate(); await captureAnonymizeLogData('anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed'); @@ -200,7 +200,7 @@ describe("PrivacyManager", function () { it('should anonymize only one site and different date pre filled', async function() { await page.click('.form-group #anonymizeSite .title'); - await page.waitFor(1000); + await page.waitForTimeout(1000); await page.click(".form-group #anonymizeSite [title='Site 1']"); await page.click('[name="anonymizeIp"] label'); await page.evaluate(function () { @@ -214,7 +214,7 @@ describe("PrivacyManager", function () { it('should anonymize only one site and different date confirmed', async function() { await anonymizePastData(); await selectModalButton('Yes'); - await page.waitFor(1000); + await page.waitForTimeout(1000); await setAnonymizeStartEndDate(); await captureAnonymizeLogData('anonymizelogdata_one_site_and_custom_date_confirmed'); @@ -229,7 +229,7 @@ describe("PrivacyManager", function () { it('should show no visitor found message', async function() { await enterSegmentMatchValue('userfoobar'); await findDataSubjects(); - await page.waitFor('.manageGdpr tr'); + await page.waitForSelector('.manageGdpr tr'); await page.mouse.move(-10, -10); await capturePage('gdpr_tools_no_visits_found'); @@ -267,19 +267,19 @@ describe("PrivacyManager", function () { it('should ask for confirmation before deleting any visit', async function() { await deleteDataSubjects(); - const modal = await page.waitFor('.modal.open', { visible: true }); + const modal = await page.waitForSelector('.modal.open', { visible: true }); expect(await modal.screenshot()).to.matchImage('gdpr_tools_delete_visit_unconfirmed'); }); it('should be able to cancel deletion and not delete any data', async function() { await selectModalButton('No'); - await page.waitFor(500); + await page.waitForTimeout(500); await capturePage('gdpr_tools_delete_visit_cancelled'); }); it('should verify really no data deleted', async function() { await loadActionPage('gdprTools'); - await page.waitFor(1000); + await page.waitForTimeout(1000); await enterSegmentMatchValue('userId203'); await findDataSubjects(); await page.click('.entityTable tbody tr:nth-child(2) .checkInclude label'); diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png index 2a733502b0..1e61e9cf40 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:955a5c35636f3f70431b59938387cfa968540e88dceda3cc89e39cf8b4eb8c6c -size 215966 +oid sha256:638e813c43505b2d715de1e299770b964990fd0c3c18c3788e4ece77aa8bce47 +size 215963 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png index 527e87d3e6..2eb399ddc4 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b426466ee070d0fd02306617343ab61ea98ab6a778cea28432e7f5f80290f1a -size 219332 +oid sha256:06495f98a6b727d1da6bbc84921e6559b9cfcb8290a906d42e46cc9cd57dfcdb +size 220870 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png index 2a733502b0..1e61e9cf40 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:955a5c35636f3f70431b59938387cfa968540e88dceda3cc89e39cf8b4eb8c6c -size 215966 +oid sha256:638e813c43505b2d715de1e299770b964990fd0c3c18c3788e4ece77aa8bce47 +size 215963 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png index 3ba2b8b5b6..cb450b77f4 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d96c01eabcee611b916292525c7656a426c4d6f166cd555d7961ee6345f42dbf -size 231979 +oid sha256:193b062a5a058a6955ce2ef7d66580aa898aee2de16b8484b02cdd68647d0572 +size 233321 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png index 83c16ff82a..222188c6db 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e578921ac9da901a299077ef55c9a99201ecc96223912d18efda4ca861b23b9f -size 228619 +oid sha256:c6da3e4e4b69ca9e75de221171d5993ec26b5eb5debade3fb0b1e9975ca02621 +size 229863 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png index a882c9a832..5187405a6d 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce0b972bae27b789467196a74d1311987e97de3a53d45f4bcd02da3865dcb4fc -size 240513 +oid sha256:87084a49a3174ba506c19cebb0fc3a6ce91ce26836e79c9db1c88e9d3edcb56b +size 241565 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png index 30f41c3473..77336c5088 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcbe5429259d3fdd0b26e3bdc78e826600d79bcd0f4e07babf201cb231126688 -size 231567 +oid sha256:631206c6bba4d1c65179c171de3f34aed6efab4d05f9f7008385576adbc1eaa0 +size 232923 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png index 8a01ce40eb..d04e6e7362 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b05186a554001b0ac13caf51778acb72565b2955478f20e2486481d47ed2ca0a -size 62774 +oid sha256:0dc061653083632c413a46a669eaf8d5a30b743f60a6ed3ff6b2cd334e06df85 +size 62462 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png index 6e8392eecb..1bccf2b8ba 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8931e34b2f9c591e7b293a0fd1c3078bdbd3d081d1cb6e119b024a71fc96ddf -size 581083 +oid sha256:29f7a8a10f4ae63d3cddf9c80644378e7625d1d17b30986503444c6a2111db89 +size 567547 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png index 6216e88f41..f5d266a55a 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:323b04402124efac3c47a76fb178d05a2989ffdf3fceb7d780096160720feb84 -size 574962 +oid sha256:c96c2d345f869408f4e5e346577b7d9245cbe961c651810cee2811606b92103e +size 561835 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png index 788f1fce8d..f8b86a7ce9 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86f7d76734614cd895bed0e973bb469a50d936c704260f94b328e5055a061d43 -size 129652 +oid sha256:f91d4fea1087cfcf6ab7683fe71831cbd869db1aff9fdc16e9655e29a2da2c71 +size 129007 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png index a5c0c71d0f..911bd61f01 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42452acb7ad8a17c73f51eb3b7d49bbd33f1366d546faab54ee2373f25a870db -size 581465 +oid sha256:6b3f74a93a0d0ce9a458f08b79106edec939a20403a9730ced8a8f2c7677e2fe +size 567895 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png index bd47680816..8898412f55 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:148476ea54401b0a3ba9a6e2eb3a8c27d912f029fd44dc33813fc35dce151e55 -size 68531 +oid sha256:2d5c09c53ebcd95563f4675f34f6b723004f41ba9fbc642f79b90f94f212edf8 +size 68186 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png index 6e8392eecb..1bccf2b8ba 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8931e34b2f9c591e7b293a0fd1c3078bdbd3d081d1cb6e119b024a71fc96ddf -size 581083 +oid sha256:29f7a8a10f4ae63d3cddf9c80644378e7625d1d17b30986503444c6a2111db89 +size 567547 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png index dcda22afde..218292e2fd 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03fb293c3e477a3e51c966aa5d9a401e95c124b531b1398bc5336a75a0a06467 -size 575315 +oid sha256:81fde2b193c87cbd81b092e8d8509ad12aa7cef5efe6c131c6d6ed48f9e3c730 +size 562200 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png index c04fc1e707..24026075be 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e2a05a2210124164554166a5a381cb1cb4cea7889c2e6efae56c24602302f0f -size 545190 +oid sha256:39b338e165b7fe1ef7333d1ad3a2be3285fb5a899e1d29eb4dc5fbd4b4daa700 +size 545154 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png index 89a9410ba8..656a98e691 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20306dce97d09ad756083c0cf55d53b02ea44023f68c7a3fad8dddc151c9b499 -size 154394 +oid sha256:32f3b9b6be11da85e702b0c40d3dcab5a0b41b5e627bd6b62b4773365e752807 +size 154252 diff --git a/plugins/Provider b/plugins/Provider -Subproject b04a23f50c6e050904ad83e927a49dfe10b8134 +Subproject 5c00f923fb43e90243959e90b2af03c2b4b540c diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject 277f5d0419cff1d560d0274f8545b1088e61f52 +Subproject 5111c442695fd3e1639e9b8fe77053efc92d6a1 diff --git a/plugins/Referrers/tests/UI/CampaignBuilder_spec.js b/plugins/Referrers/tests/UI/CampaignBuilder_spec.js index c85c5b13db..2220ec39ba 100644 --- a/plugins/Referrers/tests/UI/CampaignBuilder_spec.js +++ b/plugins/Referrers/tests/UI/CampaignBuilder_spec.js @@ -27,7 +27,7 @@ describe("CampaignBuilder", function () { async function ensureHighlightEffectIsGone() { - await page.waitFor(2000); + await page.waitForTimeout(2000); } async function generateUrl() @@ -52,7 +52,7 @@ describe("CampaignBuilder", function () { it('can reset form', async function () { await captureUrlBuilder('generate_url_reset', async function () { await page.click('.resetCampaignUrl'); - await page.waitFor(500); // wait to re-render + await page.waitForTimeout(500); // wait to re-render }); }); diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png index cbdd8947ea..62c59dcf04 100644 --- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png +++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e09225db1cc83e68bff85c6e83b2d9883964b61968fb0e1952dde2079959cad -size 80504 +oid sha256:b0664444e8bde22e8277a0b6af1ee94074153501e64bd646c61cbd031fd84e29 +size 81375 diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png index 31e48709c6..38b18b46aa 100644 --- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png +++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ead716ad603eff5de3c0dc930b281da67aa4192228e612041207ad81d1d982c -size 55083 +oid sha256:dd27a0ea1baaac6119da8ddb37a49eee8383f2c4228d427adf810fafa8f55adf +size 55076 diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png index 3080f480e5..3c97c6c65e 100644 --- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png +++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6be9f15de845583fb98557f58de61a0528d68255e12d0098c4e1aa7d23a6af40 -size 81871 +oid sha256:aacf7ee6d657454d0793cde5ae3a3bd9e300eb876f20167be25f7b699b3556fe +size 82686 diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png index 7f9915afa7..46b075250d 100644 --- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png +++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b7e052ce139948ae037eebe9df462b54b5591f6e47913556f5dc195e6f639cf -size 70788 +oid sha256:2a594900bd42d3f57192001b48eb4614a41c11dccc3f1c85bcb212456cd6b9e1 +size 70782 diff --git a/plugins/SEO/tests/UI/expected-ui-screenshots/SeoWidgetTest_widget.png b/plugins/SEO/tests/UI/expected-ui-screenshots/SeoWidgetTest_widget.png Binary files differindex d7aa33a571..fea3695823 100644 --- a/plugins/SEO/tests/UI/expected-ui-screenshots/SeoWidgetTest_widget.png +++ b/plugins/SEO/tests/UI/expected-ui-screenshots/SeoWidgetTest_widget.png diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png index d7b67c1df2..ef779fd0c1 100644 --- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png +++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72b8f441235e5f423c93f306c97e688f40209d143a9dd36d5f62dd38cf989045 -size 26135 +oid sha256:c99a7ec540b2a08e67881758cabd40bfb2bdf948b6d1f5c436449067e5a79e37 +size 26144 diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png index eb059ba213..8739373cc8 100644 --- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png +++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:851d5640bd655170b1bbaa1b968a45e68a61f9948ba15104f77c97c8b6f03df9 -size 20465 +oid sha256:1b556d90cbfa3100684f22783b7019f43fb46b26e9de3d9a015e7fb5c254d47e +size 20475 diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png index f4a0a6b357..f52e2e631e 100644 --- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png +++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aab0e3b7032be2d225a45ca1348a088a8ca05d03f64da01189be15cd9403081f -size 25354 +oid sha256:c13291e89a14c66d46471ecc10c93ad42e25e03eb2b75e1c93bb210ceb0bfdd4 +size 25364 diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png index e6ca75d1b3..0e7f393b88 100644 --- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png +++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e72e498d08109eab2b1bf112faca40fb2122bd5834d36104e74318821061717 -size 23606 +oid sha256:b1d66bfda29c89cbf0f06cf94287c0aa7857b74d4199a62619efcfa767f08532 +size 23613 diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject 9164ac73a2cb9c7ef03dc71eb064c455044c462 +Subproject f2d4db3c4b99337c6714721a6dd5b0e80593abb diff --git a/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js b/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js index 2847220768..35179aa6eb 100644 --- a/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js +++ b/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js @@ -53,7 +53,7 @@ describe("SegmentSelectorEditorTest", function () { it("should start editing segment name when segment name edit link clicked", async function() { await page.click('.segmentEditorPanel .editSegmentName'); - await page.waitFor(250); // animation + await page.waitForTimeout(250); // animation expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('3_segment_editor_edit_name'); }); @@ -81,7 +81,7 @@ describe("SegmentSelectorEditorTest", function () { await page.click('.segmentationContainer .title'); await page.click('.add_new_segment'); await page.waitForNetworkIdle(); - await page.waitFor('.segmentRow0'); + await page.waitForSelector('.segmentRow0'); expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('8_segment_editor_create'); }); @@ -94,13 +94,13 @@ describe("SegmentSelectorEditorTest", function () { it("should show suggested segment values when a segment value input is focused", async function() { await page.click('.segmentEditorPanel .segmentRow0 .ui-autocomplete-input'); await page.waitForNetworkIdle(); - await page.waitFor(500); + await page.waitForTimeout(500); expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('suggested_values'); }); it("should add an OR condition when clicking on add OR", async function() { await page.click('.segmentEditorPanel .segment-add-or'); - await page.waitFor(() => !! $('.segmentRow0 .segment-rows>div:eq(1)').length); + await page.waitForFunction(() => !! $('.segmentRow0 .segment-rows>div:eq(1)').length); await page.waitForNetworkIdle(); expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('add_new_or_condition'); }); @@ -113,7 +113,7 @@ describe("SegmentSelectorEditorTest", function () { it("should add an AND condition when clicking on add AND", async function() { await page.click('.segmentEditorPanel .segment-add-row'); - await page.waitFor('.segmentRow1'); + await page.waitForSelector('.segmentRow1'); await page.waitForNetworkIdle(); expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('add_new_and_condition'); }); @@ -138,7 +138,7 @@ describe("SegmentSelectorEditorTest", function () { $('button.saveAndApply').click(); }); await page.waitForNetworkIdle(); - await page.waitFor('.segmentationContainer'); + await page.waitForSelector('.segmentationContainer'); await page.click('.segmentationContainer'); expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('saved'); @@ -177,8 +177,8 @@ describe("SegmentSelectorEditorTest", function () { await page.evaluate(function () { $('button.saveAndApply').click(); }); - await page.waitFor('.modal.open'); - await page.waitFor(500); // animation to show confirm + await page.waitForSelector('.modal.open'); + await page.waitForTimeout(500); // animation to show confirm const modal = await page.$('.modal.open'); expect(await modal.screenshot()).to.matchImage('update_confirmation'); @@ -203,14 +203,14 @@ describe("SegmentSelectorEditorTest", function () { await page.click('.segmentList li[data-idsegment="4"] .editSegment'); await page.waitForNetworkIdle(); - await page.waitFor('.segmentListContainer .metricValueBlock'); + await page.waitForSelector('.segmentListContainer .metricValueBlock'); expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('updated_details'); }); it("should correctly show delete dialog when the delete link is clicked", async function() { await page.click('.segmentEditorPanel a.delete'); - await page.waitFor(500); // animation + await page.waitForTimeout(500); // animation const modal = await page.$('.modal.open'); expect(await modal.screenshot()).to.matchImage('deleted_dialog'); @@ -241,7 +241,7 @@ describe("SegmentSelectorEditorTest", function () { await page.click('a.add_new_segment'); await page.type('input.edit_segment_name', 'complex segment'); - await page.waitFor('.segmentRow0'); + await page.waitForSelector('.segmentRow0'); await selectDimension('.segmentRow0', 'Visitors', 'Browser'); await selectFieldValue('.segmentRow0 .segment-row:eq(0) .metricMatchBlock', 'Is not'); @@ -251,7 +251,7 @@ describe("SegmentSelectorEditorTest", function () { }); await page.click('.segment-add-or'); - await page.waitFor(() => !! $('.segmentRow0 .segment-row:eq(1)').length); + await page.waitForFunction(() => !! $('.segmentRow0 .segment-row:eq(1)').length); // configure or condition await selectDimension('.segmentRow0 .segment-row:eq(1)', 'Visitors', 'Browser'); @@ -263,7 +263,7 @@ describe("SegmentSelectorEditorTest", function () { }); await page.click('.segment-add-row'); - await page.waitFor('.segmentRow1 .segment-row'); + await page.waitForSelector('.segmentRow1 .segment-row'); // configure and condition await selectDimension('.segmentRow1', 'Visitors', 'Browser'); @@ -278,7 +278,7 @@ describe("SegmentSelectorEditorTest", function () { }); await page.waitForNetworkIdle(); - await page.waitFor('.dataTable'); + await page.waitForSelector('.dataTable'); await page.waitForNetworkIdle(); expect(await page.screenshot()).to.matchImage('complex_segment'); diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png index ee61563dca..894a5d79c4 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fb8751253fe7344839ca033ebfa81f39024ed5263a0bbc7ed33288ec1c492f9 -size 15225 +oid sha256:acca466f937dd8e0bcf565a1bba9800addf148718c58ffcc01eb60cebefa0fbc +size 15205 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png index c8f1c53f70..dc0affb84e 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6dbd23e6d202c5c64c254505c3e13662642a166d6313b1d5c59085dce92cc6b -size 38357 +oid sha256:2d86d3812dccc6082d3927a4050da8177367477589fd554c9b3dd964132ae8ab +size 37687 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png index f878b52336..01b61abcbb 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0149934cf9533489ee580d06abb994585fba0e353a842759d8d395303d4376a9 -size 38921 +oid sha256:ca0435eaa39c7f1bfd35c95a3a8b96009f48d73c4a7da84908fd81cee6969dc8 +size 38242 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png index e8f29fddaf..7743cc40ea 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82b57871d5469942fc5b1c26ba362a2bc9b026db3ca5410be36420ac8567b522 -size 33391 +oid sha256:1c9d5c9c276b84c748bc10981750fb56765b80d87826bb450454082fe2c2747f +size 32661 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png index 66955ddf55..0350cb4d5d 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f61a9b54beeeb80b5fb0d3e8fc4ddb3d6a95105832b10aab8af395b047af9248 -size 44183 +oid sha256:5a03084a18379d2da0956a298db9db1e86576cd9e1dc0249e5791e3b885eb69a +size 43522 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png index e8f29fddaf..7743cc40ea 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82b57871d5469942fc5b1c26ba362a2bc9b026db3ca5410be36420ac8567b522 -size 33391 +oid sha256:1c9d5c9c276b84c748bc10981750fb56765b80d87826bb450454082fe2c2747f +size 32661 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png index a86de17965..8e08dc97eb 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb115ee871a7312e876f14c03c038394a9c506e0fe683ebf49ebd83bd49db332 -size 47631 +oid sha256:c664031b2aad2bd73b42ed00fc9d3be17af3bc4e45e09293e74e0d50aa778fcd +size 46590 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png index 27238e1f3b..1beb529da9 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:820471641dcf978f323bfa199534671da78549943da1cf1f0eeec1581c3c5288 -size 37813 +oid sha256:b0358f3c95322545675d41de22ddab9aaa17444a74159e7a4901f2a4ebc42edf +size 36928 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png index 03204707cb..340bed10d0 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4a2066a969dd539a4c7440b0c25bd969b149fe945f0b978aec0a98d0993c10d -size 136803 +oid sha256:25045c7cb174f1ff0be141fea30547f6bf01148f14589bf7c37d39170cf64e8f +size 141812 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png index ee61563dca..894a5d79c4 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fb8751253fe7344839ca033ebfa81f39024ed5263a0bbc7ed33288ec1c492f9 -size 15225 +oid sha256:acca466f937dd8e0bcf565a1bba9800addf148718c58ffcc01eb60cebefa0fbc +size 15205 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png index 62cba20e62..b342abc4bd 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be626bf76ce341f75fd9db42af159b96cde90e2f041292a45065e4d387ef1288 -size 32691 +oid sha256:41f219682f3144bb5699363a8d2c552e6af5e5babdba1fc74d3d0c13923a5f62 +size 32106 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png index 623b05ec1d..dc81b09ad7 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16f3faacb58a2eec2f6be03818f6f609efd3cfbc73b5b05b6242a15f58444392 -size 47298 +oid sha256:c7ab6bf39d96dce3f86ae4594a258567a26bc96a3bee8b42a031949b7f180acc +size 46402 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png index 93cf758020..3e59b45457 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1542f783708a0655cfee8cf6c8b3284eccc4202199e8a65773320c601ca0cf3c -size 37455 +oid sha256:04a33532477986127bc74f79efc8137e19117c51bcc184a69c8b7e0305e5f732 +size 36663 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png index e963fbb338..6a35cf8d5e 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e7fb81540efa149807a564a0d1633527a4c50d5d60381f5977b550d372286ad -size 30024 +oid sha256:2433b1efd095d1e0d84e21474f3cfdbce3e8842b3255cb7e69f44ba4f5619ce4 +size 29354 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png index 9fb2a52f1a..8fb08a52b6 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f699f9b3c6f4c74c64555d08b280d854cf1dd46cb1f553dac5d9fb7b63f56224 -size 16925 +oid sha256:24ef536c95a1fb4d0e650001b9b7dda2b057ad725c35f774481a59890a2973fa +size 16930 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png index 12b157d9fe..a640ecb5ca 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc0718e8fcc5c9d45af51d66e6ef0297fe55634a53a6f98a800f8c43e64fa6bd -size 49295 +oid sha256:db02585d0d19dd562c894d502b1234509d8b631ddadbe9e78e3f44a41add3cf4 +size 48319 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png index 6b34a8187d..c0c5564850 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfc10b3c4e6e438fe5374d3689ae46af99caef8037e1066f30b1f95e5edc98ea -size 59474 +oid sha256:f4f2b8e0ab34ae892c2c84772d103eafed5c55f50f44e47631d9599c69f4eee8 +size 59411 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png index bfdf3774b4..90041e0adf 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1002209a0ba75c6fa20dce796274e18ba41413049f40ebf344c6c11eb5db99d -size 17272 +oid sha256:8ec01eeb3dfab42067c2cd406724ef5ed10068ca95081230cb3c64eb91edf698 +size 17267 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png index ff43b39f16..c25f0cbfa0 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61883dfef7a605f068d57e397c601420715795a8884fd7a2415dbda6969a7b69 -size 50643 +oid sha256:557b99f235608aae163ec16d0ec35aaa43d973626039d056139f503bd44e9192 +size 49518 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png index 1365b16311..e952b59637 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99493f8d72c4d239a236b0e5c7a7701de8a0b11175bc94abe4b801bb3447dc3d -size 53956 +oid sha256:c7ad6d091e6f319d6959346d0623a8a54e013167fdcb4481c8440469c7295ebc +size 53983 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png index a8a2b568f3..ea5c093b45 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:427f83e084082ff5007e3c4540108103ec20202532329e8d7dace57c4f8e361d -size 95013 +oid sha256:884a69a457a334ae65a53d5ea099fa0e37741a0667203bcde3f4d55c66b1ffc6 +size 95040 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png index 48a16d2632..84251c5915 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95e04551f119e1e9b8b820c17673d1f406dd0551fd94321230372d8dbefa1b07 -size 177262 +oid sha256:68200821dd8dcd80f2aa81f902cf72f503f80aaec7f709141f9d760af01e011e +size 177273 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png index 1ba96865f1..e1d7766a2d 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d62c70361f44a171784cc6192f24099eca39b29edd6f0f7845d38968eee4e8b6 -size 181767 +oid sha256:3820cb11cd8718ff382e1dc4ac32af4a9a16a67abf275155b0d0c8c6ab8c67a4 +size 181838 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png index 003dcfbd45..631e0fe272 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15b42566d36e4085a857ff23362139cf4a37587fa69af52c14e46e39d9a5e611 -size 181762 +oid sha256:942604689ef551482739178d6b38fa55485f58fb16cdd86af6d8c354c2b37f2e +size 181807 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png index c01e5b6003..9e2fe64b37 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:131138db6f1a134d593409bedf603d869126fd65973987ee1d7c5ea8df272254 -size 184192 +oid sha256:492910921bff6a919229c7f9c08fbae3fd100c002455f31228ca0203a97b119d +size 184266 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png index 372ea3b96c..4c33ecd3a9 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24fbc319ff68fd83356d9364df18185af5c63a0ad0f0094789410247130cf67f -size 176260 +oid sha256:8868d0b416bdf584f500325d7bcd3fb2e266d897458323ba65075d1069324e37 +size 176254 diff --git a/plugins/TagManager b/plugins/TagManager -Subproject 08b3f02cae322525c001b5dac17b898581a9739 +Subproject 0ed371dad3b8e9ff935a44a076bfea612be554a diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject 7287cd7ea0c7320a1f2345923d8794d8f5f2999 +Subproject 36aae6ae41d2ed15383f9c448183ab5953e565b diff --git a/plugins/TrackingSpamPrevention b/plugins/TrackingSpamPrevention -Subproject 3051e8eb481cf89ce6a1811f805247a6c596f4a +Subproject e9c151a0079b919187764959f215bdca8975f2a diff --git a/plugins/Transitions/tests/UI/Transitions_spec.js b/plugins/Transitions/tests/UI/Transitions_spec.js index 4d2ebb61ad..ed125f3078 100644 --- a/plugins/Transitions/tests/UI/Transitions_spec.js +++ b/plugins/Transitions/tests/UI/Transitions_spec.js @@ -19,7 +19,7 @@ describe("Transitions", function () { await page.webpage.evaluate((field) => { $(field + ' input.select-dropdown').click() }, field); - await page.waitFor(500); + await page.waitForTimeout(500); await page.webpage.evaluate((field, title) => { $(field + ' .dropdown-content li:contains("' + title + '"):first').click() }, field, title); @@ -33,7 +33,7 @@ describe("Transitions", function () { await (await page.jQuery('a.actionTransitions:visible')).click(); await page.waitForNetworkIdle(); - await page.waitFor('.ui-dialog', { visible: true }); + await page.waitForSelector('.ui-dialog', { visible: true }); expect(await page.screenshotSelector('.ui-dialog')).to.matchImage('transitions_popup_titles'); }); @@ -42,9 +42,15 @@ describe("Transitions", function () { await page.goto('about:blank'); await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Actions&subcategory=General_Pages&" + "popover=RowAction$3ATransitions$3Aurl$3Ahttp$3A$2F$2Fpiwik.net$2Fdocs$2Fmanage-websites$2F"); - await page.waitFor(500); await page.waitForNetworkIdle(); - await page.hover('.Transitions_CurveTextRight'); + await page.waitForTimeout(500); + + // for some reason the tooltip isn't shown on the screenshot (even if the whole page is taken) + // but it seems to be placed in the HTML code so, we check for it's contents + await (await page.$('.Transitions_CurveTextRight')).hover(); + await page.waitForSelector('.ui-tooltip'); + const toolTipHtml = await page.evaluate(() => $('.ui-tooltip:visible').html()); + expect(toolTipHtml).to.equal('<div class="ui-tooltip-content"><strong>4 (out of 4)</strong> to internal pages</div>'); expect(await page.screenshotSelector('.ui-dialog')).to.matchImage('transitions_popup_urls'); }); diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png index a4ed3ec4d3..73bdf1897e 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:094206c9db59ca1a7936dacf6252f491222688d92e135078b125b7e10d1fe6df -size 79642 +oid sha256:4aae9a8770b93e45cc82d0b5b34eb048edf1a638f4f8b936032aed97efcec3a4 +size 77649 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png index 488247eba2..3694b57ccd 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b4d90fd87ff7a11ecb22c53a383aa032f57803a0788518afba9ad04529ae31c -size 25927 +oid sha256:d27573ead1eb43a421c5a3ca586ca149e581cbe91ea87b36e070cc657421cf3f +size 25933 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png index 86a29c6a75..92e2784696 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34dcc72032f6ee30d7bf93cb9ed3921688113e4d4634b2ff4badf1dca8cb7e1d +oid sha256:cb37e59ffb65412f6a9c17a5969f6308477acd8a7bc520a599552214e232c763 size 181158 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png index 66841f5114..da525d534f 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a227f3053e2a31c107f2bd671bc55f0778fec680d4cc0e8fab057db3b50a13c7 -size 105193 +oid sha256:50f3434e0d0641f5231f05e3a769bf2210cd2e8d3ca070237a9172d9413fc05d +size 105201 diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject 446a680d6f0a4df8f22e5058c890fab5a519c70 +Subproject f47d4c0597e348c0d4a37a0bac1c4460107a041 diff --git a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuthUsersManager_spec.js b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuthUsersManager_spec.js index a426289eb5..30b2e8a6e6 100644 --- a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuthUsersManager_spec.js +++ b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuthUsersManager_spec.js @@ -35,22 +35,22 @@ describe("TwoFactorAuthUsersManager", function () { await page.evaluate(function () { $('.userEditForm .menuUserTwoFa a').click(); }); - await page.waitFor(250); - await page.waitFor('.twofa-reset > p', { visible: true }); + await page.waitForTimeout(250); + await page.waitForSelector('.twofa-reset > p', { visible: true }); expect(await page.screenshotSelector('#content,#notificationContainer')).to.matchImage('edit_with_2fa'); }); it('should ask for confirmation before resetting 2fa', async function () { await page.click('.userEditForm .twofa-reset .resetTwoFa .btn'); - const modal = await page.waitFor('.modal.open', { visible: true }); - await page.waitFor(1000); // animation + const modal = await page.waitForSelector('.modal.open', { visible: true }); + await page.waitForTimeout(1000); // animation expect(await modal.screenshot()).to.matchImage('edit_with_2fa_reset_confirm'); }); it('should be possible to confirm the reset', async function () { await page.type('.twofa-confirm-modal input[name=currentUserPassword]', 'superUserPass'); await page.click('.twofa-confirm-modal .modal-close:not(.modal-no)'); - await page.waitFor(500); // wait for modal to close + await page.waitForTimeout(500); // wait for modal to close expect(await page.screenshotSelector('#content,#notificationContainer')).to.matchImage('edit_with_2fa_reset_confirmed'); }); diff --git a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js index 60f57eb093..8608118bab 100644 --- a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js +++ b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js @@ -21,6 +21,8 @@ describe("TwoFactorAuth", function () { { await (await page.jQuery('.modal.open .modal-footer a:contains('+button+')')).click(); await page.waitForNetworkIdle(); + await page.waitForTimeout(100); + await page.waitForNetworkIdle(); } async function loginUser(username, doAuth) @@ -30,6 +32,9 @@ describe("TwoFactorAuth", function () { // make sure to log out previous session await page.goto(logoutUrl); + await page.waitForNetworkIdle(); + await page.waitForTimeout(100); + await page.waitForNetworkIdle(); var cookies = await page.cookies(); cookies.forEach(cookie => { @@ -40,13 +45,22 @@ describe("TwoFactorAuth", function () { doAuth = true; } var logMeUrl = '?module=Login&action=logme&login=' + username + '&password=240161a241087c28d92d8d7ff3b6186b'; + + // avoid loading dashboard after login as it takes long + logMeUrl += '&url=' + encodeURIComponent('index.php?category=General_Visitors&subcategory=Live_VisitorLog&' + generalParams); + if (doAuth) { logMeUrl += '&authCode=123456'; // we make sure in test config this code always works } - await page.waitFor(1000); await page.goto(logMeUrl); await page.waitForNetworkIdle(); - await page.waitFor(1000); + await page.waitForTimeout(100); + await page.waitForNetworkIdle(); + + await page.webpage.setViewport({ + width: 1350, + height: 768, + }); } function requireTwoFa() { @@ -68,6 +82,7 @@ describe("TwoFactorAuth", function () { beforeEach(function () { testEnvironment.testUseMockAuth = 0; testEnvironment.restoreRecoveryCodes = 1; + testEnvironment.configOverride = { Development: { disable_merged_assets: 1 }}; testEnvironment.save(); }); @@ -82,26 +97,26 @@ describe("TwoFactorAuth", function () { async function confirmPassword() { - await page.waitFor('.confirmPasswordForm'); - await page.waitFor(() => !!window.$); - await page.evaluate(function(){ - $('.confirmPasswordForm #login_form_password').val('123abcDk3_l3'); - $('.confirmPasswordForm #login_form_submit').click(); - }); + await page.waitForSelector('.confirmPasswordForm'); + await page.waitForNetworkIdle(); + await page.type('.confirmPasswordForm #login_form_password', '123abcDk3_l3'); + await page.click('.confirmPasswordForm #login_form_submit'); + await page.waitForNetworkIdle(); + await page.waitForTimeout(100); await page.waitForNetworkIdle(); - await page.waitFor(100); } it('a user with 2fa can open the widgetized view by token without needing to verify', async function () { await page.goto('?module=Widgetize&action=iframe&moduleToWidgetize=Actions&actionToWidgetize=getPageUrls&date=2018-03-04&token_auth=a4ca4238a0b923820dcc509a6f75849b&' + generalParams); - const element = await page.$('.widget'); - expect(await element.screenshot()).to.matchImage('widgetized_no_verify'); + + // check if widget element is present, if login wouldn't work the login screen would be shown instead + const widgetsCount = await page.evaluate(() => $('.widget').length); + expect(widgetsCount).to.equal(1); }); it('when logging in through logme and not providing auth code it should show auth code screen', async function () { await loginUser('with2FA', false); - await page.waitFor(1000); - const section = await page.$('.loginSection'); + const section = await page.waitForSelector('.loginSection'); expect(await section.screenshot()).to.matchImage('logme_not_verified'); }); @@ -111,7 +126,7 @@ describe("TwoFactorAuth", function () { document.querySelector('.loginTwoFaForm #login_form_submit').click(); }); await page.waitForNetworkIdle(); - const element = await page.$('.loginSection'); + const element = await page.waitForSelector('.loginSection'); expect(await element.screenshot()).to.matchImage('logme_not_verified_wrong_code'); }); @@ -120,23 +135,21 @@ describe("TwoFactorAuth", function () { testEnvironment.save(); await page.type('.loginTwoFaForm #login_form_authcode', '123456'); - await page.waitFor(() => !!window.$); - await page.evaluate(function(){ - document.querySelector('.loginTwoFaForm #login_form_submit').click(); - }); + await page.click('.loginTwoFaForm #login_form_submit'); await page.waitForNetworkIdle(); - await page.waitFor('.widget'); + await page.waitForSelector('.widget', { timeout: 60000 }); await page.waitForNetworkIdle(); - const element = await page.$('.pageWrap'); - expect(await element.screenshot()).to.matchImage('logme_verified'); + // do not take a screenshot, as it's not relevant. We only check if there is the right amount of widgets loaded + const widgetsCount = await page.evaluate(() => $('.widget').length); + expect(widgetsCount).to.equal(9); }); it('should show user settings when two-fa enabled', async function () { await loginUser('with2FA'); await page.goto(userSettings); - await page.waitFor('.userSettings2FA', { visible: true, timeout: 0 }); - await page.waitFor(750); // animation + await page.waitForSelector('.userSettings2FA', { visible: true, timeout: 0 }); + await page.waitForTimeout(1000); // animation const elem = await page.$('.userSettings2FA'); expect(await elem.screenshot()).to.matchImage('usersettings_twofa_enabled'); }); @@ -145,36 +158,39 @@ describe("TwoFactorAuth", function () { await page.click('.showRecoveryCodesLink'); await page.waitForNetworkIdle(); const element = await page.$('.loginSection'); + await page.waitForNetworkIdle(); + await page.waitForTimeout(1000); expect(await element.screenshot()).to.matchImage('show_recovery_codes_step1'); }); it('should be possible to show recovery codes step2 done', async function () { await confirmPassword(); - await page.waitForNetworkIdle(); - const element = await page.$('#content'); - expect(await element.screenshot()).to.matchImage('show_recovery_codes_step2'); + expect(await page.screenshotSelector('#content')).to.matchImage('show_recovery_codes_step2'); }); it('should show user settings when two-fa enabled', async function () { requireTwoFa(); await page.goto(userSettings); - const element = await page.$('.userSettings2FA'); - expect(await element.screenshot()).to.matchImage('usersettings_twofa_enabled_required'); + await page.waitForTimeout(1000); + expect(await page.screenshotSelector('.userSettings2FA')).to.matchImage('usersettings_twofa_enabled_required'); }); it('should be possible to disable two factor', async function () { await loginUser('with2FADisable'); await page.goto(userSettings); + await page.waitForSelector('.disable2FaLink', { timeout: 60000 }); + await page.waitForTimeout(100); + await page.waitForNetworkIdle(); await page.click('.disable2FaLink'); const modal = await page.$('.modal.open'); - await page.waitFor(250); // animation + await page.waitForTimeout(500); // animation expect(await modal.screenshot()).to.matchImage('usersettings_twofa_disable_step1'); }); it('should be possible to disable two factor step 2 confirmed', async function () { await selectModalButton('Yes'); - await page.waitFor(150); + await page.waitForTimeout(150); const element = await page.$('.loginSection'); expect(await element.screenshot()).to.matchImage('usersettings_twofa_disable_step2'); @@ -182,7 +198,7 @@ describe("TwoFactorAuth", function () { it('should be possible to disable two factor step 3 verified', async function () { await confirmPassword(); - await page.waitFor('.userSettings2FA'); + await page.waitForSelector('.userSettings2FA'); const elem = await page.$('.userSettings2FA'); expect(await elem.screenshot()).to.matchImage('usersettings_twofa_disable_step3'); }); @@ -190,9 +206,11 @@ describe("TwoFactorAuth", function () { it('should show setup screen - step 1', async function () { await loginUser('without2FA'); await page.goto(userSettings); + await page.waitForTimeout(100); + await page.waitForNetworkIdle(); await page.click('.enable2FaLink'); await confirmPassword(); - await page.waitFor(1000); + await page.waitForTimeout(1000); const element = await page.$('#content'); expect(await element.screenshot()).to.matchImage('twofa_setup_step1'); }); @@ -214,7 +232,7 @@ describe("TwoFactorAuth", function () { it('should move to third step in setup - step 3', async function () { await page.click('.setupTwoFactorAuthentication .goToStep3'); await page.waitForNetworkIdle(); - await page.waitFor(1000); + await page.waitForTimeout(1000); const element = await page.$('#content'); expect(await element.screenshot()).to.matchImage('twofa_setup_step3'); @@ -230,7 +248,7 @@ describe("TwoFactorAuth", function () { $('.setupConfirmAuthCodeForm .confirmAuthCode').click(); }); await page.waitForNetworkIdle(); - await page.waitFor('#content', { visible: true }); + await page.waitForSelector('#content', { visible: true, timeout: 60000 }); await page.waitForNetworkIdle(); const element = await page.$('#content'); expect(await element.screenshot()).to.matchImage('twofa_setup_step4'); @@ -245,15 +263,18 @@ describe("TwoFactorAuth", function () { it('should force user to setup 2fa when not set up yet but enforced step 2', async function () { await (await page.jQuery('.setupTwoFactorAuthentication .backupRecoveryCode:first')).click(); await page.click('.setupTwoFactorAuthentication .goToStep2'); + await page.waitForTimeout(100); + await page.waitForNetworkIdle(); await page.mouse.move(-10, -10); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await page.screenshotSelector('.loginSection,#content,#notificationContainer')).to.matchImage('twofa_forced_step2'); }); it('should force user to setup 2fa when not set up yet but enforced step 3', async function () { await page.click('.setupTwoFactorAuthentication .goToStep3'); + await page.waitForTimeout(100); + await page.waitForNetworkIdle(); await page.mouse.move(-10, -10); - await page.waitFor(100); expect(await page.screenshotSelector('.loginSection,#content,#notificationContainer')).to.matchImage('twofa_forced_step3'); }); @@ -268,7 +289,12 @@ describe("TwoFactorAuth", function () { $('.setupConfirmAuthCodeForm .confirmAuthCode').click(); }); await page.waitForNetworkIdle(); - expect(await page.screenshotSelector('.loginSection,#content,#notificationContainer')).to.matchImage('twofa_forced_step4'); + await page.waitForSelector('.widget'); + await page.waitForNetworkIdle(); + + // after setting up forced 2fa, the default page will be loaded (dashboard) + const widgetsCount = await page.evaluate(() => $('.widget').length); + expect(widgetsCount).to.equal(9); }); });
\ No newline at end of file diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png index a649c1f566..00b3177b19 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f5d14bf5b773d0b92f80ce2d27bdbc10b3b7013f33847d83464162fa3bac827 -size 30303 +oid sha256:dfb6da1208f08bbde331b2574b7d39e945fdee4875f700eea6bccfd088ba0798 +size 30272 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png index f99a39dbbf..ce0f28d108 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b8feec74a212f4643e059ef8e08ab5daf62d009293613c7180e746b80baee37 -size 33939 +oid sha256:cb7e81d0f1a1e4e227d81839ae30c46d8c52907ab18b1bf413f34958ee479617 +size 33937 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png index 2d1dd1e5f8..4890953f85 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11f13087ff3f980c9ce8c8c90d86a4aec695a55f3f84af4bdb835f622dc5e252 -size 58618 +oid sha256:3bba934644a119b01e4eda56b4261d0087a638dd607fb3dd57d81ca886f1352d +size 58963 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png deleted file mode 100644 index e4f5bea535..0000000000 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c5b3611278ddefdf25b172f6f908a7d1a3ee2b21e7c8e64f00515f41eb0148d -size 181837 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png index db073a39d4..7c3fe4293c 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:317088e10aab29f589041e3b7c70c03f8f95f7fd03d16f3be012318d45e3831d -size 60515 +oid sha256:5e6cd69059dc9ddab922f00acdc798346d308ee7e0c0128f29e052c4d1d39f0b +size 60377 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png index a94980cb40..6ef0195023 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a08a4516addbfa086231fec5e44f7a79a3f00e7c308a176e2475cd3efad99238 -size 92541 +oid sha256:e20d431ded80bf04f6c261d237e7599719af8eabac3821e3688ae6f17633da00 +size 92532 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png index d9b6b2d11f..2c4894f065 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d5ac43111252e3f119176bc4bc2e542fadf3134fba705b931d7d79b7e62ea6a -size 162365 +oid sha256:857005b9df442b2e755f8a969f55c167aa7f44e91e154ddd470c29d3b9723c77 +size 162355 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png deleted file mode 100644 index 1d327444bb..0000000000 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72b20c28ef808581019beb6bed33c556b64bc9c905cffd6bf9dd7975414f40d4 -size 180835 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png index 40698c6f2b..6f9b490fcf 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2ac087bfb9043b707de3d5d37ff50a09039d2b3f6c70732bda97a6afd2304e1 -size 67133 +oid sha256:b5652c92627d5e36e653847fc1978e26885b8c35ab8591d538feeed68ff67e0b +size 67109 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png index 903a041bc9..cf227b0622 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f890cdf67f6afc830a0a1705be2341d17a7130a9d83b0b16bf1a31825cbf27ed -size 114325 +oid sha256:52ec37f081e5a1b1624cf3f93551550cd87a97ae5eafc1c75b8fcefc39f2c68a +size 114302 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png index d1df1b1827..79a6b8b3a0 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d7cdec9f2212374664e5e79f63e3e687e2c645c7a1c65f48661cd40ef2bdf40 -size 47304 +oid sha256:1fc401f84f8ae04fba130470f7e0f1708f9b3ae38556478592173f538a0452b5 +size 47350 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_widgetized_no_verify.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_widgetized_no_verify.png deleted file mode 100644 index 7b907f04bf..0000000000 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_widgetized_no_verify.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:668bf4024f7d8a7fe60fdeaf5eb11b8b78937b60f16fa8fdae61a361d55f5a56 -size 5148 diff --git a/plugins/UserCountryMap/tests/UI/VisitorMap_spec.js b/plugins/UserCountryMap/tests/UI/VisitorMap_spec.js index 66818224b8..4d14093639 100644 --- a/plugins/UserCountryMap/tests/UI/VisitorMap_spec.js +++ b/plugins/UserCountryMap/tests/UI/VisitorMap_spec.js @@ -21,7 +21,7 @@ describe("VisitorMap", function () { $('.userCountryMapSelectMetrics').val('bounce_rate').trigger('change'); }); await page.mouse.move(900, 140); - await page.waitFor(100); // wait for tooltip + await page.waitForTimeout(100); // wait for tooltip expect(await page.screenshot({ fullPage: true })).to.matchImage('bounce_rate'); }); @@ -32,7 +32,7 @@ describe("VisitorMap", function () { $('.userCountryMapSelectMetrics').val('avg_time_on_site').trigger('change'); }); await page.mouse.move(900, 140); - await page.waitFor(100); // wait for tooltip + await page.waitForTimeout(100); // wait for tooltip expect(await page.screenshot({ fullPage: true })).to.matchImage('avg_time_on_site'); }); @@ -40,19 +40,19 @@ describe("VisitorMap", function () { it("should display the regions layer correctly", async function() { await page.goto(urlWithCities); await page.waitForNetworkIdle(); - await page.waitFor(1000); + await page.waitForTimeout(1000); await page.webpage.evaluate(function () { // zoom into USA var path = window.visitorMap.map.getLayer('countries').getPaths({iso: "USA"})[0].svgPath[0]; $(path).click(); }); - await page.waitFor(1000); + await page.waitForTimeout(1000); await page.webpage.evaluate(function () { // go to regions view var path = window.visitorMap.map.getLayer('countries').getPaths({iso: "USA"})[0].svgPath[0]; $(path).click(); }); - await page.waitFor(1000); + await page.waitForTimeout(1000); expect(await page.screenshot({ fullPage: true })).to.matchImage('regions'); }); @@ -60,7 +60,7 @@ describe("VisitorMap", function () { it("should display the cities layer correctly", async function() { await page.click('.UserCountryMap-btn-city'); await page.waitForNetworkIdle(); - await page.waitFor(1000); // wait for map + await page.waitForTimeout(1000); // wait for map expect(await page.screenshot({ fullPage: true })).to.matchImage('cities'); }); diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_avg_time_on_site.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_avg_time_on_site.png index 49f0a0de33..3710eb1fab 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_avg_time_on_site.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_avg_time_on_site.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4072cf29f83a44a4d61d4acda5bfb50c3b9da6f50417cdc58c225ef945b40217 -size 182956 +oid sha256:4ba690f07713973c2d65f9dabbf63e35f17e8f6172f706ae02bfec69893e306c +size 183104 diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_bounce_rate.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_bounce_rate.png index f22234873a..63249b2903 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_bounce_rate.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_bounce_rate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e51ead0e59962605f47aedc6b5153a5f4cfd9a3365899439e40c4e054d320d7d -size 182284 +oid sha256:e1eeb15860f667ff6b65a393c357f13330f6a534c9052a6fa38c77f0580efdc4 +size 182371 diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png index 82b59c80a5..8b26e43e3f 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8fa287087f6e90df90f91566013e868fb4fb8ed7e1a95d474fbae6efcc09552 -size 114508 +oid sha256:aae2ef87d12c962815d1b7ea7a8f9340fa0584b61040212e58e0d348c313464e +size 114594 diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png index 5159225887..cdc7d1401a 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1bb4c48dabc5e484d7e3d93db825f25590805c582016112178af4355fada02c -size 113953 +oid sha256:a8ec3fe17923915a91c89520995dfbf2990edac49dd4f8fd93466611e2b61556 +size 114039 diff --git a/plugins/UsersManager/tests/UI/UserSettings_spec.js b/plugins/UsersManager/tests/UI/UserSettings_spec.js index 20a1ac61c2..20480988ec 100644 --- a/plugins/UsersManager/tests/UI/UserSettings_spec.js +++ b/plugins/UsersManager/tests/UI/UserSettings_spec.js @@ -23,11 +23,11 @@ describe("UserSettings", function () { it('should show user security page', async function () { await page.goto(userSecurityUrl); - await page.waitFor('.listAuthTokens', { visible: true }); + await page.waitForSelector('.listAuthTokens', { visible: true }); await page.evaluate(() => { // give table headers constant width so the screenshot stays the same $('table.listAuthTokens th').css('width', '25%'); }); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await page.screenshotSelector('.admin')).to.matchImage('load_security'); }); @@ -76,7 +76,7 @@ describe("UserSettings", function () { $('#userSettingsTable input#email').val('testlogin123@example.com').change(); }); await page.click('#userSettingsTable [piwik-save-button] .btn'); - await page.waitFor(500); // wait for animation + await page.waitForTimeout(500); // wait for animation let pageWrap = await page.$('.modal.open'); expect(await pageWrap.screenshot()).to.matchImage('asks_confirmation'); diff --git a/plugins/UsersManager/tests/UI/UsersManager_spec.js b/plugins/UsersManager/tests/UI/UsersManager_spec.js index f4be261acb..389be58758 100644 --- a/plugins/UsersManager/tests/UI/UsersManager_spec.js +++ b/plugins/UsersManager/tests/UI/UsersManager_spec.js @@ -50,7 +50,7 @@ describe("UsersManager", function () { $('#user-text-filter').val('ight').change(); }); await page.waitForNetworkIdle(); - await page.waitFor(1000); // wait for rendering + await page.waitForTimeout(1000); // wait for rendering expect(await page.screenshotSelector('.usersManager')).to.matchImage('filters'); }); @@ -68,7 +68,7 @@ describe("UsersManager", function () { $('.siteSelector .custom_select_container a:contains(relentless)').click(); }); await page.waitForNetworkIdle(); - await page.waitFor(500); + await page.waitForTimeout(500); expect(await page.screenshotSelector('.usersManager')).to.matchImage('role_for'); }); @@ -78,7 +78,7 @@ describe("UsersManager", function () { await (await page.jQuery('td.select-cell input:eq(3) + span', { waitFor: true })).click(); await (await page.jQuery('td.select-cell input:eq(8) + span', { waitFor: true })).click(); await page.mouse.move(0, 0); - await page.waitFor(500); // for checkbox animations + await page.waitForTimeout(500); // for checkbox animations expect(await page.screenshotSelector('.usersManager')).to.matchImage('rows_selected'); }); @@ -86,7 +86,7 @@ describe("UsersManager", function () { it('should select all rows when all row select is clicked', async function () { await page.click('th.select-cell input + span'); await page.mouse.move(0, 0); - await page.waitFor(500); // for checkbox animations + await page.waitForTimeout(500); // for checkbox animations expect(await page.screenshotSelector('.usersManager')).to.matchImage('all_rows_selected'); }); @@ -94,7 +94,7 @@ describe("UsersManager", function () { it('should select all rows in search when link in table is clicked', async function () { await page.click('.toggle-select-all-in-search'); await page.mouse.move(0, 0); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await page.screenshotSelector('.usersManager')).to.matchImage('all_rows_in_search'); }); @@ -102,7 +102,7 @@ describe("UsersManager", function () { it('should deselect all rows in search except for displayed rows when link in table is clicked again', async function () { await page.click('.toggle-select-all-in-search'); await page.mouse.move(0, 0); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await page.screenshotSelector('.usersManager')).to.matchImage('all_rows_deselected'); }); @@ -118,7 +118,7 @@ describe("UsersManager", function () { await page.click('.bulk-actions.btn'); await (await page.jQuery('a[data-target=user-list-bulk-actions]')).hover(); await (await page.jQuery('#bulk-set-access a:contains(Admin)')).click(); - await page.waitFor(350); // wait for animation + await page.waitForTimeout(350); // wait for animation expect(await (await page.$('.change-user-role-confirm-modal')).screenshot()).to.matchImage('bulk_set_access_confirm'); }); @@ -145,17 +145,17 @@ describe("UsersManager", function () { it('should go back to first page when previous button is clicked', async function () { await page.click('.usersListPagination .btn.next'); await page.waitForNetworkIdle(); - await page.waitFor('.pagedUsersList:not(.loading)'); + await page.waitForSelector('.pagedUsersList:not(.loading)'); await page.click('.usersListPagination .btn.next'); await page.waitForNetworkIdle(); - await page.waitFor('.pagedUsersList:not(.loading)'); + await page.waitForSelector('.pagedUsersList:not(.loading)'); await page.click('.usersListPagination .btn.prev'); await page.waitForNetworkIdle(); await page.mouse.move(-10, -10); - await page.waitFor('.pagedUsersList:not(.loading)'); + await page.waitForSelector('.pagedUsersList:not(.loading)'); expect(await page.screenshotSelector('.usersManager')).to.matchImage('previous'); }); @@ -166,7 +166,7 @@ describe("UsersManager", function () { await page.waitForNetworkIdle(); await page.mouse.move(-10, -10); - await page.waitFor('.pagedUsersList:not(.loading)'); + await page.waitForSelector('.pagedUsersList:not(.loading)'); expect(await page.screenshotSelector('.usersManager')).to.matchImage('delete_single'); }); @@ -180,7 +180,7 @@ describe("UsersManager", function () { await page.waitForNetworkIdle(); await page.mouse.move(-10, -10); - await page.waitFor('.pagedUsersList:not(.loading)'); + await page.waitForSelector('.pagedUsersList:not(.loading)'); expect(await page.screenshotSelector('.usersManager')).to.matchImage('delete_bulk_access'); }); @@ -225,9 +225,9 @@ describe("UsersManager", function () { await page.waitForNetworkIdle(); await page.click('.userPermissionsEdit th.select-cell input + span'); - await page.waitFor(500); // for angular to re-render + await page.waitForTimeout(500); // for angular to re-render await page.evaluate(() => $('.userPermissionsEdit tr.select-all-row a').click()); - await page.waitFor(500); // for angular to re-render + await page.waitForTimeout(500); // for angular to re-render expect(await page.screenshotSelector('.usersManager')).to.matchImage({ imageName: 'permissions_all_rows_in_search', @@ -240,14 +240,14 @@ describe("UsersManager", function () { await (await page.jQuery('#user-permissions-edit-bulk-actions>li:first>a')).hover(); await (await page.jQuery('#user-permissions-edit-bulk-actions a:contains(Write)')).click(); - await page.waitFor(250); // animation - await page.waitFor('.change-access-confirm-modal', { visible: true }); + await page.waitForTimeout(250); // animation + await page.waitForSelector('.change-access-confirm-modal', { visible: true }); const yes = await page.jQuery('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible'); await yes.click(); await page.waitForNetworkIdle(); - await page.waitFor(250); // animation + await page.waitForTimeout(250); // animation expect(await page.screenshotSelector('.usersManager')).to.matchImage({ imageName: 'permissions_all_sites_access', @@ -267,12 +267,12 @@ describe("UsersManager", function () { it('should remove access to a single site when noaccess is selected', async function () { await page.evaluate(() => $('#sitesForPermission .role-select select').first().val('string:noaccess').change()); - await page.waitFor('.change-access-confirm-modal', { visible: true }); - await page.waitFor(250); // animation + await page.waitForSelector('.change-access-confirm-modal', { visible: true }); + await page.waitForTimeout(250); // animation await (await page.jQuery('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); - await page.waitFor(250); // animation + await page.waitForTimeout(250); // animation expect(await page.screenshotSelector('.usersManager')).to.matchImage({ imageName: 'permissions_remove_single', @@ -285,7 +285,7 @@ describe("UsersManager", function () { await (await page.jQuery('#sitesForPermission td.select-cell input:eq(3) + span')).click(); await (await page.jQuery('#sitesForPermission td.select-cell input:eq(8) + span')).click(); await page.mouse.move(-10, -10); - await page.waitFor(1000); // for checkbox animations + await page.waitForTimeout(1000); // for checkbox animations expect(await (await page.$('.usersManager')).screenshot()).to.matchImage({ imageName: 'permissions_select_multiple', @@ -295,17 +295,17 @@ describe("UsersManager", function () { it('should set access to selected sites when set bulk access is used', async function () { await page.click('.userPermissionsEdit .bulk-actions > .dropdown-trigger.btn'); - await page.waitFor(500); // animation - await page.evaluate(() => $('#user-permissions-edit-bulk-actions>li:first > a:visible').mouseenter()); - await page.waitFor(500); // animation + await page.waitForTimeout(500); // animation + await (await page.jQuery('#user-permissions-edit-bulk-actions>li:first > a')).hover(); + await page.waitForTimeout(500); // animation await (await page.jQuery('#user-permissions-edit-bulk-actions a:contains(Admin):visible', { waitFor: true })).click(); - await page.waitFor('.change-access-confirm-modal'); + await page.waitForSelector('.change-access-confirm-modal'); await (await page.jQuery('.change-access-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.mouse.move(-10, -10); await page.waitForNetworkIdle(); - await page.waitFor(100); + await page.waitForTimeout(500); expect(await page.screenshotSelector('.usersManager')).to.matchImage({ imageName: 'permissions_bulk_access_set', @@ -320,8 +320,8 @@ describe("UsersManager", function () { await page.waitForNetworkIdle(); await page.type('.userPermissionsEdit div.site-filter>input', 'hunter'); await page.waitForNetworkIdle(); - await page.waitFor('#sitesForPermission tr', { visible: true }); - await page.waitFor(1000); + await page.waitForSelector('#sitesForPermission tr', { visible: true }); + await page.waitForTimeout(1000); expect(await page.screenshotSelector('.usersManager')).to.matchImage({ imageName: 'permissions_filters', @@ -331,7 +331,7 @@ describe("UsersManager", function () { it('should select all displayed rows when the select all checkbox is clicked', async function () { await page.click('.userPermissionsEdit th.select-cell input + span'); - await page.waitFor(250); // for checkbox animations + await page.waitForTimeout(250); // for checkbox animations expect(await page.screenshotSelector('.usersManager')).to.matchImage({ imageName: 'permissions_select_all', @@ -341,11 +341,11 @@ describe("UsersManager", function () { it('should set access to all sites selected when set bulk access is used', async function () { await page.click('.userPermissionsEdit .bulk-actions > .dropdown-trigger.btn'); - await page.waitFor(250); // animation - await page.evaluate(() => $('#user-permissions-edit-bulk-actions>li:first > a:visible').mouseenter()); - await page.waitFor(250); // animation + await page.waitForTimeout(250); // animation + await (await page.jQuery('#user-permissions-edit-bulk-actions>li:first > a:visible')).hover(); + await page.waitForTimeout(250); // animation await (await page.jQuery('#user-permissions-edit-bulk-actions a:contains(View)', { waitFor: true })).click(); - await page.waitFor(250); // animation + await page.waitForTimeout(250); // animation await (await page.jQuery('.change-access-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); @@ -354,7 +354,7 @@ describe("UsersManager", function () { $('.access-filter select').val('string:some').change(); }); await page.waitForNetworkIdle(); - await page.waitFor(250); // animation + await page.waitForTimeout(250); // animation expect(await page.screenshotSelector('.usersManager')).to.matchImage({ imageName: 'permissions_bulk_access_set_all', @@ -367,8 +367,8 @@ describe("UsersManager", function () { $('.userPermissionsEdit .role-select:eq(0) select').val('string:admin').change(); }); - await page.waitFor('.userPermissionsEdit .change-access-confirm-modal', { visible: true }); - await page.waitFor(100); // animation + await page.waitForSelector('.userPermissionsEdit .change-access-confirm-modal', { visible: true }); + await page.waitForTimeout(100); // animation await (await page.jQuery('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); @@ -383,12 +383,12 @@ describe("UsersManager", function () { await page.evaluate(() => $('.addCapability:eq(0) .expandableListCategory:contains(Tag Manager)').click()); await page.evaluate(() => $('.addCapability:eq(0) .expandableListItem:contains(Publish Live Container)').click()); - await page.waitFor(250); // animation + await page.waitForTimeout(250); // animation await (await page.jQuery('.userPermissionsEdit .confirmCapabilityToggle .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); - await page.waitFor(250); // animation + await page.waitForTimeout(250); // animation expect(await page.screenshotSelector('.usersManager')).to.matchImage({ imageName: 'permissions_capability_single_site', @@ -406,10 +406,10 @@ describe("UsersManager", function () { await page.waitForNetworkIdle(); await page.click('input#perm_edit_select_all + span'); - await page.waitFor('.userPermissionsEdit tr.select-all-row a'); + await page.waitForSelector('.userPermissionsEdit tr.select-all-row a'); await page.click('.userPermissionsEdit tr.select-all-row a'); - await page.waitFor(250); + await page.waitForTimeout(250); await page.click('.userPermissionsEdit .bulk-actions > .dropdown-trigger.btn'); await (await page.jQuery('.userPermissionsEdit a:contains(Remove Permissions)')).click(); @@ -429,10 +429,10 @@ describe("UsersManager", function () { it('should show superuser confirm modal when the superuser toggle is clicked', async function () { await page.click('.userEditForm #superuser_access+span'); - await page.waitFor(500); + await page.waitForSelector('.superuser-confirm-modal'); + await page.waitForTimeout(500); - const elem = await page.$('.superuser-confirm-modal'); - expect(await elem.screenshot()).to.matchImage('superuser_confirm'); + expect(await page.screenshotSelector('.superuser-confirm-modal')).to.matchImage('superuser_confirm'); }); it('should fail to set superuser access if password is wrong', async function () { @@ -440,7 +440,7 @@ describe("UsersManager", function () { await (await page.jQuery('.superuser-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); - await page.waitFor('.notification-error', { visible: true }); + await page.waitForSelector('.notification-error', { visible: true }); const notificationHtml = await page.evaluate(() => $('.notification-error>div>div').html()); expect(notificationHtml).to.equal('The current password you entered is not correct.'); @@ -448,33 +448,33 @@ describe("UsersManager", function () { it('should give the user superuser access when the superuser modal is confirmed', async function () { await page.click('.userEditForm #superuser_access+span'); - await page.waitFor(500); + await page.waitForTimeout(500); await page.type('input#currentUserPasswordForSuperUser', 'superUserPass'); await (await page.jQuery('.superuser-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); - await page.waitFor(500); + await page.waitForTimeout(500); expect(await page.screenshotSelector('.usersManager')).to.matchImage('superuser_set'); }); it('should go back to the manage users page when the back link is clicked', async function () { await page.click('.userEditForm .entityCancelLink'); - await page.waitFor('piwik-paged-users-list'); + await page.waitForSelector('piwik-paged-users-list'); await page.evaluate(function () { // remove filter so new user shows $('#user-text-filter').val('').change(); }); await page.waitForNetworkIdle(); - await page.waitFor('.pagedUsersList:not(.loading)'); - await page.waitFor(1000); // rendering + await page.waitForSelector('.pagedUsersList:not(.loading)'); + await page.waitForTimeout(1000); // rendering expect(await page.screenshotSelector('.usersManager')).to.matchImage('manage_users_back'); }); it('should show the edit user form when the edit icon in a row is clicked', async function () { await (await page.jQuery('button.edituser:eq(1)', { waitFor: true })).click(); - await page.waitFor(250); + await page.waitForTimeout(250); await page.waitForNetworkIdle(); expect(await page.screenshotSelector('.usersManager')).to.matchImage('edit_user_form'); @@ -488,7 +488,7 @@ describe("UsersManager", function () { var btnSave = await page.jQuery('.userEditForm .basic-info-tab [piwik-save-button] .btn', { waitFor: true }); await btnSave.click(); - await page.waitFor(500); // animation + await page.waitForTimeout(500); // animation await page.click('.modal.open h2'); // remove focus from input for screenshot @@ -502,9 +502,9 @@ describe("UsersManager", function () { var btnNo = await page.jQuery('.change-password-modal .modal-close:not(.modal-no):visible'); await btnNo.click(); - await page.waitFor(500); // animation + await page.waitForTimeout(500); // animation await page.waitForNetworkIdle(); - await page.waitFor('#notificationContainer .notification'); + await page.waitForSelector('#notificationContainer .notification'); expect(await page.screenshotSelector('.admin#content,#notificationContainer')).to.matchImage('edit_user_basic_confirmed_wrong_password'); }); @@ -566,7 +566,7 @@ describe("UsersManager", function () { }); await page.click('.add-existing-user'); - await page.waitFor(500); // wait for animation + await page.waitForTimeout(500); // wait for animation const elem = await page.$('.add-existing-user-modal'); expect(await elem.screenshot()).to.matchImage('admin_existing_user_modal'); @@ -574,7 +574,7 @@ describe("UsersManager", function () { it('should add a user by email when an email is entered', async function () { await page.type('input[name="add-existing-user-email"]', '0_login3conchords@example.com'); - await page.waitFor('.add-existing-user-modal'); + await page.waitForSelector('.add-existing-user-modal'); await (await page.jQuery('.add-existing-user-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); @@ -585,15 +585,15 @@ describe("UsersManager", function () { await page.mouse.move(-10, -10); await page.waitForNetworkIdle(); - await page.waitFor('.pagedUsersList:not(.loading)'); - await page.waitFor(1000); // for opacity to change + await page.waitForSelector('.pagedUsersList:not(.loading)'); + await page.waitForTimeout(1000); // for opacity to change expect(await page.screenshotSelector('.usersManager')).to.matchImage('admin_add_user_by_email'); }); it('should add a user by username when a username is entered', async function () { await page.click('.add-existing-user'); - await page.waitFor('.add-existing-user-modal'); + await page.waitForSelector('.add-existing-user-modal'); await page.evaluate(() => $('input[name="add-existing-user-email"]').val('').change()); await page.type('input[name="add-existing-user-email"]', '10_login8'); await (await page.jQuery('.add-existing-user-modal .modal-close:not(.modal-no):visible')).click(); @@ -606,8 +606,8 @@ describe("UsersManager", function () { await page.mouse.move(-10, -10); await page.waitForNetworkIdle(); - await page.waitFor('.pagedUsersList:not(.loading)'); - await page.waitFor(1000); // for opacity to change + await page.waitForSelector('.pagedUsersList:not(.loading)'); + await page.waitForTimeout(1000); // for opacity to change expect(await page.screenshotSelector('.usersManager')).to.matchImage('admin_add_user_by_login'); }); @@ -616,7 +616,7 @@ describe("UsersManager", function () { await page.click('.add-existing-user'); await page.evaluate(() => $('input[name="add-existing-user-email"]').val('').change()); await page.type('input[name="add-existing-user-email"]', 'sldkjfsdlkfjsdkl'); - await page.waitFor('.add-existing-user-modal'); + await page.waitForSelector('.add-existing-user-modal'); await (await page.jQuery('.add-existing-user-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); @@ -627,8 +627,8 @@ describe("UsersManager", function () { await page.mouse.move(-10, -10); await page.waitForNetworkIdle(); - await page.waitFor('.pagedUsersList:not(.loading)'); - await page.waitFor(1000); // for opacity to change + await page.waitForSelector('.pagedUsersList:not(.loading)'); + await page.waitForTimeout(1000); // for opacity to change expect(await page.screenshotSelector('.usersManager')).to.matchImage('admin_add_user_not_exists'); }); diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png index 44fce9e99e..61222dd8d5 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aea956af521d99b9a8e186642cf7cd6cd9e2dce9878a0bfead6aa357e7c91841 -size 30043 +oid sha256:b675376564f98aecf50420c4c32492aa3214cbd3ce7f595747f2a405d527f713 +size 30053 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png index 1fda56a20d..18b59bd6aa 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81763af0c3f251daf9d70af413873b98e9b4eeae5789303a4a7739ce1c78f2f5 -size 179439 +oid sha256:6295d2685bdd1a8a862c957f157e945ecc6081973afc62f097c133c4b030030c +size 179435 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png index 5fd6e9d287..6354c95272 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba4f964c60dbfda47d0a5c1453e4ef08a405cf7650fd722e5b1f2e0f8a055a2 -size 203131 +oid sha256:d5c5ed717342771258ec450b888dd92c655e18f9156aa9994448ea3310f897fe +size 203105 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png index bab2699ebe..e2144fedbf 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f185b259e545cac59097437e44398a3c640a5e4a1042b27cf93439bac49d7e7 -size 115392 +oid sha256:916feec907a637c256e6ad2978f1ec1680f287426c449535a3a3d2c6f57dacce +size 115399 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png index 047c3d5a2b..bf56058a26 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:949eee52f63dc4ab0e99a0396210f503b5e7428b2160a1dc6d064a144ce895e4 -size 190696 +oid sha256:21ffc96319a1379e0af5f224ea5b08f677e23464c448562aedb9dfe8ad3c438b +size 190715 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_wrong_password_confirmed.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_wrong_password_confirmed.png index 4a1da2ce61..e274df8f91 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_wrong_password_confirmed.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_wrong_password_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417c8d8cd2c63a624219428649e13aaea4a7b223be67c745f60e6569348ead28 -size 6094 +oid sha256:0b4b590f49075f280bdda593d1f71c433a14c3234542132168617670e53abf7a +size 6093 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png index 99cbecb261..cd37758548 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e968b0504073a6b6478f97d734272663618c5c0ef2fd1754b4775b738f93638 -size 31328 +oid sha256:90bba80ad150f158da4e495020b32fc4090b26fd9fe46ed26fd9acb09a30c057 +size 31294 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png index 965becbc2b..d1ab8f5895 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fb5c7de1fd2277b4fa35f0ca3eb1af1e813d8306e9d2a36804df283b29e07e9 -size 29344 +oid sha256:63a25e0aef31ebdd66e6cdd47bfc552d7e0a88deb6c7a75cf9b451cf482e8683 +size 29315 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png index 980c87333d..d94ac299ec 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc7811697c4f45718f8345de63919ae44f9c8ed95512ae5e902acdf1580f9942 -size 27039 +oid sha256:4fdfb637c4b5904b5cc79222d813e366260f80afc884be070ae81241abbc5284 +size 27037 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png index 58380e19df..e10bcc9b81 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b31b17d9288dfa9d4fc5a5c4622ee38742f2436937b347663ddf346c92dea3f6 -size 81397 +oid sha256:583d72dfcebee5cb574f39db8cf179241958419247bd83ac26efcbf2a2c3c5e1 +size 81601 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png index 7302471261..344bd0c268 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:889ac541a4e8ee759b2bea39f6b8c88e57e235b2f4b75efb7524315dfc0ce8ee -size 94919 +oid sha256:22ae7ebf89befe1a0975f6a87d0cfa55257b449fd5b937c17888c507ffee091d +size 94730 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png index bdadc859f4..9fcdbf9250 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ba5db6f0196f517a005413fb3e6efbe84f6eeff584814d40729818535ff7575 -size 157354 +oid sha256:763ad9348883e7ce3835c886ffcf3123662e2556d225b9fc1b8db4cd5a458aa2 +size 171438 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png index 9d0e155ca1..f8cde47b2f 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:accebc6c193d3e7659d3179397dea40a5a94689b6f3c0e88974451d2f6a01b15 -size 157952 +oid sha256:d13c5092a3e62d278c2acec21d694e15276fd9236a95f0bad03cc9878810d9ad +size 172052 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png index e934173d12..9fcdbf9250 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fe0c8497adf50ac0f5041b965a224eb28fe9ce774639e2dc74b155278d5e1d7 -size 157337 +oid sha256:763ad9348883e7ce3835c886ffcf3123662e2556d225b9fc1b8db4cd5a458aa2 +size 171438 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png index 58f79ff962..95d6f354ab 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c96afe43af92900441eff8617160ad6da259b28b0b97440b28bf78e32865b424 -size 149146 +oid sha256:69a5c5b50b2a7b51e03a5bcf8259a3f079136d14ce0a12925125511a75fc818f +size 162842 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png index b980357459..d17af75b3a 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6522ab26bb0080ddef5099cac6646639426ff3fad469ed452fb612ed5696eb71 -size 140090 +oid sha256:1f875e690ebfbbec8fe1c971412721dd1b16bd3a02b2adc6b3936506776338cc +size 153294 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png index 6bf5a3fd57..4a9814a99a 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:608d8b591f44ac2b856677b16cad3f97055c075cbbce204b3b12b5d2c0f17ca0 -size 139692 +oid sha256:a1aa996985875ac9f719aee357dc439a1e5beeb72f7be779fd327a197af02de8 +size 147591 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png index 9ff1e45623..057b1813ac 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1cc4a0e099407bf7837e778aa4ea0a12e47d6a7160f242d288c14e534089c47 -size 140303 +oid sha256:c66e2f4b376fbcbe96241179dce176e10273c70302306c1ae44030b96fe25e1d +size 148204 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png index 72409206c3..e763718e7c 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c807a46f887c8306c060a14c2d84157eb71044fa2a9ddf8d69c7f322a4e71609 -size 31203 +oid sha256:098ac1a3d84991f550f53a186a723eac9b438943508b5c81f2071f735b60396c +size 31199 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png index 4636877934..443380e45c 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0f3905a69a2ed766e61b42f7142c4772d54221c4461eac47b44322d2873f446 -size 139313 +oid sha256:93c9ae24d02a6b27c3924cf13f049c0d62be3c7425ec719c6387c7343cb11476 +size 138309 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png index 8f96911757..763d476350 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:930484c342df272f87d903650aa0a03fd5b0bc2d5b11feba17ef5b9f94d2800e -size 147915 +oid sha256:0080d41eae4606ff43c7b99b6b91b2579aae6fe4620c4559b27e6f8ce0e9c1c3 +size 148131 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png index ef57147c2d..37abff71fd 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18825315aeace738458d28b5b28d440122b08c204cb2fc80ec1795ee40d14d9f -size 149482 +oid sha256:056b637034bd252fbe286885ed9eeeb9b7b1875f0950de1a4f734ce4d0462575 +size 158181 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png index af396393c0..fdf3fecd83 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b062acaf489b84270689d810fa1494e24b6f7e668e7b944c96fd3e63880e296d -size 147999 +oid sha256:b52e0333dce2fdb675318e62a778beafbe4806852d5ed2d5dd9192ecf4a1bc64 +size 150713 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png index ed78da8106..0e1ea76c0b 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d661134a58ff790a8f32fcf56112c4e1fc5f3a2eb33a350d9a744d38b30d41f7 -size 92268 +oid sha256:7f8e3168bfd55b755751e9cfae27b3dd60674019de38c338970b4a22cb2cde57 +size 93240 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png index 6b81dc495f..ca5768d6ef 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fdd5a023c7e38623f51b23d3e4afa7947726a702af1d4e609cc7203f15cba77 -size 100970 +oid sha256:d508ef919076c7de2aca6ef361ca5d8c508d340b1bc6d2a3e60e3ca6314bb34e +size 102083 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png index 6eee1cc461..c0c9549a79 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8abce161c3760b2e2d53a5a9470986ff1eaf8fff6986a2cc07ef50918a048de -size 110507 +oid sha256:1725a441e91038e86fc3d7931957bdceb7c240423fc710c617e5b02fd6b660f3 +size 110015 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png index 1e3050747f..19208deb3b 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21fd885472fd9c39d6e6d808007bddd1dd8626755e37067537e6ebd1805091b4 -size 79888 +oid sha256:990108c86e38681e565ccd517fb02369ad98f43a80e7892fe33a940781176596 +size 80978 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png index 50ab8fc3ed..50f12fb58a 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2e30f8d2096f1e1154a45cc951b0d37e3c5701f106ccb2cf1fc311a54b02f49 -size 92630 +oid sha256:9484fcaf803922946c6cdbddfcfce0908fed6e77619655022d2454ed595f3f4d +size 92451 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png index 7661c358cd..cbf99243ba 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4a4c48c2385274694da20d1461e9d1afafbd5ed73bd2f09a0888e62463fe229 -size 80909 +oid sha256:82b0987e271f10a015994227a82c733313da191d5abda6dea80a50c66cca44d9 +size 82163 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png index b27b9e4b9a..a8ef38d934 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4688e9d941f07ed5899325a2e039edae69e1047d6d3c93d5aad838ab153eb694 -size 66969 +oid sha256:0da4043873fd4a03586344399e4d230cbf49bcfb3a21258af02fb86c283855a2 +size 66659 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png index 7961dc6232..b655bd93ca 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40044984bae9acbe363da2fa69f91d6e846bfa80e7a449ed5e2c5bd9184e2654 -size 90932 +oid sha256:846991e7dfd320e07e82212bc46bd7bef663289c17863a81f6881aef5df58698 +size 92113 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png index 71be191b20..32b43b0cc2 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f924e2c3cd5164931a37be080b9fd3bc42d2261ac3de4b2c53372b8134f54447 -size 47831 +oid sha256:2db1d07ee054bb937ddaa3544f447920b01d1ba5dbd9d0371d31d076ec3718d2 +size 47993 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png index ca51595c12..efeb7da210 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9824e44f3e90bd90a92834d790ad059ac87e1ae26b8e2ac1069735cfed86b6a6 -size 89121 +oid sha256:5b1ac3c0fba9928c19cb39b56cc13ce064f9a8359e2fe91ee887269efd7b64e1 +size 90338 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png index dc1560093b..5c553934b1 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f71066245d43e71d082011b43af5ed0346f1199008296646f1795bd20c4670f6 -size 69361 +oid sha256:0775b9728bcc5c1ccd4497df6e77ad686ce380c1215d4f79fd8e284f831f0d0c +size 69078 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png index 97ea8ee1f1..0436cb04b7 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f78cf106741cd0022563695082c82dcdf18495070eca7055d075dcfbd824bc68 -size 91049 +oid sha256:4b68f0989997324e8575cfaa9ad1ba67bdc62aad3673626a1af495f74749bcba +size 92270 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png index eb06fa3795..52d4c428fb 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcab2f88cfb9c65250e39239a07947a2fba03840e5bdb63fc185b471004e2a4c -size 89030 +oid sha256:c69e778f61c9697067eea1cf4da7293161b3e19fd5d20d8523a7cb87cc36a0e2 +size 89089 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png index c5b9f255e2..18f5f4462c 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bc1624ae137b15c2ff441e25754ba3b1fe8291cd21d2ca629d29f556e7c1cda -size 140425 +oid sha256:b97540f25c04a133cb10dcc058b7fc1e4a038ee1b319b082615f23545019bbed +size 148552 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png index 531f1b269f..03c60e0fbb 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59f73f76a67e762851c44d59adb60cc2fb7bfeb729c6cb8a0418277f6de189cb -size 143580 +oid sha256:5110165e05355bc989dad0e06739b37b5c630582403031855ed5300ca90ff3db +size 157072 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png index 296ffb98b2..1ae87ef19f 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d06a6da019bc64d8c6f8d3b472941f081511a2fdc9d09800d9d08ef52e80c9d2 -size 145247 +oid sha256:ffc8054f46701ef58b6b3a8cf4195076dbb956d5ddd3a49d70db53553c69eca5 +size 158800 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png index 184f42ec6e..40e6e80ae1 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6172543c4caac30c3108272e4a987659bc34f83ce29dd1c2d0dfe3ef6706830 -size 19850 +oid sha256:0e5115bf7f5420691d5549811e999b4ead5fb21eedccda6c5527c6e1648a0b11 +size 19854 diff --git a/tests/UI/expected-screenshots/BarGraph_load.png b/tests/UI/expected-screenshots/BarGraph_load.png index 8ffde724dd..d7f5870431 100644 --- a/tests/UI/expected-screenshots/BarGraph_load.png +++ b/tests/UI/expected-screenshots/BarGraph_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e719d1aea6b14730b3748479b3cc8d2704102b2f63b8eb59f9e47d2548e16a5 -size 37332 +oid sha256:3ffe5d0120aad1eca2fa25c6e0f162319c5f000726b32465c904ed57612b4060 +size 37341 diff --git a/tests/UI/expected-screenshots/BarGraph_load_fail_when_token_used.png b/tests/UI/expected-screenshots/BarGraph_load_fail_when_token_used.png index e4471dcaa2..ffd7395b93 100644 --- a/tests/UI/expected-screenshots/BarGraph_load_fail_when_token_used.png +++ b/tests/UI/expected-screenshots/BarGraph_load_fail_when_token_used.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a239a77aaa6c89e33e32b90ffe877d041d259104d2579b0c4082a45f8b8bd67 -size 52480 +oid sha256:fdcae2b41602a113a62df5b0c0dcdc6c02489cdad348af7f96322c58bd41197e +size 52305 diff --git a/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png b/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png index 49159913c8..26b3493b85 100644 --- a/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png +++ b/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7c7e0090b35db8f3c3538b58906dcdfc3cc67b8e627a8891515d89db5a31461 -size 45917 +oid sha256:737f0c29946d004300f69123a8c2ffda019253f185ce0df3e190c6e3d57966ef +size 45918 diff --git a/tests/UI/expected-screenshots/BarGraph_other_metric.png b/tests/UI/expected-screenshots/BarGraph_other_metric.png index ec6a9b5484..41389f0cc9 100644 --- a/tests/UI/expected-screenshots/BarGraph_other_metric.png +++ b/tests/UI/expected-screenshots/BarGraph_other_metric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8752ce3bc47bd552ebce858469e385ab808f7501d6e8f4ee317ca49964311c7f +oid sha256:82be3c09c834125b47276fd916dea7117cbec565d6e8017c56cfe71b7594f327 size 38610 diff --git a/tests/UI/expected-screenshots/Comparison_bar_graph.png b/tests/UI/expected-screenshots/Comparison_bar_graph.png index abe21361d6..ae20f05380 100644 --- a/tests/UI/expected-screenshots/Comparison_bar_graph.png +++ b/tests/UI/expected-screenshots/Comparison_bar_graph.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cca1ad66d799b8786f64d3ce40a97f220725614d936d1434f249c0a0bad62dc -size 54387 +oid sha256:7c54701228335f320c741139d0f5bab0cff082ff2e0918a73430717f7f9240f5 +size 54389 diff --git a/tests/UI/expected-screenshots/Comparison_dashboard_last_period.png b/tests/UI/expected-screenshots/Comparison_dashboard_last_period.png index 1f3573d1c2..2817ea5426 100644 --- a/tests/UI/expected-screenshots/Comparison_dashboard_last_period.png +++ b/tests/UI/expected-screenshots/Comparison_dashboard_last_period.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e07ed43872e4eb5df80c0ece1f9e06265217575bbf7149b24f714eb51e1d8de -size 37079 +oid sha256:8ddc5822dc6394930b64fb0fbcf0d52dd80447e5fe47a4fd9ccaf7f433546c4a +size 37078 diff --git a/tests/UI/expected-screenshots/Comparison_dashboard_last_period_and_segment.png b/tests/UI/expected-screenshots/Comparison_dashboard_last_period_and_segment.png index 9d9afe1006..a0547c294a 100644 --- a/tests/UI/expected-screenshots/Comparison_dashboard_last_period_and_segment.png +++ b/tests/UI/expected-screenshots/Comparison_dashboard_last_period_and_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73ce76ad646a1a7943f2ab732951745d7e2860c9053f9cbb97dfe3cdafffd13d +oid sha256:7fae6285141b1121ecefdff38983a0b7d432a47e09cefc87ca5d5e6e7b2eb12d size 50299 diff --git a/tests/UI/expected-screenshots/Comparison_goals_table.png b/tests/UI/expected-screenshots/Comparison_goals_table.png index 454da066be..c25d31e99a 100644 --- a/tests/UI/expected-screenshots/Comparison_goals_table.png +++ b/tests/UI/expected-screenshots/Comparison_goals_table.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cb1589f3299cd4c7882fb5b21a83ca950d160b6e94b87ce772123c56fa49558 -size 134339 +oid sha256:205c3a5c96bd29a40a3d9b3e8770db001effe5578765d55290a89567d8d71dd2 +size 144169 diff --git a/tests/UI/expected-screenshots/Comparison_multi_row_evolution.png b/tests/UI/expected-screenshots/Comparison_multi_row_evolution.png index 0a122b3b20..3a8a2169d4 100644 --- a/tests/UI/expected-screenshots/Comparison_multi_row_evolution.png +++ b/tests/UI/expected-screenshots/Comparison_multi_row_evolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90050825e4e2a0861178fce5c150a6f0f687e09d52f6e3fb8013cccee6f4d593 -size 44730 +oid sha256:3b607546c112393c609d9e4b2edc5f138120f71bcd147d9ef7eaf66ff4d8fb18 +size 44761 diff --git a/tests/UI/expected-screenshots/Comparison_normal_table.png b/tests/UI/expected-screenshots/Comparison_normal_table.png index 21ba0e5dfd..96460e6e76 100644 --- a/tests/UI/expected-screenshots/Comparison_normal_table.png +++ b/tests/UI/expected-screenshots/Comparison_normal_table.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a42a218594a698f992c2c098a73f85d0f10125ee2f35dca1fec6bc021fac703 -size 99812 +oid sha256:c7ffa5e3da6098d2545248d467ae607a2c5bba88a35925a6b642727401098878 +size 99353 diff --git a/tests/UI/expected-screenshots/Comparison_normal_table_no_periods.png b/tests/UI/expected-screenshots/Comparison_normal_table_no_periods.png index d0c6c308ff..ec87053d22 100644 --- a/tests/UI/expected-screenshots/Comparison_normal_table_no_periods.png +++ b/tests/UI/expected-screenshots/Comparison_normal_table_no_periods.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4f7f29675be08273929a895a4d35461f5683d7ff08c0163aa3453f8b9f8d7b3 -size 51263 +oid sha256:78f2d9cd9ccb7f4bd1809d829a4b1e203f2fc501eb97d2269cda7a73cb394e89 +size 50931 diff --git a/tests/UI/expected-screenshots/Comparison_normal_table_no_segments.png b/tests/UI/expected-screenshots/Comparison_normal_table_no_segments.png index 534c87ef91..2bdfe6733c 100644 --- a/tests/UI/expected-screenshots/Comparison_normal_table_no_segments.png +++ b/tests/UI/expected-screenshots/Comparison_normal_table_no_segments.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:331fa4f43196d11e2d093fe9dc917223aec4b708d0a673997442482dc5c1a05b -size 37916 +oid sha256:cbc7d0373df0669c218a9a661bfa95c157dbb6e8039c85d146c0f8ed6b9053d9 +size 37500 diff --git a/tests/UI/expected-screenshots/Comparison_pie_graph.png b/tests/UI/expected-screenshots/Comparison_pie_graph.png index 36c4e8de6b..92eab90e19 100644 --- a/tests/UI/expected-screenshots/Comparison_pie_graph.png +++ b/tests/UI/expected-screenshots/Comparison_pie_graph.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:141d545b9214230405b30ecc3f78b15b0f112ad0b4d255e043362ddfacda464c -size 58125 +oid sha256:b98754d439b20a4d051f13514e6d546b5f0c49668e2a1a6a98a390c771d11d02 +size 58096 diff --git a/tests/UI/expected-screenshots/Comparison_row_evolution.png b/tests/UI/expected-screenshots/Comparison_row_evolution.png index f0647233bc..027254fbf7 100644 --- a/tests/UI/expected-screenshots/Comparison_row_evolution.png +++ b/tests/UI/expected-screenshots/Comparison_row_evolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91069bc381ebf1728736afab62935f591b8f797f57e81f79d267197d11f5f933 -size 72772 +oid sha256:d4665e537c3e986c62edf5d5988344b6fe33882bab743e86c36c7970f8ab532d +size 72789 diff --git a/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png b/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png index 77c1f02027..b066cd61fd 100644 --- a/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png +++ b/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efbc99593bb35e79dcf8456226c7b19290d7887bb1df273ec3f45c158c4b971a +oid sha256:018c398ef12b2d611950b158a996b590caa8ae5ccbba6a4dc40cc808dbc92bac size 406599 diff --git a/tests/UI/expected-screenshots/Comparison_subtables_loaded.png b/tests/UI/expected-screenshots/Comparison_subtables_loaded.png index 2c7e0f7f34..0c1f6ec5fd 100644 --- a/tests/UI/expected-screenshots/Comparison_subtables_loaded.png +++ b/tests/UI/expected-screenshots/Comparison_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3419de60cb7a878cdac96db68bbf94ab6c8cfe823661ba039c703d0d1c6ce99 -size 109913 +oid sha256:fd948c70637bc52301d9473ad72a050374ff3423ea2feaca729f991b63bc6c24 +size 109284 diff --git a/tests/UI/expected-screenshots/Comparison_subtables_paginate.png b/tests/UI/expected-screenshots/Comparison_subtables_paginate.png index 4deda5ecd9..81ce8540f6 100644 --- a/tests/UI/expected-screenshots/Comparison_subtables_paginate.png +++ b/tests/UI/expected-screenshots/Comparison_subtables_paginate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef351fe3c0e9d24112ede3674518c0a65655c71f57061adb48c5b928d1f927ae -size 82876 +oid sha256:df1dd53dbca10a99907ea78adfd7bef69ec4caa71a1c2161fbd1d8e6d8947119 +size 82838 diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview.png b/tests/UI/expected-screenshots/Comparison_visitors_overview.png index dfc0f94cc1..c1652c2a49 100644 --- a/tests/UI/expected-screenshots/Comparison_visitors_overview.png +++ b/tests/UI/expected-screenshots/Comparison_visitors_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9c798cbd29a92e402fe57fe6e5b19a9e81dfe0f56a553f313326a45d5228bda -size 334181 +oid sha256:2383622ec647a964036a416a26f42c1fceb9f4cfabed365663afb3ef7ac7a68c +size 334153 diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview_no_compare.png b/tests/UI/expected-screenshots/Comparison_visitors_overview_no_compare.png index ab4cf16f7f..51733a0a0d 100644 --- a/tests/UI/expected-screenshots/Comparison_visitors_overview_no_compare.png +++ b/tests/UI/expected-screenshots/Comparison_visitors_overview_no_compare.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:536fcaf16838b13fd67123e4a41fe4251486ba8244a6ae60bc168066f8ba6ff0 -size 78733 +oid sha256:8d9bb1b42ffd9555b78abef5807a774b56dfb1d017ce126252af798f97e340e8 +size 78742 diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png b/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png index f1de9ccbc0..3676c739ee 100644 --- a/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png +++ b/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97e3aa2a4364344247604e5a23de0e495cfcd1d93bcfb563556fb4cc0f788932 -size 178293 +oid sha256:6d6bcfe63edc688fec45252e63d29f1720d70a18bb5bb8f7e6147fd8a4a37c01 +size 178276 diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png b/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png index 6010594000..075eaef025 100644 --- a/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png +++ b/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c97cbedae1cce868d68ad50162bd95ae28dd245a11192c158be9c2f223f1020 -size 355091 +oid sha256:2d63e3948f90cc5f3ceb46c3a7500a7967550ef766b10c2056bd40729e5c5239 +size 355074 diff --git a/tests/UI/expected-screenshots/Comparison_visits_overview_widget.png b/tests/UI/expected-screenshots/Comparison_visits_overview_widget.png index 9c8176c5cc..2da18edd2d 100644 --- a/tests/UI/expected-screenshots/Comparison_visits_overview_widget.png +++ b/tests/UI/expected-screenshots/Comparison_visits_overview_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dc90a6fe42f0c316a3b4803d8616231b206ade95db1713f64ed1d7a1a0b3c2b -size 320887 +oid sha256:3e8aa77bfadb3e0bfd97b52792b0050ba8c38da11455d16e38544a2f61ace063 +size 320931 diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png index 35740283ec..31783c5144 100644 --- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png +++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8be3f5b7b4d3875ea75adedf3cccd6cefd0f1d24cd4a90fdc2bdf2275c5087b3 -size 377377 +oid sha256:49b3a9a8d905f1c130cecbf696c8c023349b324aa47133bc9d59c3292cc8aa12 +size 377378 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png index 00b1045b30..70762fc2c2 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27ea6d8589ebd315082ef66515cd72b59251115be92422e6c98309c569f6f3d4 -size 32685 +oid sha256:0f7d86ca7b1daa11859aee6ee7b829f35378c936404bdf4fa38f21f7cb9bf1ea +size 32662 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png index 3af635914a..f9c15aa652 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f906c2351832c650fc6349a5c83c197834389565c785990bf47d9d206c8ffb6 -size 30958 +oid sha256:0b567bb6222be47394010be9957e16be7ef93e3cdf0249b76a22a994dddbf29f +size 30953 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png index 94fa6c469f..4414f5efc5 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a80ad46435deb551f95bfd927a662eec0cecace1d946b633388a076f5836e5f -size 29328 +oid sha256:2d40946cebdbc3442638ab0818ab90ad483143e78d27abc58f9cdbabc28876eb +size 29315 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png b/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png index ca3703362e..25ccea6cbd 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd08c8115f7df76399032ba8fe2e41b8bc6361786a0a1e048359f552c8eea6a4 -size 82904 +oid sha256:a7043039b4be77ccda05035ec2a639ec39a8f50429b434c39e3d34d01416e772 +size 82898 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png b/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png index 5b13b3bc3b..3ea6993f9a 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ceb01cbee1af435cba93d5fe166d14b8d1e3bfd442a2ad3a4a1025c042014dac -size 27411 +oid sha256:b16ad27144caf0ee9b7ad5fc2e5777882294c74bf458b63bb0919e3c2d85ffd9 +size 27399 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png b/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png index 0a47a7213d..ba15ebfa90 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f9519a67e20a06ae457896d31f738d60f04f605ffca30af99d56fa28651c4ea -size 38087 +oid sha256:0a5b84dc85a53c875670d947cabd5f0c64a2023b9f772a5ff13278db6d0a5eb8 +size 38076 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png index a5a79339cc..e27618a188 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3af21181abd982cf71a8b1baadde6a7d084c5d6047ef73d439ab5b249270a71d -size 107645 +oid sha256:acd073900f58d1bff4aa3fb68b1987c658e0b2c53f6f0bfb7aaf5f8956e2f14d +size 107634 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_initial.png b/tests/UI/expected-screenshots/EvolutionGraph_initial.png index c5ad005859..e596d86707 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_initial.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ae6dbe2b40b18ac61179a23d9082f38d5dc7d4a7b9b3d8e9287917cf099c983 -size 58756 +oid sha256:8833625d6ef13a4156ff17c059406158665c5cdb9fc5044508409ee307c05b09 +size 58740 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_label_ticks_cutout.png b/tests/UI/expected-screenshots/EvolutionGraph_label_ticks_cutout.png index 5d6f4df075..f41cb30e24 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_label_ticks_cutout.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_label_ticks_cutout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:715c4598c8e1e6e2f7b1377e1be4888ac1b705dc61fd0666afbe269a6e587d76 +oid sha256:9e0fb513a851c9b285368a7d2738a91da1278ca260e918641731e19f35c2493d size 10491 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_limit_changed.png b/tests/UI/expected-screenshots/EvolutionGraph_limit_changed.png index 5222125a29..7327d0ac56 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_limit_changed.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_limit_changed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a193c28b300c70fe7419e0b5b2998d639dff5451e860dc66e91002d5efac0910 -size 25128 +oid sha256:bdcd68e8081ae2904e0232df0d54076156a180f4c71cce53fdcd8f17cab7206d +size 25135 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_metric_picker_shown.png b/tests/UI/expected-screenshots/EvolutionGraph_metric_picker_shown.png index 581291c79e..996a49e5a6 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_metric_picker_shown.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_metric_picker_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22c7603d1c7a8a1332c6238105608e5a5bc443332ac246487c7cf74f895dcfc3 -size 30734 +oid sha256:2fa5794b6a4130d62b101a5a08a2761c76af735b351eaed00b25b326851f4a1e +size 30730 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png index 464822bac4..77c618cbff 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f18df459c583086c7fe28abe1e064cb756b3c015fb506fe3be5efde70f05fd9b -size 31748 +oid sha256:dc78893c75a9beed981f1df8dbaf450beba9bb3f6579b504dd68d76a2f6f3795 +size 31744 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png index e836d3c334..5e9ad3b5ab 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83d83834ddb645341945d8d76e944998a7a278e8fa26aa317db827d126529ef0 -size 29225 +oid sha256:eb5f25382f1cf2996a4d390ba4848d1e759e11d0a6ceba9dac6f01251ac422b7 +size 29211 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_one_series.png b/tests/UI/expected-screenshots/EvolutionGraph_one_series.png index 7469464da1..e4c6755686 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_one_series.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_one_series.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:738b3d1c4f335f2f8549cfd9a702d7e61d192e9a737fdb870d1506e7c087637e -size 21682 +oid sha256:aff090094a4a16b2eec6eaacae8fe282147aaec5635bd826a7325d9c5ae1193a +size 21670 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_periods_list.png b/tests/UI/expected-screenshots/EvolutionGraph_periods_list.png index b30e342cf6..da2a826470 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_periods_list.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_periods_list.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddd6727952676479fb62aff964bb41e2d02aa5dc990fb8159ecc815527df6f8a -size 21546 +oid sha256:058ce5c9ab960b698b45800d108521836801905f8ab372432dce1219fc11b160 +size 21542 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_periods_selected.png b/tests/UI/expected-screenshots/EvolutionGraph_periods_selected.png index 1c9d743288..bc74908aca 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_periods_selected.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_periods_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae34583cc404fc7c9a37c44302ec24593c0e1db282180a92f8a90147f7785ee9 -size 16885 +oid sha256:22ee13c567da23daf4e7f729d2090e8c68c5c14ad548ce457d803c282bc66a16 +size 16878 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_table_actions.png b/tests/UI/expected-screenshots/EvolutionGraph_table_actions.png index 2145c41394..fcc845ff45 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_table_actions.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_table_actions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69edd7a1e27c434821be39a07297961d2d72806b5783a81ab86d1765e65935b8 -size 24012 +oid sha256:5eff6535bfb5006108c9462df29695bcdc8d06cdba3e1d0fc20c2742fd0c6dfc +size 24002 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_two_metrics.png b/tests/UI/expected-screenshots/EvolutionGraph_two_metrics.png index 2145c41394..fcc845ff45 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_two_metrics.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_two_metrics.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69edd7a1e27c434821be39a07297961d2d72806b5783a81ab86d1765e65935b8 -size 24012 +oid sha256:5eff6535bfb5006108c9462df29695bcdc8d06cdba3e1d0fc20c2742fd0c6dfc +size 24002 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png index 630ac8e5b4..885810d277 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3895c25e20e7f1f2b95dbafb1e8cd54ade2a997d9fb5dfd0bd452d2c4853da5 -size 41545 +oid sha256:fec242bc55143d44c203236805d713c63ff7eb1134cf5c5bac7a4c58eea8a255 +size 41684 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png index 11c3a76361..323b44e395 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0580a7e90d16e5d9095b44e38c3c9f570e9ab1cc07ce2853236a74f53711d81 -size 63972 +oid sha256:7a613d544bc56afabd5836ab18d76408f72343a7dd6af12e5d5b2331601a8916 +size 65360 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png index 824998bf2e..a693202456 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:357527a91d1a9b03fade8462eae60ca5f21aa02fa0e15a58bc569e8bbd416acc -size 38794 +oid sha256:b7526db9c6330a59c305df54944c662390582a34c0dff533ef3f1e709aa7e95c +size 39525 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png index 3da30747cf..07d7dedd70 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e88413d0cc0f534e76d76ad0e8d39912d82ea33534b13bda3fb2c54fae7276c3 -size 71199 +oid sha256:240d5eb8c555f0b546f00dd91049fc04aaf60f48a5150d6efce291fc294d7fed +size 85570 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png index befb6cc19f..c64083dc31 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b473828e6b61a4a8a533c0deccd0360fe4d6995f3d5015aa798a473e6cf8c84 -size 66331 +oid sha256:516d52392b4c23af8b52f6dfc80baf2d3bee223536334d7434eaaa27dac79518 +size 71619 diff --git a/tests/UI/expected-screenshots/GoalsTable_initial.png b/tests/UI/expected-screenshots/GoalsTable_initial.png index 6b58dc1565..c3ca30817f 100644 --- a/tests/UI/expected-screenshots/GoalsTable_initial.png +++ b/tests/UI/expected-screenshots/GoalsTable_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47ac419ef7d73db1131e1000df38d93ac4329fa3c07654a53576526173cf0868 -size 68051 +oid sha256:4ec657773497e2aaa1478e9071acc41f5da2cb906bf978d4b645125522dc3e53 +size 74971 diff --git a/tests/UI/expected-screenshots/JSTracker_visitor_log.png b/tests/UI/expected-screenshots/JSTracker_visitor_log.png index 7e6b4b68ed..c851067e78 100644 --- a/tests/UI/expected-screenshots/JSTracker_visitor_log.png +++ b/tests/UI/expected-screenshots/JSTracker_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ed2c6d28847ced73b89400acef18498eb7eb8f52cd8d97d97b4ae5635489215 -size 33492 +oid sha256:eceebc742be98f6ad9ac12243ac85df43c1c98ca2739d5554bdf16fa151f3726 +size 33495 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index fd15aa164e..11964d63f0 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:220b8c96106654860914095774a18e55a2777c3d060168166a8e7b1b30546c8e -size 488887 +oid sha256:2365513514dd729ace3d8f957ed252b443cd652645d3b2e286c166dbcc14e51f +size 488893 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png index 8c6c669fbc..ec3c0f66e6 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5db1b3299d553b510eddf88bc01ac1023c06f462efc5840d1d12ceb117c2506 -size 9832 +oid sha256:7875e703963d037032b981a62ee5e527c6b5340bafc69a270228969b0a2d9213 +size 9279 diff --git a/tests/UI/expected-screenshots/MeasurableManager_loaded.png b/tests/UI/expected-screenshots/MeasurableManager_loaded.png index 4e54079a4e..b7fc9f96a8 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_loaded.png +++ b/tests/UI/expected-screenshots/MeasurableManager_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd1cbf90efb09bb09c0fe71ac31548c4c75708dde8df226d41c99bc1c30bf669 -size 179246 +oid sha256:ee9967deeafc30295ab89d23ac9ca9012693c3dd767f6b16cdaa897383a17a2c +size 179255 diff --git a/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png b/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png index 5e2d3af8b9..0a09b9f924 100644 --- a/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png +++ b/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aab3f2e873ee336c96899a5983f0242cabe79e1973302a8cf29bcf96534355be -size 26370 +oid sha256:03ef973fc68d25a3a49a798dc7948be9aa20e30b67ea2cb6f499d4520ac246e3 +size 26377 diff --git a/tests/UI/expected-screenshots/Menus_mobile_top.png b/tests/UI/expected-screenshots/Menus_mobile_top.png index 7045793185..c809f35cdf 100644 --- a/tests/UI/expected-screenshots/Menus_mobile_top.png +++ b/tests/UI/expected-screenshots/Menus_mobile_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69ebaf22839ac8b87956ffae8c2a2e9daa17f0abf5512ef4f5081a87a88e48ea -size 172960 +oid sha256:ab76604c7720b9dadc8b6e88f62725fbc7ab908b3b0e4b5552c3630a6481aeae +size 172948 diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png b/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png index ab97f4cb05..3232fd1c10 100644 --- a/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png +++ b/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f8a9c4dacd5bb4820fc74f2b58508a22b57327d0b4ef237e7331574a474002a -size 98263 +oid sha256:7c9362ebb5b1f6205d2cab427458ec21fe7a54db7a8a4abebadc6ba19ce8a1f4 +size 97953 diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png b/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png index 50c3f5a64e..ed1394f5ae 100644 --- a/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png +++ b/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46c38fd2b947f1c0f6e312a9228f57b065a69fee2b9055ceae607408993fa26b -size 43674 +oid sha256:5065ba1f2bc6e5cf24d6a91968580ca72043447bb111c6c161d4bd9b2f48154e +size 43635 diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_success.png b/tests/UI/expected-screenshots/OneClickUpdate_update_success.png index 73c92c3fa1..6c5607f5af 100644 --- a/tests/UI/expected-screenshots/OneClickUpdate_update_success.png +++ b/tests/UI/expected-screenshots/OneClickUpdate_update_success.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74318d92def0f55e708f85695c4cf25396be2a66677ba6b31c4bea446c53f369 -size 73864 +oid sha256:5de9ddc99af708b5314651e54fcae22f9222f939577ae7f4148d50b8f48c6087 +size 73714 diff --git a/tests/UI/expected-screenshots/OnlyRawDataNotification_show_notification_when_only_raw_data_exists.png b/tests/UI/expected-screenshots/OnlyRawDataNotification_show_notification_when_only_raw_data_exists.png index 0834cbf372..3673b8ff0b 100644 --- a/tests/UI/expected-screenshots/OnlyRawDataNotification_show_notification_when_only_raw_data_exists.png +++ b/tests/UI/expected-screenshots/OnlyRawDataNotification_show_notification_when_only_raw_data_exists.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d01e663143cd9cf4f7fbfbb30126d8b1a15d770999ef21ec767d0b64a29d3277 -size 14765 +oid sha256:a858b36ffbb85cfe1f13697bff56833a21ddb5ac55a212af7b4aaf2397272c59 +size 14731 diff --git a/tests/UI/expected-screenshots/OptOutForm_clicked_once.png b/tests/UI/expected-screenshots/OptOutForm_clicked_once.png index b349e78513..ecb521b0cf 100644 --- a/tests/UI/expected-screenshots/OptOutForm_clicked_once.png +++ b/tests/UI/expected-screenshots/OptOutForm_clicked_once.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2c658d66186e231303940ef50ba4a8cc982d28c0425e4290cb10ea3ea4e46d0 -size 22990 +oid sha256:19084c9043f6bb17cbd2271017e3607cc111e29d39d315d69db4aaf9eae254c5 +size 22863 diff --git a/tests/UI/expected-screenshots/OptOutForm_clicked_twice.png b/tests/UI/expected-screenshots/OptOutForm_clicked_twice.png index 152f97f608..9df34724a2 100644 --- a/tests/UI/expected-screenshots/OptOutForm_clicked_twice.png +++ b/tests/UI/expected-screenshots/OptOutForm_clicked_twice.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:375f8b477c06ee4477d7976f347dae645ea04a97c0acd21b9f154bd61edfc71b -size 23291 +oid sha256:589a047a741921996bb73a8418b2d6ecbee366f8f6c5d67bb829848956adeea9 +size 23232 diff --git a/tests/UI/expected-screenshots/OptOutForm_loaded.png b/tests/UI/expected-screenshots/OptOutForm_loaded.png index b349e78513..ecb521b0cf 100644 --- a/tests/UI/expected-screenshots/OptOutForm_loaded.png +++ b/tests/UI/expected-screenshots/OptOutForm_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2c658d66186e231303940ef50ba4a8cc982d28c0425e4290cb10ea3ea4e46d0 -size 22990 +oid sha256:19084c9043f6bb17cbd2271017e3607cc111e29d39d315d69db4aaf9eae254c5 +size 22863 diff --git a/tests/UI/expected-screenshots/OptOutForm_opted-out.png b/tests/UI/expected-screenshots/OptOutForm_opted-out.png index 152f97f608..9df34724a2 100644 --- a/tests/UI/expected-screenshots/OptOutForm_opted-out.png +++ b/tests/UI/expected-screenshots/OptOutForm_opted-out.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:375f8b477c06ee4477d7976f347dae645ea04a97c0acd21b9f154bd61edfc71b -size 23291 +oid sha256:589a047a741921996bb73a8418b2d6ecbee366f8f6c5d67bb829848956adeea9 +size 23232 diff --git a/tests/UI/expected-screenshots/OptOutForm_opted-out_reloaded.png b/tests/UI/expected-screenshots/OptOutForm_opted-out_reloaded.png index 152f97f608..9df34724a2 100644 --- a/tests/UI/expected-screenshots/OptOutForm_opted-out_reloaded.png +++ b/tests/UI/expected-screenshots/OptOutForm_opted-out_reloaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:375f8b477c06ee4477d7976f347dae645ea04a97c0acd21b9f154bd61edfc71b -size 23291 +oid sha256:589a047a741921996bb73a8418b2d6ecbee366f8f6c5d67bb829848956adeea9 +size 23232 diff --git a/tests/UI/expected-screenshots/OptOutForm_safari-loaded.png b/tests/UI/expected-screenshots/OptOutForm_safari-loaded.png index b349e78513..ecb521b0cf 100644 --- a/tests/UI/expected-screenshots/OptOutForm_safari-loaded.png +++ b/tests/UI/expected-screenshots/OptOutForm_safari-loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2c658d66186e231303940ef50ba4a8cc982d28c0425e4290cb10ea3ea4e46d0 -size 22990 +oid sha256:19084c9043f6bb17cbd2271017e3607cc111e29d39d315d69db4aaf9eae254c5 +size 22863 diff --git a/tests/UI/expected-screenshots/OptOutForm_safari-opted-out.png b/tests/UI/expected-screenshots/OptOutForm_safari-opted-out.png index 152f97f608..9df34724a2 100644 --- a/tests/UI/expected-screenshots/OptOutForm_safari-opted-out.png +++ b/tests/UI/expected-screenshots/OptOutForm_safari-opted-out.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:375f8b477c06ee4477d7976f347dae645ea04a97c0acd21b9f154bd61edfc71b -size 23291 +oid sha256:589a047a741921996bb73a8418b2d6ecbee366f8f6c5d67bb829848956adeea9 +size 23232 diff --git a/tests/UI/expected-screenshots/PeriodSelector_comparison_checked.png b/tests/UI/expected-screenshots/PeriodSelector_comparison_checked.png index 35f5302ca1..90eca432c6 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_comparison_checked.png +++ b/tests/UI/expected-screenshots/PeriodSelector_comparison_checked.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5ee29e382a184375f271359f74d45461e3471e315c8eb4a412a68d42c328c73 -size 32096 +oid sha256:644be5692608593b5add1cde794a0c0d3874709b06499282cab45abf0562b82d +size 33547 diff --git a/tests/UI/expected-screenshots/PeriodSelector_custom_comparison.png b/tests/UI/expected-screenshots/PeriodSelector_custom_comparison.png index 56f8a16895..fcf003ef04 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_custom_comparison.png +++ b/tests/UI/expected-screenshots/PeriodSelector_custom_comparison.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b9aaa95de39404dc0af1924a3581d3a34dcf58c42ecf8e389a05a65cf56596d -size 36466 +oid sha256:e1fa1833e09af12110b71448ae5cd24f4e02344f5309828f80e57a2f737f3108 +size 37788 diff --git a/tests/UI/expected-screenshots/PeriodSelector_date_range_selected.png b/tests/UI/expected-screenshots/PeriodSelector_date_range_selected.png index a54e2ac778..b3eef5b763 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_date_range_selected.png +++ b/tests/UI/expected-screenshots/PeriodSelector_date_range_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff070beddc62c6fb28018f957766d902dab85121b6847951dcdb612c5bca2631 -size 30302 +oid sha256:0e46fe698037d741dbc0a79c1dfe992e3c21a6d069ac77559fd70127a7fa9fd8 +size 31758 diff --git a/tests/UI/expected-screenshots/PeriodSelector_day_selected.png b/tests/UI/expected-screenshots/PeriodSelector_day_selected.png index c6ab206240..5620345d94 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_day_selected.png +++ b/tests/UI/expected-screenshots/PeriodSelector_day_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d11dfdc9f538cda4d629844ac3d1b7300c8c7c417448a5f399a696523fc4a6b -size 20413 +oid sha256:e97719525cafd37e4a2e2c349800b34d7eec18c9c659362c08303f325c159d25 +size 21436 diff --git a/tests/UI/expected-screenshots/PeriodSelector_expanded.png b/tests/UI/expected-screenshots/PeriodSelector_expanded.png index 5b385e3a6b..c7bb706034 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_expanded.png +++ b/tests/UI/expected-screenshots/PeriodSelector_expanded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52dcb6a83bbd55199e389c6940b1c43e9f87851ccdc8ee2ec3db699c3b5359f5 -size 20376 +oid sha256:a7c27910b5c336e33d79ddad3b681deb619a41d2aa724284375109cfb17beb89 +size 21435 diff --git a/tests/UI/expected-screenshots/PeriodSelector_invalid.png b/tests/UI/expected-screenshots/PeriodSelector_invalid.png index d2619f419f..f1f2ed5d18 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_invalid.png +++ b/tests/UI/expected-screenshots/PeriodSelector_invalid.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7ce27b59d18a27a6715d7bafe67db6d74e98f93c3397f7a7430d73203996085 -size 13087 +oid sha256:6a476483c2f9e612f0239a8feec0d3b23b8934a1a0a8be99691b15afc2d30c0f +size 13078 diff --git a/tests/UI/expected-screenshots/PeriodSelector_month_changed.png b/tests/UI/expected-screenshots/PeriodSelector_month_changed.png index 7eaf64da9f..7e80464704 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_month_changed.png +++ b/tests/UI/expected-screenshots/PeriodSelector_month_changed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d39f9130530c4e738a487a3e501d295827c5b0c1b43318b87a4cda66ca6269b -size 19702 +oid sha256:1b6034bd05f86f38b607ee71aabc4be6141bd701ba1f993f75bb1529dd56922a +size 20767 diff --git a/tests/UI/expected-screenshots/PeriodSelector_month_selected.png b/tests/UI/expected-screenshots/PeriodSelector_month_selected.png index abe6a9938f..12bacb4ce2 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_month_selected.png +++ b/tests/UI/expected-screenshots/PeriodSelector_month_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f939480871c90ae44d50edc432194144601992878248bf875c0ed30023f00c31 -size 20298 +oid sha256:d5294604fed3840f1e9aab8b40b600232acd0960fbd62c678091a4a558e842c1 +size 21155 diff --git a/tests/UI/expected-screenshots/PeriodSelector_range_picker_displayed.png b/tests/UI/expected-screenshots/PeriodSelector_range_picker_displayed.png index fc252013f1..63472427b9 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_range_picker_displayed.png +++ b/tests/UI/expected-screenshots/PeriodSelector_range_picker_displayed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dccc4aedae246c16665c5e059afdd6d15946fdfa0952f83a716c6bc3f7a91a2 -size 30086 +oid sha256:20bbfd1bc09936242bae65762bc676a00d73b81d9c410e136f5ec8ca5b8dcf4d +size 31241 diff --git a/tests/UI/expected-screenshots/PeriodSelector_week_selected.png b/tests/UI/expected-screenshots/PeriodSelector_week_selected.png index 6e25a69623..7b42d933b1 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_week_selected.png +++ b/tests/UI/expected-screenshots/PeriodSelector_week_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2521a84b54c433b30fec25e3fbc0bb1c3edc116bc80124d539d3d347cfd27ff -size 21289 +oid sha256:cc184e43b7e486378f5a5c5206aa1a4fd2b3ff261fd25ab88478616413eb4b45 +size 22047 diff --git a/tests/UI/expected-screenshots/PeriodSelector_year_changed.png b/tests/UI/expected-screenshots/PeriodSelector_year_changed.png index f35a3eb296..3d7125278c 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_year_changed.png +++ b/tests/UI/expected-screenshots/PeriodSelector_year_changed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:361da79b3711d3c94a253b321df0a9d2243753a23e07172ce0e34d32cd62bcdc -size 19559 +oid sha256:ac6dd448b67df74894422c5685aa21e73a413534a892cc14abe7cca72f99c768 +size 20477 diff --git a/tests/UI/expected-screenshots/PeriodSelector_year_selected.png b/tests/UI/expected-screenshots/PeriodSelector_year_selected.png index 10b91be984..ca7f1832f0 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_year_selected.png +++ b/tests/UI/expected-screenshots/PeriodSelector_year_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b395a68a390f3b0672eb8ad3bbd1aac82bc4e2d26badddf83f2728b45a0cd1d5 -size 19575 +oid sha256:bc80f1db79c9e430b73bc079ef52daa4f05f88b2099f449242bc59917bab995a +size 20437 diff --git a/tests/UI/expected-screenshots/PieGraph_load.png b/tests/UI/expected-screenshots/PieGraph_load.png index 4aec2ef78d..7c10f20dd9 100644 --- a/tests/UI/expected-screenshots/PieGraph_load.png +++ b/tests/UI/expected-screenshots/PieGraph_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40dac08d2925f6f76c29906a22f09202493e2fb84795b7faf57c51571a9a15da -size 53031 +oid sha256:636afc734eea71a7b1c53ccb5c6ddd73ad7642fde5a981af3188e49a0fc39600 +size 53001 diff --git a/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png b/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png index ba5e6adea5..02f1c4444e 100644 --- a/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png +++ b/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8a12df65405d269126955924c36ecb0f097b5ed865605c800000ac4862d468a -size 62940 +oid sha256:e4b64b49c0f5ab97f992e137344e19e2cba9b0613a1f475545d9f1831defe359 +size 62915 diff --git a/tests/UI/expected-screenshots/PieGraph_other_metric.png b/tests/UI/expected-screenshots/PieGraph_other_metric.png index 1ff24e705d..0f3022ca25 100644 --- a/tests/UI/expected-screenshots/PieGraph_other_metric.png +++ b/tests/UI/expected-screenshots/PieGraph_other_metric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80554700ca0982bdf3b1997959127e985cffdde3f02eca17d78681d818934e0d -size 53335 +oid sha256:e2197d4feb8351179dc79e0ac7ab77bbb02df9d0c155d5c6de19f3a792d2fd6e +size 53341 diff --git a/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png b/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png index eb497a8919..3eee9b88c8 100644 --- a/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png +++ b/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4732a14b167c3e7f537f767884862f7f13ed5b1dccbfaa6dfa76a868d4730b81 -size 55464 +oid sha256:306f7b03e06dd849a2d3af51068ed3b6196a853034a920e6c78a37b230989835 +size 55407 diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png index b506892754..78bf5395ee 100644 --- a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png +++ b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b47d1f70b6b07f34cc2909452246dddeda14d0369e5b0e3d2d1ad5a29c97bc72 -size 69517 +oid sha256:0d86338d2cddaf3be5e191433daf081b8fad5e21ea7e4379a8785acda80c123b +size 71499 diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png index 7601ae9801..ba77fc94e1 100644 --- a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png +++ b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8721b2dea6e5d76fce6374488c6a2724be36049c1b8e9777364288ccf4be82a3 -size 58189 +oid sha256:f81ae3ab85125f09ea96ec6d81df6f44a3aa245e082d0b64f80a408edfd0c2a7 +size 61385 diff --git a/tests/UI/expected-screenshots/RowEvolution_multirow_evolution.png b/tests/UI/expected-screenshots/RowEvolution_multirow_evolution.png index b402e552e9..155d5cca22 100644 --- a/tests/UI/expected-screenshots/RowEvolution_multirow_evolution.png +++ b/tests/UI/expected-screenshots/RowEvolution_multirow_evolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11e7686f1c3673891d1a9c5f8150c4f364cb8b37341e379b72878903f7bef2b2 -size 47182 +oid sha256:7ae223ccfb86ba5e078127ae454d5879a59893919ce661a6cdf1cda4af1259e7 +size 47234 diff --git a/tests/UI/expected-screenshots/RowEvolution_multirow_evolution_other_metric.png b/tests/UI/expected-screenshots/RowEvolution_multirow_evolution_other_metric.png index 9e2e343a5d..638c73c96c 100644 --- a/tests/UI/expected-screenshots/RowEvolution_multirow_evolution_other_metric.png +++ b/tests/UI/expected-screenshots/RowEvolution_multirow_evolution_other_metric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d83020621f2cc70d522e7b399854d04d49260691a5e08dc853eb92876b6108d -size 48316 +oid sha256:fa40561e72f2ae3fbcc9f5c972b2ba6b92fbb84c02801a3d7576206d36854589 +size 48376 diff --git a/tests/UI/expected-screenshots/RowEvolution_row_evolution.png b/tests/UI/expected-screenshots/RowEvolution_row_evolution.png index fd6657da21..c779bc9ae4 100644 --- a/tests/UI/expected-screenshots/RowEvolution_row_evolution.png +++ b/tests/UI/expected-screenshots/RowEvolution_row_evolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0bb7dd0a4fd2f4a14cdde59b6bfc2c639184fe6dc020718f6ccdf83d9816aec -size 72118 +oid sha256:3e6b1df554c963c8a9102289969cbd709fd767aa5b00854b663f8cd4bd349393 +size 72079 diff --git a/tests/UI/expected-screenshots/RowEvolution_row_evolution_ecommerce_item.png b/tests/UI/expected-screenshots/RowEvolution_row_evolution_ecommerce_item.png index 714a9f762b..5e61471197 100644 --- a/tests/UI/expected-screenshots/RowEvolution_row_evolution_ecommerce_item.png +++ b/tests/UI/expected-screenshots/RowEvolution_row_evolution_ecommerce_item.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccc12b011a66b646fef0858cd14adcc36a8cba0d0a4cc8a9b022cb96ddf4ba9c -size 76604 +oid sha256:8e4cbdf9d2183e35dec47741a2848033e17d61d453281a63512ce5a0b68d869e +size 76591 diff --git a/tests/UI/expected-screenshots/RowEvolution_row_evolution_multiple_series.png b/tests/UI/expected-screenshots/RowEvolution_row_evolution_multiple_series.png index 2d8ede2578..cab8b0a5f1 100644 --- a/tests/UI/expected-screenshots/RowEvolution_row_evolution_multiple_series.png +++ b/tests/UI/expected-screenshots/RowEvolution_row_evolution_multiple_series.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45a2f10cce504c912fac128aed79d8bf34e88ffa7b635f1dbbf067582406457c -size 74577 +oid sha256:36f61bbb93f97296bebafe387373b3707df3ad240ab9f0c7c301d528ca70816a +size 74532 diff --git a/tests/UI/expected-screenshots/RowEvolution_row_evolution_other_metric.png b/tests/UI/expected-screenshots/RowEvolution_row_evolution_other_metric.png index 3169f603d9..f125478937 100644 --- a/tests/UI/expected-screenshots/RowEvolution_row_evolution_other_metric.png +++ b/tests/UI/expected-screenshots/RowEvolution_row_evolution_other_metric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd8228ef0069ec4eb04214b36c3ff713a37c1ea9de8393d853dedba370084388 -size 71989 +oid sha256:fdcc79d884a00a858a955fc3cbaed9d62cc555b762068461b3ce31bf2aa9199d +size 71951 diff --git a/tests/UI/expected-screenshots/SiteSelector_expanded.png b/tests/UI/expected-screenshots/SiteSelector_expanded.png index abc05942a3..5e2d8ed274 100644 --- a/tests/UI/expected-screenshots/SiteSelector_expanded.png +++ b/tests/UI/expected-screenshots/SiteSelector_expanded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b25cd3fdd8f9c8125443dd099718283b4d21cbd9e3fcdc6198319b7206efb588 -size 21433 +oid sha256:7b9161297a0646d8b74f5e12814bc409c12457d808b7b091b6146ce9719fe9cb +size 21442 diff --git a/tests/UI/expected-screenshots/SiteSelector_search_no_results.png b/tests/UI/expected-screenshots/SiteSelector_search_no_results.png index d32d35deaf..b8921c6765 100644 --- a/tests/UI/expected-screenshots/SiteSelector_search_no_results.png +++ b/tests/UI/expected-screenshots/SiteSelector_search_no_results.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a5effd9335a33c54c0d153da21cab2779b81bd6bdc90ca971adc27a541dfe87 -size 8330 +oid sha256:73c1220722bb8b0d7f6460ee9acad41b796ee1f891e4ba8c520c6af5b57bf680 +size 8337 diff --git a/tests/UI/expected-screenshots/SiteSelector_search_one_char.png b/tests/UI/expected-screenshots/SiteSelector_search_one_char.png index faa101ea17..ce68bf714d 100644 --- a/tests/UI/expected-screenshots/SiteSelector_search_one_char.png +++ b/tests/UI/expected-screenshots/SiteSelector_search_one_char.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dc74b942730a9442d9ee6bd3ccfc4baffcef33f740c14b405d5dec59fccfdd7 -size 21175 +oid sha256:e74c3e31e9d43848938ed0fcd05168cfb143091ca1ffe9fb1af15b081ba64f71 +size 21189 diff --git a/tests/UI/expected-screenshots/SiteSelector_search_two_chars.png b/tests/UI/expected-screenshots/SiteSelector_search_two_chars.png index 4601ee057b..298f3671a5 100644 --- a/tests/UI/expected-screenshots/SiteSelector_search_two_chars.png +++ b/tests/UI/expected-screenshots/SiteSelector_search_two_chars.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:686f141a4e1674aed2a2ee2660c9d09d27ab07c0124fc270dca87dd8b285fbd5 -size 10670 +oid sha256:7545cb7858670358143b6a52c6dc7c2608543b3ccd97874e0b2b2fd4d881f080 +size 10678 diff --git a/tests/UI/expected-screenshots/SupportedBrowser_page_load_fails_when_browser_not_supported.png b/tests/UI/expected-screenshots/SupportedBrowser_page_load_fails_when_browser_not_supported.png index dc19084f6f..0c7365afc5 100644 --- a/tests/UI/expected-screenshots/SupportedBrowser_page_load_fails_when_browser_not_supported.png +++ b/tests/UI/expected-screenshots/SupportedBrowser_page_load_fails_when_browser_not_supported.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b097ccb4f1678fd1805df8180dc0c6b246fba36013b0c698ba0a98c20478bcf5 -size 53050 +oid sha256:07715784bf4bf5df4407fa5981cba77e6aaf1b1792bb02e1b8f3b73403e4231a +size 52862 diff --git a/tests/UI/expected-screenshots/SupportedBrowser_page_loads_when_browser_supported.png b/tests/UI/expected-screenshots/SupportedBrowser_page_loads_when_browser_supported.png index 062645ff9e..4e9e00331c 100644 --- a/tests/UI/expected-screenshots/SupportedBrowser_page_loads_when_browser_supported.png +++ b/tests/UI/expected-screenshots/SupportedBrowser_page_loads_when_browser_supported.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:969b59308b56cc4f6f6cbbbbbd6c898d111eac0ff15dafb35a053def7a27fe63 -size 222714 +oid sha256:7e9ce05638df6e157d1673db326373122bbb089991cfd6b4f9856cf73982b0e7 +size 222634 diff --git a/tests/UI/expected-screenshots/SupportedBrowser_widget_load_fails_when_browser_not_supported.png b/tests/UI/expected-screenshots/SupportedBrowser_widget_load_fails_when_browser_not_supported.png index dc19084f6f..0c7365afc5 100644 --- a/tests/UI/expected-screenshots/SupportedBrowser_widget_load_fails_when_browser_not_supported.png +++ b/tests/UI/expected-screenshots/SupportedBrowser_widget_load_fails_when_browser_not_supported.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b097ccb4f1678fd1805df8180dc0c6b246fba36013b0c698ba0a98c20478bcf5 -size 53050 +oid sha256:07715784bf4bf5df4407fa5981cba77e6aaf1b1792bb02e1b8f3b73403e4231a +size 52862 diff --git a/tests/UI/expected-screenshots/Theme_demo.png b/tests/UI/expected-screenshots/Theme_demo.png index 5237f5f781..86a331085e 100644 --- a/tests/UI/expected-screenshots/Theme_demo.png +++ b/tests/UI/expected-screenshots/Theme_demo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e4f2f14ca9dfa2a03bbc38c8a6cc49a03fd826ad97f7ced6cfead3a5e04baf9 -size 1669417 +oid sha256:c2c27ee30f16401212cf87a332ac6a4dd6ec7f49168dd730508cfd7f7a82c3aa +size 1670763 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 316beb2e40..3a5e1229d1 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e56973e072c260d6f59f0a301cf4582b27ac348ef08063b4eaea6ece3de700b4 -size 736074 +oid sha256:696bdd1f818c31cd955d3fe680d678e9323ed42dfc354806e2bd14045fdeec5d +size 736004 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png index bcf52b2ab9..a151e9cc0d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6149ce0090eee42e8a092d50945f5cdaa0624c77f721fe8028bedfd974c29571 -size 42554 +oid sha256:dd5fb841266c97caf0923abb7f5ab35b201ca922c14ac14323ad243291f61d1b +size 42081 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png index 42daef27f1..57fe5ca8de 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f5b0980e3e6896064e85e22d20b36d76fe2921cea6d8a8001745d11b98e40ee -size 41698 +oid sha256:e88eb324ed947ac1177fb41eeedb4102a4e16518cf9ef9b30e5cd0e0d75fbb42 +size 41929 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png index 7e7561263b..8673cc604a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f50ef2d83bf302e6613654a76a156a0b325cf8acd226cc106011b0469d4c76a -size 49831 +oid sha256:64268852e9addee0cb9e27ad395ae468bfb8dc3bdb5d9086562e026ec2a509ee +size 50253 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png index 0dedc07fe3..920e80e87f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f61fbc94c5c769ec8a1ed633d4cded381b71310ed239d427a29c858b95eeb1b -size 29520 +oid sha256:46f263989626ee43bdc22c0443e70874f11bb48f3201c7b0536fd532f3f1fb16 +size 29050 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png index 8945ac0ec7..bc1b4870a5 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0853e87f24b81e82f75015e03d66249507d46c1f39f2605a997a5575c99e854d -size 35797 +oid sha256:e7ac276154fb79b82b2bd4f2cfa57f5f0b616ad3d4c5529affed955192182312 +size 37426 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png index 9283f492a4..f47583ff88 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bde69cdddfbf236ccd4899441815b10457d7553f3995a7d6fe84199573c812fa -size 200865 +oid sha256:16725edc1f81aa4a28945fc287679588f40e0fe8495c2fe4643ef60d4d36e65e +size 207678 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png index 4d0f760752..a21c13f770 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0cdb7dc9dd9354c5755a6afe0e65f8780a5b79fcd37d691211cd8dbb64d0686 -size 198537 +oid sha256:c7fb07f07636c9343971d3f157bfaa6dd509ec5fe99553f61725126711d68c95 +size 201111 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png index 51bd2cfd6d..6a2592f0d3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2146d236a6d7adb381de4d6c288482a05ee0b1d7776bbbbe763db0f8e341161a -size 41320 +oid sha256:af2557fa45ff54d962990f830723e319cb0b8ca99f6858a8857963cbc5a10fab +size 43383 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks_vlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks_vlog.png index 0866d7e8a3..08cb157123 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks_vlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks_vlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e846f1e69127e2d179caf84a1deade044cc901314faa59c6231370b742e73039 -size 76835 +oid sha256:740baa83d2f40d82914391ff8987aa936213a4dd4b89d7a38003b030224e950b +size 76833 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png index bfa13ea591..df5f5fe27e 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81935007726ea6f3bc1c5ff39fbf2ae484be485e146d7f745ba297037333d9d4 -size 440014 +oid sha256:1330972f0b432ef6584d7c199adceb0f980ae35c60637bc65daf3a8d71bec539 +size 451746 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png index 0211dac0e2..10edba7109 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:324402bf2e542c2125a741595cfe3c51977fa77495eb20bd8690101f2469135f -size 332613 +oid sha256:3801af69cda4b00839baf5c6ae291adbd3a6663dea8b0a7aae39283e88fef0ee +size 355234 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png index f3f2f9c391..632ca719b2 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff916bdb0df286e11815cfd6083e567e069c64e4df023a2ce256a280d53e3117 -size 349814 +oid sha256:ad3efeb44ea9840ca8dab88a17558efff6bbb518b815cb5b61a3d68a597e66d8 +size 372355 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png index b2eba68093..dc524a8049 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd159c81c029f73c06dbf53e7e7261c88ef2239975eab38b63e0f26cd6ac879e -size 110772 +oid sha256:ded1e376744b9e4983a0fd8ca244bc9758ccbfd47c04a7531fa46eefcb4d7689 +size 113359 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home_admintoken_not_allowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home_admintoken_not_allowed.png index e4471dcaa2..ffd7395b93 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home_admintoken_not_allowed.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home_admintoken_not_allowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a239a77aaa6c89e33e32b90ffe877d041d259104d2579b0c4082a45f8b8bd67 -size 52480 +oid sha256:fdcae2b41602a113a62df5b0c0dcdc6c02489cdad348af7f96322c58bd41197e +size 52305 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png index 6426759251..44bcd5fe88 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7d9b86770ba38bd632ad09e5bcdbaacdcb0b9ff677555f3c08eaf7024c618b6 -size 437076 +oid sha256:5e9192172ae72057ee6c9b490a07140c8dc0f5a026f533b749997bc9e037da0d +size 437078 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png index 19672aff7f..90d6c0f007 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d22be9c7e58626f8b31bec4f0b34a084ec2341dd164a69fdd91b963ff3c0f2ec -size 203733 +oid sha256:30b0c18f0bda277637fe3e9aac30e4ac4c0374cdf080f3cc6d22e388bc0c59af +size 203742 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 5c6e98ae95..37a12d560e 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adea21d64c4043f6c74d766fae109c778ccf5925d4821cb06d02572ec15f416c -size 1084865 +oid sha256:e893437caf916ab2abfde8331dbe0beecd344ddf67d63ebb639664dbe0be3930 +size 1090738 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index a3a9307440..73ec5a90cd 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22f5133b2fc7be7178753cf6e620131e07dd9e8c40ec2a0dcda2b1b010245d01 -size 1086277 +oid sha256:1cba753083ee0d8147f7dfc8fb164890c85a64da5233c18c18f6c712f3ee56d6 +size 1092646 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_optout_iframe.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_optout_iframe.png index 906bca7c7a..c27fe1487f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_optout_iframe.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_optout_iframe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58c17a8c0f7370598c4af1e08c6f3ed0354036b53cddb32cc2f6bcc0afb7a66d -size 34696 +oid sha256:9acee381e739afbc12850700d3c7da4f3261fd307c44aba0d80fab3eb1548386 +size 34578 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index c9c2c14cd7..38e446e41d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:567c7311d8ffca9cc94a58f98fec294cdbe21fca6fc405f01e9f4668fb3ed5da -size 1344697 +oid sha256:687b227bd072a401064b9635fa6144f145d478af5d9f14045e30f3d0f8cd3c29 +size 1402091 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png index feb1c97bcc..dd96c9c392 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dda77295620e3f3d063cdbae1a616eb361d7ba33339dba70a981767697e4c7c0 -size 147389 +oid sha256:83f0824a5b227a4d7236acc50bf764c4f2b1cb21807b4f6aed0f05cc8ab54803 +size 147371 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png index dce7df2e28..1af9ce0137 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5a24ea81cfb5b301cc60dc88ba8b640beb5f163317918164d1bb7a356c88121 -size 79192 +oid sha256:ff3891fec1290b6a16642fece4733e425f9db19a6531177a30e6d6124f179ad9 +size 80187 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png b/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png index bd8eb76ca4..fcdfe5a6db 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9cd69949116dc1c58f178b28ee6b368ebe302ac27f010d440921b5b7e7639cd -size 124912 +oid sha256:564ac2de34dd354ab09ef491f9a4359d12f299d7ffe46dd963b89a037766e21b +size 124917 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 45b32b455b..cdc1300107 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d674684c66f2af95d8a4e61730ebe7248e1ae4b1d597d15e2379e38208173e0c -size 664506 +oid sha256:7afef128cac5eb1ad04b59967a8a2be4365bb0d927624aa91b179fce09b8f9ec +size 662639 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 9456e4ba27..9778721018 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1128bb20b9d5237bab88ea9cabbb519c02111ea65aacc97ec797694bee94f61c -size 1566421 +oid sha256:f5e6d49a5dd27bea015a37d7e3d4fe47f90e03db4bdf6fd8bdd142cbcc14f800 +size 1561035 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index de0b8aed8b..cca0fcfafc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03423fc3b3501ae0e4f2c60d7edec419fd609ceb2b90ffa419eb3bbe01772ff4 -size 707788 +oid sha256:50b4244e726064eb68ae76318e95fd9ac0b4cbe30650700de5bede4f46ab7d77 +size 709410 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png index 21ce306588..da2fc75f77 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee0208648c8e7d8aec34d253a31c800755d362daaa8c2f28dcbf88c92bde8de9 -size 319155 +oid sha256:d1fe235e256d12dbe13c9b44efbc91efe513fb557cfac1b5c4755cacb96254f3 +size 321402 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png index 30d0047ad2..830fb14b42 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91a609b1da16321dc8f4e35996a3b360fd8ff60058b30c2f0a2971699ed35db6 -size 28252 +oid sha256:016ea334e800778ab3b918bc1bfde7109d954029abbfaf1254bfd99d07a29839 +size 28288 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png index 952dc6e7d6..e7c6068bee 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67b00cbec9103edce15aee9ba01ff977f285063434b5d9f6dba66efc0fb407e5 -size 62482 +oid sha256:4e8a2c8f4881e7930d7094c752a1145c3484a0661efd64c66159cbc040ef1c6d +size 62321 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png index d0ec06bbfc..9692c3a27e 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:755b3534304a23c11cd176b221ddd8437cccb0cbf778ea84d4142fa3b357382b -size 724442 +oid sha256:bf50f44857549e60f72257ec36cd6344c2917538fb2705e08c8ed5f254cf51bc +size 724447 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png index 328ddbed18..a12e1fd32c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d6c20e09732036650c180e0d6f4c5123d60b375048a9ae7815f70ec845e21de -size 103757 +oid sha256:87436b8de8c73069da18bd74a89d49ff4b79b3a8efb65ef0b46d0a9de4a17153 +size 103756 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png index 02d3633175..a5fe40a491 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd76354f7b386a5f6480e0bdef564a6093e02b716ce654a5ae0b795e856172ef -size 76414 +oid sha256:f87d17d6c91d4db85c2eca2611348fe1e5613f6fdffc555218226c84faadb6ca +size 76411 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png index 4e672858aa..5fc2f5b0a2 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2099e947efc7c5956b6028eeff2f9140d8a20c6c06c06c11957424ede36c68d -size 52584 +oid sha256:d870cdfc0e8040ae1942eef1137a29593c12eb2f9ff6ded1785860556fd0ff63 +size 55119 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png index 2b06b5e4b4..6addf6f55d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7456afda8d8c1c7c1b56d64b395607ee40da743924a1036c15191193ec8d4b51 -size 91889 +oid sha256:e3e29ca5e758358f795ec28b23e12f587cfdbe7bba0c6e6e208f6ae458c04a67 +size 92245 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png index f7e0216c4d..7ba1f89ad1 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e8ea75d84f2291d0e2f44fb3a31c385f151b5d8c20edf6e767994efabb88c4c -size 96022 +oid sha256:e016c5bda2886901e7728cbeb85f247762e1d37827b5fbb96a26f3ab84eb81ed +size 95499 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_download.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_download.png index 7a76ea821b..02aa5c4374 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_download.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_download.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a03136463f1fae0961ed154f73a5cca02ef73bdf5f990991a4b29ab95843c2d7 -size 99988 +oid sha256:5021ec05018aef0bde067b62a87c88e5305a5af553c2952ec031c88f4add8962 +size 99956 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png index 144b073e5f..6d3d1a9e1b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f11f5b6127eb5951f333b0ff16f386248114badfae7129cfe58c122f643665d -size 476854 +oid sha256:12b4f0d8a2171fd72c678e47f27c23b8eb01962c28f53cefbbeab0a53367d95b +size 476855 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png index a40bf8c306..9308471482 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04d7b728b0d1526085dc431179d2fc97e21d523c92a090d01c270020d5624e00 -size 83127 +oid sha256:c1c04a3d71d642ad92c3a77168d4f9f782b2feb8499520fc70f02a210c9be92c +size 83165 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png index e279e90afe..62641f3104 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bce462c1e98aae9069a8e0eaaac5f2386c8b58cbd5e0fc2a6c407e8cd9efba7 +oid sha256:e045f315f6c115607343fbaf9503aa0d4da170cb293f4aa456959b988db7f66f size 36612 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_pieGraph.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_pieGraph.png index 3a58744086..2d09403b82 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_pieGraph.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_pieGraph.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f5bbd7213c7b811b9bbe9305d67a494a734ffd92982dc8e4256b81b3eba4d5c -size 26986 +oid sha256:e9df509bcc9a936b7051fb2548d6afc80a2fa1d61095b589af3a699369e0f831 +size 27071 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_sparklines.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_sparklines.png index d0936a0913..2c53fb45cb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_sparklines.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_sparklines.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e787d1eafea4f65c4d65db29c4dd739f23d81bb65e25ee60b029d8cd05a11842 -size 18667 +oid sha256:33fa7723583d79b79c67a9556934618f76c5a1adaafc61a387f9bef297086cc9 +size 18689 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_tagClouds.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_tagClouds.png index 667e2eb0fe..124f797c7e 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_tagClouds.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_tagClouds.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:501838623fdc1c5b3dd55de5badb6820ddfcff2eee3b5e61dbe8e660528bb82e -size 64054 +oid sha256:3bb07747453abcc56974f31490078e038474af55fec731f046829168a5508585 +size 64046 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png index d49ecea3a0..27effae25d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e8b2624a0e735afdc0075694609d059f161c98bb4ede782023285bd23e8c0c1 -size 168876 +oid sha256:6de324d3bb129e788006e48004b194709f6d57a9b428ed574807f38956206009 +size 167828 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png index 02d3633175..a5fe40a491 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd76354f7b386a5f6480e0bdef564a6093e02b716ce654a5ae0b795e856172ef -size 76414 +oid sha256:f87d17d6c91d4db85c2eca2611348fe1e5613f6fdffc555218226c84faadb6ca +size 76411 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png index 27a39f1497..6a2c419e9a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8932dc8a53acb1b6af8672756bd0e311d237895627f7c78fdcb7eadfb9274bd9 -size 199699 +oid sha256:77778bdbb2806a5c25dcd4274cea3c5a10b001686b5a566a2d0eeccba3d95c20 +size 200953 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png index 5bbd4ada90..a348fc3c16 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:680438c8bd5a3ed9f4aac11a05add290fd4896ab1500e7119cc283827c0e695b -size 200665 +oid sha256:7506082f30ed91b90344afef6a80f9a0838e5cdfada4eb19433694afc803ed8f +size 201951 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_row_evolution.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_row_evolution.png index cce69490f0..81b176aad4 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_row_evolution.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_row_evolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1de4da447b73d36c4e52460c52abd776f4dd2b6d27e9c24bb36b5e9b34136c7 -size 65399 +oid sha256:600ae76a2c5561c3b2aac2fac3417c197a42a7011e2e96a6b405ba7e108c26e9 +size 65379 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_manage.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_manage.png index f06448b184..cdf5e4713d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_manage.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_manage.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7dc0c1200258c680285f6bdf59c533c11a4171c072183334800f1f7f8825197 -size 51636 +oid sha256:a11641d14ffbae6d186fed6c931a37ea512988b46341ea5f01bf7bc0632b05b6 +size 57139 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png index 7710c447a3..49d5ed838a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ffc2d3df65556b1c9e5a2945774706c347d26169e47c6d9f4fb1bcdf8f615a3 -size 160338 +oid sha256:6d1ef5359c43ef8457231f7f7fb15052adfe17f53d19ac6316e18e1b6fa61849 +size 161886 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite.png b/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite.png index 95600f12e5..5905bf65e8 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5166c07535df6f9ea9b69467f10e1e22b96af4bcc9f236ab1808322b8a4a9ba6 -size 31889 +oid sha256:562a65b35a71b6663475121175bd7fdb7b43c6de681729002362d382bd92d772 +size 31897 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png b/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png index c9a02f92ce..6d01c0d752 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aff5fb3a4269982a8f8ca4ad0ae08fd55b8506cc21caa0398894c4902907eba0 -size 46469 +oid sha256:2a5e246d54cd4f4a0a6fd147c1e0d04229ee04a64b5a43c9c1f61ff75f2e3e33 +size 46339 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png index 8c98104f3d..9f5939cb9a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07119936cc6c840a462e311d19529b274549be3f48a4b815ef124b872572fc62 -size 8451 +oid sha256:16287035e21fc5b870fa65cdc96f2eb1ef7a5872711c907fbc359dd2b4286c2e +size 8863 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_not_logged_in.png b/tests/UI/expected-screenshots/UIIntegrationTest_not_logged_in.png index 85d70b8561..28eb224427 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_not_logged_in.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_not_logged_in.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/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png b/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png index 6b90a55b2f..9a04582ff9 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c23f486e25afaabf72adbed8ce90fe878500ff243301add38b737776a2d435cc -size 47075 +oid sha256:3479e558454298eaa6e895c3dfcd9d8e22ec710520440765a36ff2dd4de2094f +size 47073 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_opt_out.png b/tests/UI/expected-screenshots/UIIntegrationTest_opt_out.png index 177d4245a2..8d97edb1a1 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_opt_out.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_opt_out.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50e4c06ca84fa647addaaf32450f83cb8ec275b91d8fd486d3bcabddef9ecc4e -size 27053 +oid sha256:9ae67bb23583fa5daeef971877c316aa17b8f9969db3ecb731ad2a5db3cf9bdf +size 26900 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png index 6dcc86273d..a83e8c3763 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f31ceb9f9490f763fab53e5668e3448dd01a4f4f23d5735d54911a75692b713 -size 78434 +oid sha256:65ed755dfaa25abf1b5ea7433c77f2a73910382cc11be7d5dd12bd23c643c44d +size 78445 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png index 53df014244..5294782069 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19f403f8fd67fdec87f10cb3323e90526ec306f58dd2e394755d785bdf893fe3 -size 143086 +oid sha256:380d15dafb0d927906fe79068c2ad28773d64f09bd05f07d70e31d542984c127 +size 144351 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png index 4262332840..b1c53ae3df 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f932858f43c1b35f53a21d28972b7d373014eefd75ac71108c4725476dbd3684 -size 70972 +oid sha256:19e7ae6556bde13d974ce8e80cd9053094eea37ca045267a7cf0e28a714d3597 +size 70978 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_overview.png index 0c1da861d7..e8868cc026 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf5286b89e2d25b6ca62cc50d96d304fd8b13b670fa3c5e293c292fe4301a5e8 -size 65201 +oid sha256:0426334adf344729e5c1f1b9dee027a33431f69bfe615dd1e905a200e13dfa59 +size 65319 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png index 7a84327368..aeed06cca5 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28f1227aae954bd32c520a49c934eccd6f6af30151107151f8445807fed9c340 -size 106267 +oid sha256:c278cba544bdd22240023bd5c526e3660b45f413225858d21a9528b2e833b279 +size 106256 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png index 80d3ba82ab..daa4032131 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:216477d93dfd1f85b8b28a12643f05b660cb281cd9468926d47f56a673f1b322 -size 81275 +oid sha256:9444f24668de401ba038f38aa35c279d3912540282211a141282d8f4fc4e2698 +size 83715 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png index 65d995239d..400faa2093 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94031e4b291cf7865bcac42c5c2a310178ff37917cc50003109f4b7d2cca6b7a -size 395462 +oid sha256:521e86c402633149ffb3189589b4d2316cabb5ca6886dae4f6402b79385ffd47 +size 395500 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png index d48b95d20d..aa986e51e3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb0f0b11c11b3ae75a4308416a0445e09f678e7a0a938d0c7605c937e06608a7 -size 564047 +oid sha256:d37bf44a0a952c18972e39df12a14fc5b0223c7eac0c8d3325556bba41bafa00 +size 563940 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png index c5821bc91f..bc1ae46d01 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1daf5bfe5a09a0b4a7c0d9d209fdbba9c3266fc11b036eb8d4e0decb8bf4b6e -size 63238 +oid sha256:ce32da3d292e6917e5b5ecb40733261f05c96637e2507c8a4b55dbec14583f78 +size 63220 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png index 7712948d3f..4b63f94ac7 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d766ebed32e3b80687a702a316c34303d7463a4fa0778eb4d495fdb620056f3 -size 86507 +oid sha256:b55b0f068c2c8999dfa33bf588097fef68772ba3fa7a165fc59e60b88c0152de +size 86512 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png index bc7e7d721a..1fa745a017 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4ab64a6da5d74f415eca7acb443d0c3e1996f60d0d4e32196ddd9db7efcdb86 -size 166075 +oid sha256:010a589cb6b8d1669ff91ed9ac600dee8a988d02c05b1b3a6bd093fd78b83e0d +size 166959 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png index 76f210f29a..5e7a46c6f1 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdc24371de856666ee77a92eed6883d66e2ae453e65e8ae7899619b592a55cc6 -size 158589 +oid sha256:217c059b64dd376af5435c86b384023b095ccdfc12addbba2ac2ba2f1c7793fd +size 158725 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview.png index 13ec92d658..dcfbe9ffa7 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd3f24ba3bcd457eb0ba42504f3380b8c705e2d454a3189acb1ba3948d935c16 -size 65371 +oid sha256:2bd36ea7f557cb64b1b52f19d24d28b53d553d62ec53c5a5ca7633be894759f2 +size 65640 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_columns.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_columns.png index 63f7b46a89..5289baf9b7 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_columns.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_columns.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a5ab344bbc4c6b6653ab5b2efd9bce506fcc7a2010f89f4b68e143526115b6b -size 67525 +oid sha256:349b76e2db49836bbcbdbf4eb57e0a315c8a1b231c853d0373e6c2e18468dc28 +size 67710 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index 8cdef0e6e1..b02ddac951 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:610a4f8fee0d616055287399c3bd773dd9fec00a02ce62809371882fbbd540f4 -size 116862 +oid sha256:1ed91660fe4456189ae8229dba064fa1a5519642f310252212b087c303a6cf90 +size 116786 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_visits.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_visits.png index f1eb7609ea..9a0004dc0a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_visits.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_visits.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a0e3379f3bc6a25a26c14b09f3bb43eafc7f9d10b7a61de11029a93943c0657 -size 70911 +oid sha256:a4a654641682718d2e248a959d43994bf34ca376574b4b910e9812dc06b8fb8e +size 70711 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png index 5a2997de00..6817fd2b39 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1d5dc078825121a8a8453fe21fe1c04c0ca7f8461fe424cb542458de23cb4c6 -size 150059 +oid sha256:979bd9aeb5cdefef76d9455d8342c3ea3764d052a06fe6241808991c05a94354 +size 150063 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png index 87297b9845..2d7125a3be 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c759abf49c55f242512b38134adcffeba8cb1d283d94c0e00064f774245b6f43 -size 69263 +oid sha256:b12e49c5954c30aa7c0674a7d368349373215f448401173dc42c8123c8c67e0c +size 69875 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png index 28a88473e8..1c58f63bb9 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0936c3be862ba6858f67008dd787277eddd220b873f13603d53fd211f459ca26 -size 51454 +oid sha256:89c7b1135cbe34d1d45676bbf0a6e7b473f6b48cfe4405c0672ecc916143d1fa +size 51289 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png index f3948e0c96..a31001b82e 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:075c4b3a1a067b790dfba2ab2b2affa8cd5c1ea977f220f1faa05ae240a7e920 -size 703740 +oid sha256:171fee4f8629a0c09ae815bb3dd4fffdc13529683a51f7e8bcdb99c49e49a3c6 +size 703766 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png index 855e9445cc..f32e639bbb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8161353166803a3d2e4ba8d6c010095dc9c39edc9558020aa8624b79c71eb838 -size 369967 +oid sha256:304dc4781d378c3a6e869e53d1a6463e178b75eb9fb8d0ed0dc5ad4e1345950b +size 369951 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png index e56a435f04..6e52fedadd 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51fb745020d3d4957801211b9d813dfdf76634a8ccb367b6d7fee22770bbe549 -size 190849 +oid sha256:56b0b949a91ea6afd697e1f6e37e132eb3531ff34cb1884c857c0b0f59f9715c +size 190846 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png index c3d391533f..cd108098a4 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18fd9c871bbfbfeb6ce2d5eb9750e29847d457c42403642d277864a8e84caecd -size 48995 +oid sha256:bdfe1b1e4914de4e411e1f4df93b51fe5dd82ca2451c329d9314274d34004631 +size 48998 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png index f47be80009..9b719546a7 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a928d1f079382464dee29f12f8622d68ec1534eba1c7c6362b7ebd98bee13af -size 59988 +oid sha256:84ffe9dbb9b92b82d00ca5e29fc5814a32a8d1078871d387aadfb66dc43f78ed +size 59993 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png index 7e687684c9..413b161509 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f93487671529445bfa4e3d7316c69e0b8ae74e202a4b9d81ff0204980729e34 -size 71172 +oid sha256:a9c6730df28a89452658cc38bf3d74f6346978d72dbacd57a4f243fd2ccae445 +size 71177 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png index 00e34a7638..5ab47e080e 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cd5b267325be3a85f8bf5e7a933735f8807e7bf60807ee1db8d88615c81ef0c -size 73395 +oid sha256:9192f89a7c844562c562d2fed12c8b21d36914a2146677e28ae3ed19270353c2 +size 73402 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png index f47be80009..9b719546a7 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a928d1f079382464dee29f12f8622d68ec1534eba1c7c6362b7ebd98bee13af -size 59988 +oid sha256:84ffe9dbb9b92b82d00ca5e29fc5814a32a8d1078871d387aadfb66dc43f78ed +size 59993 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png index 76b80599ce..f5d6d616ea 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fd7c8da4e31aa6510fed062e3354ad28f67cdd2028caecae78c144118b9bd75 -size 65883 +oid sha256:590f3b00937ec25b1199cc6b07779209a93badb0863d6e8baf14af983d42f7ce +size 65887 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png index c9f79296a5..8f0403e591 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69405ddef9a841a15ef19f147b1aa6f391e1fd37edda5aa094e5839a9823de77 -size 45284 +oid sha256:80bb094fd4d73090c9a1edd04eaf421c4af6e112ac18698f28838bc42734bf9e +size 45295 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png index 8bdbcc6837..556260f9a8 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15ea76bf06c6845b184e18349670214ea52ee593e18bd59789c6f7ae67851912 -size 60674 +oid sha256:bc361f8943a4ad8fdf6697a3d6fe2a5a672eb356e904621c63c480af4b2dcaae +size 61000 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png index 0c19f6736c..d3316ac0a6 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a003e8912a3bd74e103433485c286a9f665586138a7f7bcff221ef4f499904b4 -size 60530 +oid sha256:08a3166ec824a02bb0002c5115514ffc26ff5724bc656dea51235bd26ad4a450 +size 61578 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png index 8153bc216d..d9d7ed40b7 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00886907faf8e7ec933ba0527d8b1db7c2ec5b426657dc6c8edd5c28aa6bdd70 -size 53845 +oid sha256:3084c024ce720613a4bb02a79ff35fd117a000c72fcd2e83b6156e61d4deb586 +size 54408 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png index 6b58dc1565..c3ca30817f 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47ac419ef7d73db1131e1000df38d93ac4329fa3c07654a53576526173cf0868 -size 68051 +oid sha256:4ec657773497e2aaa1478e9071acc41f5da2cb906bf978d4b645125522dc3e53 +size 74971 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png b/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png index 8ffde724dd..d7f5870431 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e719d1aea6b14730b3748479b3cc8d2704102b2f63b8eb59f9e47d2548e16a5 -size 37332 +oid sha256:3ffe5d0120aad1eca2fa25c6e0f162319c5f000726b32465c904ed57612b4060 +size 37341 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png b/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png index 4aec2ef78d..7c10f20dd9 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40dac08d2925f6f76c29906a22f09202493e2fb84795b7faf57c51571a9a15da -size 53031 +oid sha256:636afc734eea71a7b1c53ccb5c6ddd73ad7642fde5a981af3188e49a0fc39600 +size 53001 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png b/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png index f30dd7e90a..b90acf9312 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a72a417a8d936d4df19b6248e4f78279193942a3b53a53542d0b8b628478103f -size 85464 +oid sha256:f4c587b941268ff65717d6e6104f4753def469ab1d8121549a37aa8571c81a94 +size 85470 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png index a18fdaff15..80dc0b9ba2 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bafedf49719411ae47c54f6e4659846e2feeab007a83ded339b0a736d6df224 -size 85522 +oid sha256:53a809e6a20ba7fd396fc264b34a7c00751737cc807641a41866402016e94d0b +size 85538 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_dimension_columns.png b/tests/UI/expected-screenshots/ViewDataTableTest_dimension_columns.png index 8474b844d3..6cff7aa71e 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_dimension_columns.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_dimension_columns.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6c7d3a975c26e94c57b081ebdb69c34d71657af9315d51686640d2a2c01159e -size 74859 +oid sha256:f72bebf95c16a84c9a2b028039d5499552f8c761781fcf6b3fce6dcd5dfa6d7c +size 74767 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_dimension_search.png b/tests/UI/expected-screenshots/ViewDataTableTest_dimension_search.png index c07b8f6359..947fbf000e 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_dimension_search.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_dimension_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47536574242e8c47872efc2bada8874f858822c4eea4e09cbdaf1fd7c101065c -size 43944 +oid sha256:793deb1a37dde9d9f149d46ebe87ecf93568299ffe6d3f780a3aea59b174d1be +size 44131 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png b/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png index ec338f652a..d5a58838f0 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dbd73a8a23a418a716ca321e4dcaecd173093a763c5ae654a57b2c9188cefd4 -size 40255 +oid sha256:389deca6013d3575bb4d278d31acbf47f436783614ec344ddf46a8f817d795d5 +size 42033 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png b/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png index 1b36fbe26c..6223807871 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a76d043ca6e47ac61eafe7021b0517f4027cf71241c3d2db5f94bb6a01e1d8cd -size 38269 +oid sha256:518ab97c72b6d5d8ed34d61305afc84cca930bc878fd63818e819e61124ef7ac +size 38286 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png b/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png index 65313321f4..22b949abf0 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aa9989fa09893a4ddc2e03ec18813aed714d1a57fc29d64353a473efd12333a -size 77051 +oid sha256:4f58298d5af090ef7f3bfd99b2cbb02f9e8486c8a5bf59c3bbee89d34cf09701 +size 77111 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_flatten_search.png b/tests/UI/expected-screenshots/ViewDataTableTest_flatten_search.png index f443553b21..b30fea7b50 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_flatten_search.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_flatten_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88b1a5d8324425909ee91805a5898784e8b4ad9586be9a7b359d841c608f230d -size 43944 +oid sha256:80fe4bf9ccf6f0a4a644c3ed7893b6466e1bbc68ca64814ca101ead6e6204fa1 +size 43955 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png index a16c97606c..807d7b7360 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea42bb09c6c07ca53ac9ddf69cf82db9b2488abe1b738e75758e076a17c9ace7 -size 89687 +oid sha256:a84302a197fa7866fda8c42dfbb5bdbf00d8d81b6617bcc88bc2a03ec3416b6b +size 89697 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png index 44bd6c6995..be50d8849c 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1611a9b08b7832cbb579e74a35aec5960c256237e23b478f13254ea8b3311669 -size 38858 +oid sha256:70f9693e227137984b8d5025d1ac144cd5de1559da0a187ba2da973357472998 +size 38863 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png index 4f1c7804be..1af7444aef 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9791d1c72e4e1a70c3589b208affd49553be396fff101874c07c759a71dcfef8 -size 79344 +oid sha256:1dadfd9b7c12b4cda557e4828d87bfd0f959624a7a7f19acf5865bd8ab519e4d +size 79323 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png b/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png index 67bade6989..ff9a55c27d 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:239e947b6dab5e1a7215cb00104cd463b5b2dce9658bbdb5f571c0c5e2492579 -size 49882 +oid sha256:2db95ba37171985f8b9f86d4b1b1ab6d838b55fd50b76c766e2ad88b3e494132 +size 49879 diff --git a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png index 45eeff3fe0..ef96d02c44 100644 --- a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png +++ b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0761dd02d1ba037b77f207d86127b40dd60e4953c89ed40da2316f3c429a8843 -size 232641 +oid sha256:fc155ae78fca63dc3480696b6e4668e0b04d599a4970d857ec86d483d437ec4c +size 232780 diff --git a/tests/UI/specs/BarGraph_spec.js b/tests/UI/specs/BarGraph_spec.js index 7ef3a562e5..66dffdf63a 100644 --- a/tests/UI/specs/BarGraph_spec.js +++ b/tests/UI/specs/BarGraph_spec.js @@ -38,7 +38,7 @@ describe("BarGraph", function () { var element = await page.jQuery('.jqplot-seriespicker-popover input:not(:checked):first'); await element.click(); await page.waitForNetworkIdle(); - await page.waitFor(500); + await page.waitForTimeout(500); expect(await page.screenshot({ fullPage: true })).to.matchImage('other_metric'); }); });
\ No newline at end of file diff --git a/tests/UI/specs/Comparison_spec.js b/tests/UI/specs/Comparison_spec.js index 43340c8ad1..801e67a18a 100644 --- a/tests/UI/specs/Comparison_spec.js +++ b/tests/UI/specs/Comparison_spec.js @@ -40,14 +40,14 @@ describe("Comparison", function () { await page.click('#periodString #date'); - await page.waitFor('input#comparePeriodTo', { visible: true }); + await page.waitForSelector('input#comparePeriodTo', { visible: true }); await page.click('input#comparePeriodTo + span'); await page.click('#calendarApply'); await page.waitForNetworkIdle(); - await page.waitFor('.widget'); + await page.waitForSelector('.widget'); await page.waitForNetworkIdle(); - await page.waitFor('.piwik-graph'); + await page.waitForSelector('.piwik-graph'); const pageWrap = await page.$('.pageWrap'); expect(await pageWrap.screenshot()).to.matchImage('dashboard_last_period'); @@ -57,7 +57,7 @@ describe("Comparison", function () { await page.click('.segmentationContainer'); await (await page.jQuery('li[data-idsegment=2] .compareSegment', { waitFor: true })).click(); await page.waitForNetworkIdle(); - await page.waitFor('.widget'); + await page.waitForSelector('.widget'); await page.waitForNetworkIdle(); const pageWrap = await page.$('.pageWrap'); @@ -66,7 +66,7 @@ describe("Comparison", function () { it('should not show comparisons for pages that do not support it', async () => { await (await page.jQuery('li.menuTab:contains(Behaviour)')).click(); - await page.waitFor(100); + await page.waitForTimeout(100); await (await page.jQuery('a.item:contains(Transitions)')).click(); await page.waitForNetworkIdle(); @@ -76,10 +76,10 @@ describe("Comparison", function () { it('should show extra serieses when comparing in evolution graphs and sparklines', async () => { await (await page.jQuery('li.menuTab:contains(Visitors)')).click(); - await page.waitFor(100); + await page.waitForTimeout(100); await (await page.jQuery('li.menuTab:contains(Visitors) a.item:contains(Overview)')).click(); await page.waitForNetworkIdle(); - await page.waitFor('.piwik-graph'); + await page.waitForSelector('.piwik-graph'); const pageWrap = await page.$('.pageWrap'); expect(await pageWrap.screenshot()).to.matchImage('visitors_overview'); @@ -97,7 +97,7 @@ describe("Comparison", function () { it('should show the tooltip correctly in an evolution graph', async () => { await page.hover('.piwik-graph'); - await page.waitFor(250); + await page.waitForTimeout(250); const element = await page.$('.ui-tooltip'); expect(await element.screenshot()).to.matchImage('visitors_overview_tooltip'); @@ -115,7 +115,7 @@ describe("Comparison", function () { it('should remove period comparison if period is selected w/o compare set', async () => { await page.click('#periodString .periodSelector'); - await page.waitFor('input#comparePeriodTo', { visible: true }); + await page.waitForSelector('input#comparePeriodTo', { visible: true }); await page.click('input#comparePeriodTo + span'); await page.click('#calendarApply'); @@ -148,7 +148,7 @@ describe("Comparison", function () { it('should show the correct percentages and tooltip during comparison', async () => { const element = await page.jQuery('span.ratio:visible:eq(1)'); await element.hover(); - const tooltip = await page.waitFor('.ui-tooltip', { visible: true }); + const tooltip = await page.waitForSelector('.ui-tooltip', { visible: true }); expect(await tooltip.screenshot()).to.matchImage('totals_tooltip'); }); @@ -169,7 +169,7 @@ describe("Comparison", function () { (await page.$$('tr.subDataTable'))[0].click(); await page.waitForNetworkIdle(); - await page.waitFor(function () { + await page.waitForFunction(function () { return $('.cellSubDataTable > .dataTable').length === 1; }); @@ -205,7 +205,7 @@ describe("Comparison", function () { it('should show the multirow evolution popup for another comparison series', async () => { await page.click('.rowevolution-startmulti'); - await page.waitFor(250); + await page.waitForTimeout(250); const row = await page.jQuery('tbody tr.comparisonRow:visible:eq(0)'); await row.hover(); diff --git a/tests/UI/specs/EmptySite_spec.js b/tests/UI/specs/EmptySite_spec.js index fa4d3eba83..3b3af1a57c 100644 --- a/tests/UI/specs/EmptySite_spec.js +++ b/tests/UI/specs/EmptySite_spec.js @@ -31,7 +31,7 @@ describe("EmptySite", function () { await page.reload(); await page.click('.ignoreSitesWithoutData'); - await page.waitFor('.widget'); + await page.waitForSelector('.widget'); await page.waitForNetworkIdle(); const pageElement = await page.$('.page'); diff --git a/tests/UI/specs/EvolutionGraph_spec.js b/tests/UI/specs/EvolutionGraph_spec.js index 70072fbbcd..28e24ebd0a 100644 --- a/tests/UI/specs/EvolutionGraph_spec.js +++ b/tests/UI/specs/EvolutionGraph_spec.js @@ -51,7 +51,7 @@ describe("EvolutionGraph", function () { const element = await page.jQuery('.jqplot-seriespicker-popover input:not(:checked):first'); await element.click(); await page.waitForNetworkIdle(); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await page.screenshot({ fullPage: true })).to.matchImage('two_metrics'); }); @@ -200,7 +200,7 @@ describe("EvolutionGraph", function () { await page.click('.activatePeriodsSelection'); await page.mouse.move(-10, -10); - await page.waitFor(500); // wait for animation + await page.waitForTimeout(500); // wait for animation expect(await page.screenshot({ fullPage: true })).to.matchImage('periods_list'); }); diff --git a/tests/UI/specs/JSTracker_spec.js b/tests/UI/specs/JSTracker_spec.js index f9b71f1a49..2b7cd5a367 100644 --- a/tests/UI/specs/JSTracker_spec.js +++ b/tests/UI/specs/JSTracker_spec.js @@ -26,7 +26,7 @@ describe("JSTracker", function () { // view another page await page.evaluate(() => $('a:contains(Page 3)')[0].click()); await page.waitForNetworkIdle(); - await page.waitFor(500); + await page.waitForTimeout(500); await page.waitForNetworkIdle(); // visit visitor log for correct date diff --git a/tests/UI/specs/MeasurableManager_spec.js b/tests/UI/specs/MeasurableManager_spec.js index 56ba07db5c..9a786f340f 100644 --- a/tests/UI/specs/MeasurableManager_spec.js +++ b/tests/UI/specs/MeasurableManager_spec.js @@ -36,8 +36,8 @@ describe("MeasurableManager", function () { it("should show selection of available types when adding a type", async function () { const element = await page.jQuery('.SitesManager .addSite:first'); await element.click(); - await page.waitFor('.modal.open'); - await page.waitFor(350); // wait for modal animation + await page.waitForSelector('.modal.open'); + await page.waitForTimeout(350); // wait for modal animation await assertScreenshotEquals("add_new_dialog", '.modal.open'); }); @@ -45,12 +45,12 @@ describe("MeasurableManager", function () { const element = await page.jQuery('.modal.open .btn:contains(Mobile App)'); await element.click(); - await page.waitFor('input.btn[value=Save]'); + await page.waitForSelector('input.btn[value=Save]'); await page.waitForNetworkIdle(); await page.evaluate(function () { $('.form-help:contains(UTC time is)').hide(); }); - await page.waitFor(250); + await page.waitForTimeout(250); await assertScreenshotEquals("add_measurable_view", '#content.admin'); }); diff --git a/tests/UI/specs/Menus_spec.js b/tests/UI/specs/Menus_spec.js index d40011cbcd..a065e5d9b1 100644 --- a/tests/UI/specs/Menus_spec.js +++ b/tests/UI/specs/Menus_spec.js @@ -21,7 +21,7 @@ describe("Menus", function () { // main menu tests it('should load the main reporting menu correctly', async function() { await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Actions&subcategory=General_Pages"); - await page.waitFor('#secondNavBar', { visible: true }); + await page.waitForSelector('#secondNavBar', { visible: true }); const element = await page.jQuery('#secondNavBar'); expect(await element.screenshot()).to.matchImage('mainmenu_loaded'); @@ -44,7 +44,7 @@ describe("Menus", function () { // admin menu tests it('should load the admin reporting menu correctly', async function() { await page.goto("?" + generalParams + "&module=CoreAdminHome&action=generalSettings"); - await page.waitFor('#secondNavBar'); + await page.waitForSelector('#secondNavBar'); const element = await page.jQuery('#secondNavBar'); expect(await element.screenshot()).to.matchImage('admin_loaded'); @@ -53,7 +53,7 @@ describe("Menus", function () { it('should toggle the submenu visibility when main item is clicked', async function() { await openMenuItem(page, 'Website'); await page.mouse.move(0, 0); - await page.waitFor(500); // wait for animation + await page.waitForTimeout(500); // wait for animation const element = await page.jQuery('#secondNavBar'); expect(await element.screenshot()).to.matchImage('admin_websites'); @@ -62,7 +62,7 @@ describe("Menus", function () { it('should change the admin page correctly when an admin menu item is clicked', async function() { await openMenuItem(page, 'Manage'); await page.waitForNetworkIdle(); - await page.waitFor('#secondNavBar'); + await page.waitForSelector('#secondNavBar'); const element = await page.jQuery('#secondNavBar'); expect(await element.screenshot()).to.matchImage('admin_changed'); @@ -72,11 +72,11 @@ describe("Menus", function () { it('should load the admin reporting menu correctly on mobile', async function() { page.webpage.setViewport({ width: 768, height: 512 }); await page.goto("?" + generalParams + "&module=CoreAdminHome&action=index"); - await page.waitFor('.pageWrap'); + await page.waitForSelector('.pageWrap'); await page.evaluate(function(){ $('.activateTopMenu>span').click(); }); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await page.screenshot({ fullPage: true })).to.matchImage('mobile_top'); }); diff --git a/tests/UI/specs/OneClickUpdate_spec.js b/tests/UI/specs/OneClickUpdate_spec.js index c636439e37..e0029c36ba 100644 --- a/tests/UI/specs/OneClickUpdate_spec.js +++ b/tests/UI/specs/OneClickUpdate_spec.js @@ -18,18 +18,18 @@ describe("OneClickUpdate", function () { it('should show the new version available button in the admin screen', async function () { await page.goto(latestStableUrl); - await page.waitFor('#login_form_login', { visible: true }); + await page.waitForSelector('#login_form_login', { visible: true }); await page.type('#login_form_login', 'superUserLogin'); await page.type('#login_form_password', 'superUserPass'); await page.click('#login_form_submit'); await page.waitForNetworkIdle(); - await page.waitFor('.pageWrap'); + await page.waitForSelector('.pageWrap'); await page.goto(settingsUrl); - const element = await page.waitFor('#header_message', { visible: true }); + const element = await page.waitForSelector('#header_message', { visible: true }); expect(await element.screenshot()).to.matchImage('latest_version_available'); }); @@ -37,7 +37,7 @@ describe("OneClickUpdate", function () { await page.click('#header_message'); await page.waitForNetworkIdle(); - await page.waitFor('.content'); + await page.waitForSelector('.content'); expect(await page.screenshot({ fullPage: true })).to.matchImage('update_screen'); }); @@ -45,14 +45,14 @@ describe("OneClickUpdate", function () { it('should fail to automatically update when trying to update over https fails', async function () { await page.click('#updateAutomatically'); await page.waitForNetworkIdle(); - await page.waitFor('.content'); + await page.waitForSelector('.content'); expect(await page.screenshot({ fullPage: true })).to.matchImage('update_fail'); }); it('should update successfully and show the finished update screen', async function () { await page.click('#updateUsingHttp'); await page.waitForNetworkIdle(); - await page.waitFor('.content'); + await page.waitForSelector('.content'); expect(await page.screenshot({ fullPage: true })).to.matchImage('update_success'); }); @@ -66,7 +66,7 @@ describe("OneClickUpdate", function () { if (submitButton) { await submitButton.click(); await page.waitForNetworkIdle(); - await page.waitFor(250); + await page.waitForTimeout(250); const continueButton = await page.$('.footer a'); if (continueButton) { // finish page might not be displayed if only one query is executed @@ -78,7 +78,7 @@ describe("OneClickUpdate", function () { } } - await page.waitFor('.site-without-data', { visible: true }); + await page.waitForSelector('.site-without-data', { visible: true }); await page.waitForNetworkIdle(); const element = await page.$('.site-without-data'); diff --git a/tests/UI/specs/OnlyRawDataNotification_spec.js b/tests/UI/specs/OnlyRawDataNotification_spec.js index 41b5081ca1..2a88094f5f 100644 --- a/tests/UI/specs/OnlyRawDataNotification_spec.js +++ b/tests/UI/specs/OnlyRawDataNotification_spec.js @@ -27,7 +27,7 @@ describe("OnlyRawDataNotification", function () { it("should show notification when only raw data exists", async function () { await page.goto(pageUrl); - await page.waitFor('.widget'); + await page.waitForSelector('.widget'); const notificationContainer = await page.$('#notificationContainer'); expect(await notificationContainer.screenshot()).to.matchImage('show_notification_when_only_raw_data_exists'); }); diff --git a/tests/UI/specs/OptOutForm_spec.js b/tests/UI/specs/OptOutForm_spec.js index 6289489569..1cb863a618 100644 --- a/tests/UI/specs/OptOutForm_spec.js +++ b/tests/UI/specs/OptOutForm_spec.js @@ -42,7 +42,7 @@ describe("OptOutForm", function () { $('iframe#optOutIframe').contents().find('input#trackVisits').click(); }); - await page.waitFor(5000); // opt out iframe creates a new page, so we can't wait on it that easily + await page.waitForTimeout(5000); // opt out iframe creates a new page, so we can't wait on it that easily await page.waitForNetworkIdle(); // safety await expandIframe(); @@ -69,7 +69,7 @@ describe("OptOutForm", function () { $('iframe#optOutIframe').contents().find('input#trackVisits').click(); }); - await page.waitFor(5000); + await page.waitForTimeout(5000); await expandIframe(); @@ -81,7 +81,7 @@ describe("OptOutForm", function () { $('iframe#optOutIframe').contents().find('input#trackVisits').click(); }); - await page.waitFor(5000); + await page.waitForTimeout(5000); // check the box has outed out state after click another time await page.reload(); @@ -109,7 +109,7 @@ describe("OptOutForm", function () { $('iframe#optOutIframe').contents().find('input#trackVisits').click(); }); - await page.waitFor(5000); // opt out iframe creates a new page, so we can't wait on it that easily + await page.waitForTimeout(5000); // opt out iframe creates a new page, so we can't wait on it that easily await page.waitForNetworkIdle(); // safety await page.goto(siteUrl); // reload to check that cookie was set diff --git a/tests/UI/specs/PeriodSelector_spec.js b/tests/UI/specs/PeriodSelector_spec.js index bfe207b918..8863b3919e 100644 --- a/tests/UI/specs/PeriodSelector_spec.js +++ b/tests/UI/specs/PeriodSelector_spec.js @@ -63,7 +63,7 @@ describe("PeriodSelector", function () { it("should change the date when a date is clicked in week-period mode", async function() { await page.click('#period_id_week'); - await page.waitFor(250); // wait for animation + await page.waitForTimeout(250); // wait for animation const element = await page.jQuery('.period-date .ui-datepicker-calendar a:contains(13)'); await element.click(); @@ -73,7 +73,7 @@ describe("PeriodSelector", function () { it("should change the date when a date is clicked in month-period mode", async function() { await page.click('#period_id_month'); - await page.waitFor(250); // wait for animation + await page.waitForTimeout(250); // wait for animation const element = await page.jQuery('.period-date .ui-datepicker-calendar a:contains(14)'); await element.click(); @@ -83,7 +83,7 @@ describe("PeriodSelector", function () { it("should change the date when a date is clicked in year-period mode", async function() { await page.click('#period_id_year'); - await page.waitFor(250); // wait for animation + await page.waitForTimeout(250); // wait for animation const element = await page.jQuery('.period-date .ui-datepicker-calendar a:contains(15)'); await element.click(); @@ -93,7 +93,7 @@ describe("PeriodSelector", function () { it("should display the range picker when the range radio button is clicked", async function() { await page.click('#period_id_range'); - await page.waitFor(250); // wait for animation + await page.waitForTimeout(250); // wait for animation expect(await page.screenshotSelector(selector)).to.matchImage('range_picker_displayed'); }); @@ -106,14 +106,14 @@ describe("PeriodSelector", function () { await element.click(); await page.hover('#calendarApply'); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await page.screenshotSelector(selector)).to.matchImage('date_range_selected'); }); it("should enable the comparison dropdown when 'compare' is checked", async function () { await page.click('#comparePeriodTo + span'); - await page.waitFor(250); // wait for animation + await page.waitForTimeout(250); // wait for animation expect(await page.screenshotSelector(selector)).to.matchImage('comparison_checked'); }); @@ -122,7 +122,7 @@ describe("PeriodSelector", function () { await page.evaluate(function () { $('#comparePeriodToDropdown select').val('string:custom').trigger('change'); }); - await page.waitFor(250); // wait for animation + await page.waitForTimeout(250); // wait for animation expect(await page.screenshotSelector(selector)).to.matchImage('custom_comparison'); }); @@ -130,7 +130,7 @@ describe("PeriodSelector", function () { it('should show an error when invalid date/period combination is given', async function () { await page.goto('about:blank'); await page.goto(url.replace(/date=[^&#]+&/, 'date=2020-08-08,2020-08-09&')); - await page.waitFor(250); + await page.waitForTimeout(250); expect(await page.screenshotSelector(selector + ',#notificationContainer')).to.matchImage('invalid'); }); diff --git a/tests/UI/specs/PivotByDimension_spec.js b/tests/UI/specs/PivotByDimension_spec.js index cd0e2ab8f2..3559599f10 100644 --- a/tests/UI/specs/PivotByDimension_spec.js +++ b/tests/UI/specs/PivotByDimension_spec.js @@ -52,7 +52,7 @@ describe("PivotByDimension", function () { await page.waitForNetworkIdle(); await page.mouse.move(-15, -15); // make sure nothing is highlighted - await page.waitFor(100); + await page.waitForTimeout(100); expect(await page.screenshotSelector('.dataTable,.expandDataTableFooterDrawer')).to.matchImage({ imageName: 'pivoted_columns_report', diff --git a/tests/UI/specs/QuickAccess_spec.js b/tests/UI/specs/QuickAccess_spec.js index d77426dc88..65dcb32c6f 100644 --- a/tests/UI/specs/QuickAccess_spec.js +++ b/tests/UI/specs/QuickAccess_spec.js @@ -32,19 +32,19 @@ describe("QuickAccess", function () { it("should search for something and update view", async function () { await enterSearchTerm('s'); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await page.screenshotSelector(selectorToCapture)).to.matchImage('search_1'); }); it("should search again when typing another letter", async function () { await enterSearchTerm('as'); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await page.screenshotSelector(selectorToCapture)).to.matchImage('search_2'); }); it("should show message if no results", async function () { await enterSearchTerm('alaskdjfs'); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await page.screenshotSelector(selectorToCapture)).to.matchImage('search_no_result'); }); diff --git a/tests/UI/specs/SiteSelector_spec.js b/tests/UI/specs/SiteSelector_spec.js index 032d6d12c8..68bc8e25d8 100644 --- a/tests/UI/specs/SiteSelector_spec.js +++ b/tests/UI/specs/SiteSelector_spec.js @@ -33,7 +33,7 @@ describe("SiteSelector", function () { it("should show no results when search returns no results", async function() { await page.type(".websiteSearch", "abc"); - await page.waitFor(500); + await page.waitForTimeout(500); await page.waitForNetworkIdle(); expect(await page.screenshotSelector(selectorToCapture)).to.matchImage('search_no_results'); @@ -43,7 +43,7 @@ describe("SiteSelector", function () { await page.click('.reset'); await page.type(".websiteSearch", "s"); await page.waitForNetworkIdle(); - await page.waitFor(500); + await page.waitForTimeout(500); expect(await page.screenshotSelector(selectorToCapture)).to.matchImage('search_one_char'); }); @@ -51,7 +51,7 @@ describe("SiteSelector", function () { it("should search again when second character typed into search input", async function() { await page.type(".websiteSearch", "t"); await page.waitForNetworkIdle(); - await page.waitFor(500); + await page.waitForTimeout(500); expect(await page.screenshotSelector(selectorToCapture)).to.matchImage('search_two_chars'); }); diff --git a/tests/UI/specs/Theme_spec.js b/tests/UI/specs/Theme_spec.js index def0b0bc5c..fe5c49eaef 100644 --- a/tests/UI/specs/Theme_spec.js +++ b/tests/UI/specs/Theme_spec.js @@ -48,19 +48,19 @@ describe("Theme", function () { it("should use the current theme", async function () { await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2012-08-09"); - await page.waitFor(500); // wait for angular finished rendering + await page.waitForTimeout(500); // wait for angular finished rendering expect(await page.screenshot({ fullPage: true })).to.matchImage('home'); }); it("should theme the UI demo page", async function () { await page.goto("?module=Morpheus&action=demo"); - await page.waitFor('.progressbar img'); + await page.waitForSelector('.progressbar img'); await page.evaluate(() => { $('img[src~=loading],.progressbar img').each(function () { $(this).hide(); }); }); - await page.waitFor(500); // wait for angular finished rendering + await page.waitForTimeout(500); // wait for angular finished rendering await page.waitForNetworkIdle(); expect(await page.screenshot({ fullPage: true })).to.matchImage('demo'); }); diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js index ebe14e74e1..6b58ad14ec 100644 --- a/tests/UI/specs/UIIntegration_spec.js +++ b/tests/UI/specs/UIIntegration_spec.js @@ -74,7 +74,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? it("should load dashboard2 correctly", async function () { await page.goto("?" + urlBase + "#?" + generalParams + "&category=Dashboard_Dashboard&subcategory=2"); - await page.waitFor('.widget'); + await page.waitForSelector('.widget'); await page.waitForNetworkIdle(); pageWrap = await page.$('.pageWrap'); @@ -83,7 +83,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? it("should load dashboard3 correctly", async function () { await page.goto("?" + urlBase + "#?" + generalParams + "&category=Dashboard_Dashboard&subcategory=3"); - await page.waitFor('.widget'); + await page.waitForSelector('.widget'); await page.waitForNetworkIdle(); pageWrap = await page.$('.pageWrap'); @@ -93,7 +93,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? it("should load dashboard4 correctly", async function () { await page.goto("?" + urlBase + "#?" + generalParams + "&category=Dashboard_Dashboard&subcategory=4"); await page.waitForNetworkIdle(); - await page.waitFor('.widget'); + await page.waitForSelector('.widget'); await page.waitForNetworkIdle(); pageWrap = await page.$('.pageWrap'); @@ -133,7 +133,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? await page.goto("?" + urlBase + "#?" + generalParams + "&category=Dashboard_Dashboard&subcategory=1"); await page.waitForNetworkIdle(); await page.keyboard.press('?'); - await page.waitFor(500); // wait for animation to end + await page.waitForTimeout(500); // wait for animation to end modal = await page.$('.modal.open'); expect(await modal.screenshot()).to.matchImage('shortcuts'); @@ -142,7 +142,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? it('should show category help correctly', async function () { await page.goto('about:blank'); await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=General_Overview"); - await page.waitFor('.dataTable'); + await page.waitForSelector('.dataTable'); await (await page.jQuery('#secondNavBar ul ul li[role=menuitem]:contains(Overview):eq(0)')).hover(); await (await page.jQuery('#secondNavBar ul ul li[role=menuitem]:contains(Overview):eq(0) .item-help-icon')).click(); expect(await page.screenshotSelector('#secondNavBar,#notificationContainer')).to.matchImage('category_help'); @@ -316,15 +316,15 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? + "&removeOldVisits=0"); await page.waitForSelector('circle'); - await page.waitFor(250); // rendering + await page.waitForTimeout(250); // rendering await (await page.jQuery('circle:eq(0)')).hover(); - await page.waitFor('.ui-tooltip', {visible: true}); // wait for tooltip + await page.waitForSelector('.ui-tooltip', {visible: true}); // wait for tooltip await page.evaluate(function () { $('.ui-tooltip:visible .rel-time').data('actiontime', (Date.now() - (4 * 24 * 60 * 60 * 1000)) / 1000); }); // updating the time might take up to one second - await page.waitFor(1000); + await page.waitForTimeout(1000); expect(await page.screenshotSelector('.pageWrap,.ui-tooltip')).to.matchImage('visitors_realtime_map'); }); @@ -358,7 +358,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? elem = await page.$('[piwik-enriched-headline]'); await elem.hover(); await page.click('.helpIcon'); - await page.waitFor(100); + await page.waitForTimeout(100); await page.evaluate(function () { $('.helpDate:visible').hide(); }); @@ -507,7 +507,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? $('.columnDocumentation:visible').addClass('permadocs'); }); - await page.waitFor(100); + await page.waitForTimeout(100); expect(await tip.screenshot()).to.matchImage('metric_tooltip'); }); @@ -667,7 +667,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? it('should load the example ui > treemap page correctly', async function () { await page.goto("?" + urlBase + "#?" + generalParams + "&category=ExampleUI_UiFramework&subcategory=Treemap"); await page.waitForNetworkIdle(); - await page.waitFor(500); + await page.waitForTimeout(500); pageWrap = await page.$('.pageWrap'); expect(await pageWrap.screenshot()).to.matchImage('exampleui_treemap'); @@ -809,7 +809,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? await page.evaluate(function () { $('textarea:eq(0)').trigger('focus'); }); - await page.waitFor(750); + await page.waitForTimeout(750); pageWrap = await page.$('.pageWrap'); expect(await pageWrap.screenshot()).to.matchImage('admin_settings_general'); @@ -924,14 +924,14 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? visitors = await page.jQuery('.widgetpreview-categorylist>li:contains(Visitors):first'); await visitors.hover(); await visitors.click(); - await page.waitFor(100); + await page.waitForTimeout(100); visitorsOT = await page.jQuery('.widgetpreview-widgetlist li:contains(Visits Over Time)'); await visitorsOT.hover(); await visitorsOT.click(); await page.waitForNetworkIdle(); - await page.waitFor('.widgetpreview-preview .widget', {visible: true}); + await page.waitForSelector('.widgetpreview-preview .widget', {visible: true}); await page.evaluate(function () { $('.formEmbedCode').each(function () { @@ -990,7 +990,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? $('#inputCalendarFrom').val('2012-08-02'); $('#inputCalendarTo').val('2012-08-12'); }); - await page.waitFor(500); + await page.waitForTimeout(500); await page.evaluate(() => $('#calendarApply').click()); await page.mouse.move(-10, -10); @@ -1010,7 +1010,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? await (await page.waitForSelector('.visitor-profile-show-map')).click(); await page.waitForNetworkIdle(); - await page.waitFor(200); + await page.waitForTimeout(200); expect(await page.screenshot({fullPage: true})).to.matchImage('visitor_profile_popup'); }); @@ -1056,7 +1056,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? await page.evaluate(function () { $('.segmentationTitle').click(); }); - await page.waitFor(100); + await page.waitForTimeout(100); await page.evaluate(function () { $('.segname:contains(From Europe)').click(); }); @@ -1105,7 +1105,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? await page.waitForNetworkIdle(); await page.goto(adminUrl); - await page.waitFor('#notificationContainer'); + await page.waitForSelector('#notificationContainer'); const pageWrap = await page.$('.pageWrap, #notificationContainer'); expect(await pageWrap.screenshot()).to.matchImage('api_error'); @@ -1134,7 +1134,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? await page.waitForNetworkIdle(); const frame = page.frames().find(f => f.name() === 'embed'); - await frame.waitFor('.widget'); + await frame.waitForSelector('.widget'); expect(await page.screenshot({ fullPage: true })).to.matchImage('embed_whole_app'); }); diff --git a/tests/UI/specs/ViewDataTable_spec.js b/tests/UI/specs/ViewDataTable_spec.js index b32160ed01..44e8c34040 100644 --- a/tests/UI/specs/ViewDataTable_spec.js +++ b/tests/UI/specs/ViewDataTable_spec.js @@ -48,7 +48,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f it("should show all available visualizations for this report", async function () { await page.click('.activateVisualizationSelection > span'); await page.mouse.move(-10, -10); - await page.waitFor(1000); // wait for animation + await page.waitForTimeout(1000); // wait for animation const element = await page.$('.dataTableFooterIcons'); expect(await element.screenshot()).to.matchImage('5_visualizations'); @@ -92,7 +92,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f it("should show the limit selector when the limit selector is clicked", async function () { await page.click('.limitSelection input'); await page.mouse.move(-10, -10); - await page.waitFor(200); + await page.waitForTimeout(200); expect(await page.screenshot({ fullPage: true })).to.matchImage('limit_selector_open'); }); @@ -127,7 +127,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f await page.click('.searchAction .icon-search'); await page.waitForNetworkIdle(); await page.evaluate(() => document.activeElement.blur()); - await page.waitFor(500); + await page.waitForTimeout(500); expect(await page.screenshot({ fullPage: true })).to.matchImage('dimension_search'); }); @@ -144,7 +144,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f await page.click('.dataTableShowDimensions'); await page.mouse.move(-10, -10); await page.waitForNetworkIdle(); - await page.waitFor(500); + await page.waitForTimeout(500); await page.evaluate(() => document.activeElement.blur()); expect(await page.screenshot({ fullPage: true })).to.matchImage('dimension_search'); }); @@ -180,7 +180,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f await page.mouse.move(-10, -10); // make sure no krow is highlighted await page.waitForNetworkIdle(); - await page.waitFor(function () { + await page.waitForFunction(function () { return $('.cellSubDataTable > .dataTable').length === 2; }); @@ -194,13 +194,13 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f await page.click('.searchAction .icon-search'); await page.waitForNetworkIdle(); await page.evaluate(() => document.activeElement.blur()); - await page.waitFor(500); + await page.waitForTimeout(500); expect(await page.screenshot({ fullPage: true })).to.matchImage('15_search'); }); it("should display the export popover when clicking the export icon", async function () { await page.click('.activateExportSelection'); - await page.waitFor('#reportExport .btn'); + await page.waitForSelector('#reportExport .btn'); let dialog = await page.$('.ui-dialog'); expect(await dialog.screenshot()).to.matchImage('export_options'); @@ -209,9 +209,10 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f it("should display the ENTER_YOUR_TOKEN_AUTH_HERE text in the export url", async function () { await page.goto(url.replace(/filter_limit=5/, 'filter_limit=10') + '&flat=1'); await page.click('.activateExportSelection'); - await page.waitFor('.toggle-export-url'); + await page.waitForSelector('.toggle-export-url'); await page.click('.toggle-export-url'); - await page.waitFor('.exportFullUrl'); + await page.waitForSelector('.exportFullUrl'); + await page.waitForTimeout(250); let dialog = await page.$('.ui-dialog'); expect(await dialog.screenshot()).to.matchImage('export_options_2'); diff --git a/tests/javascript/testrunnerNode.js b/tests/javascript/testrunnerNode.js index 5b97d93eec..218039e6eb 100644 --- a/tests/javascript/testrunnerNode.js +++ b/tests/javascript/testrunnerNode.js @@ -23,7 +23,7 @@ async function main() { }); await page.goto(url); - await page.waitFor(() => window.QUnit); + await page.waitForFunction(() => window.QUnit); await page.evaluate(() => { window.testsDone = false; @@ -57,7 +57,7 @@ async function main() { }); }); - await page.waitFor(() => !!window.testsDone, {timeout: 600000}); + await page.waitForFunction(() => !!window.testsDone, {timeout: 600000}); var success = await page.evaluate(function() { return window.testsSuccessfull; diff --git a/tests/lib/screenshot-testing/package-lock.json b/tests/lib/screenshot-testing/package-lock.json index 939bebc790..2823676361 100644 --- a/tests/lib/screenshot-testing/package-lock.json +++ b/tests/lib/screenshot-testing/package-lock.json @@ -4,10 +4,20 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@types/mime-types": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz", - "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=" + "@types/node": { + "version": "16.6.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.6.0.tgz", + "integrity": "sha512-OyiZPohMMjZEYqcVo/UJ04GyAxXOJEZO/FpzyXxcH4r/ArrVoXHf4MbUrkLp0Tz7/p1mMKpo5zJ6ZHl8XBNthQ==", + "optional": true + }, + "@types/yauzl": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", + "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==", + "optional": true, + "requires": { + "@types/node": "*" + } }, "accepts": { "version": "1.3.7", @@ -24,9 +34,27 @@ "integrity": "sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==" }, "agent-base": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", - "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==" + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "requires": { + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } }, "ajv": { "version": "6.12.6", @@ -92,11 +120,6 @@ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==" }, - "async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" - }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -127,6 +150,11 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + }, "bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", @@ -135,6 +163,16 @@ "tweetnacl": "^0.14.3" } }, + "bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "requires": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -154,16 +192,20 @@ "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==" }, + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" - }, "bytes": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", @@ -253,6 +295,11 @@ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=" }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -313,17 +360,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", @@ -429,6 +465,11 @@ } } }, + "devtools-protocol": { + "version": "0.0.854822", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.854822.tgz", + "integrity": "sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg==" + }, "diff": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", @@ -453,6 +494,14 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "requires": { + "once": "^1.4.0" + } + }, "error-inject": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz", @@ -515,36 +564,28 @@ } }, "extract-zip": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", - "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "requires": { - "concat-stream": "^1.6.2", - "debug": "^2.6.9", - "mkdirp": "^0.5.4", + "@types/yauzl": "^2.9.1", + "debug": "^4.1.1", + "get-stream": "^5.1.0", "yauzl": "^2.10.0" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { - "ms": "2.0.0" + "ms": "2.1.2" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, - "mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", - "requires": { - "minimist": "^1.2.5" - } + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, @@ -592,6 +633,15 @@ "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==" }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -612,6 +662,11 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + }, "fs-extra": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", @@ -632,6 +687,14 @@ "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=" }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "requires": { + "pump": "^3.0.0" + } + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -780,20 +843,20 @@ } }, "https-proxy-agent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", - "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", "requires": { - "agent-base": "5", + "agent-base": "6", "debug": "4" }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -808,6 +871,11 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=" }, + "ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + }, "inflation": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz", @@ -1130,6 +1198,14 @@ "koa-send": "^3.2.0" } }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -1154,11 +1230,6 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, - "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" - }, "mime-db": { "version": "1.40.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", @@ -1198,6 +1269,11 @@ "minimist": "0.0.8" } }, + "mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + }, "mocha": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", @@ -1259,6 +1335,11 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", @@ -1319,6 +1400,27 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, "parse-passwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", @@ -1329,6 +1431,11 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -1357,10 +1464,13 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } }, "progress": { "version": "2.0.3", @@ -1382,47 +1492,45 @@ "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, "puppeteer": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz", - "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz", + "integrity": "sha512-D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==", "requires": { - "@types/mime-types": "^2.1.0", "debug": "^4.1.0", - "extract-zip": "^1.6.6", - "https-proxy-agent": "^4.0.0", - "mime": "^2.0.3", - "mime-types": "^2.1.25", + "devtools-protocol": "0.0.854822", + "extract-zip": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "pkg-dir": "^4.2.0", "progress": "^2.0.1", - "proxy-from-env": "^1.0.0", - "rimraf": "^2.6.1", - "ws": "^6.1.0" + "proxy-from-env": "^1.1.0", + "rimraf": "^3.0.2", + "tar-fs": "^2.0.0", + "unbzip2-stream": "^1.3.3", + "ws": "^7.2.3" }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "mime-db": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", - "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" - }, - "mime-types": { - "version": "2.1.26", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", - "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { - "mime-db": "1.43.0" + "ms": "2.1.2" } }, "ms": { @@ -1483,24 +1591,13 @@ "integrity": "sha512-XzgvowFrwDo6TWcpJ/WTiarb9UI6lhA4PMzS7n1joK3sHfBBBOQHUc0U4u57D6DWO9vHv6lVSWx2Q/Ymfyv4hw==" }, "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - } + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } }, "recursive-readdir": { @@ -1627,17 +1724,17 @@ } }, "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "requires": { "glob": "^7.1.3" }, "dependencies": { "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -1796,11 +1893,18 @@ } }, "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } } }, "strip-ansi": { @@ -1816,6 +1920,29 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, + "tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "requires": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "requires": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -1891,10 +2018,14 @@ "mime-types": "~2.1.24" } }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + "unbzip2-stream": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "requires": { + "buffer": "^5.2.1", + "through": "^2.3.8" + } }, "universalify": { "version": "0.1.2", @@ -1915,9 +2046,9 @@ } }, "url-parse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz", - "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", + "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -1977,12 +2108,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", - "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", - "requires": { - "async-limiter": "~1.0.0" - } + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", + "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==" }, "yallist": { "version": "2.1.2", diff --git a/tests/lib/screenshot-testing/package.json b/tests/lib/screenshot-testing/package.json index c06cfdb774..08af0a4a64 100644 --- a/tests/lib/screenshot-testing/package.json +++ b/tests/lib/screenshot-testing/package.json @@ -10,9 +10,9 @@ "chai-image-assert": "^1.2.0", "fs-extra": "^7.0.1", "mocha": "^5.2.0", - "puppeteer": "^2.1.1", + "puppeteer": "^8.0.0", "request": "^2.88.2", "request-promise": "^4.2.6", - "url-parse": "^1.5.1" + "url-parse": "^1.5.3" } } diff --git a/tests/lib/screenshot-testing/support/chai-extras.js b/tests/lib/screenshot-testing/support/chai-extras.js index a2aad8d729..e807412b57 100644 --- a/tests/lib/screenshot-testing/support/chai-extras.js +++ b/tests/lib/screenshot-testing/support/chai-extras.js @@ -150,8 +150,8 @@ module.exports = function makeChaiImageAssert(comparisonCommand = 'compare') { // allow a 10 pixel difference only chai.assert(pixelError <= 10, `images differ in ${pixelError} pixels (command output: ${allOutput.replace(/\s+$/g, '')})`); - // if pixel error passes, but status is non-zero for some reason - chai.assert(result.status === 0, `the '${comparisonCommand}' command returned a non-zero status: ${result.status}. Output was ${allOutput.replace(/\s+$/g, '')}`); + // if pixel error passes, but status is unexpected for some reason + chai.assert(result.status === 0 || result.status === 1, `the '${comparisonCommand}' command returned a unexpected status: ${result.status}. Output was ${allOutput.replace(/\s+$/g, '')}`); return true; } diff --git a/tests/lib/screenshot-testing/support/page-renderer.js b/tests/lib/screenshot-testing/support/page-renderer.js index 45cabd8de2..7afb156615 100644 --- a/tests/lib/screenshot-testing/support/page-renderer.js +++ b/tests/lib/screenshot-testing/support/page-renderer.js @@ -55,10 +55,10 @@ const PAGE_METHODS_TO_PROXY = [ 'type', 'url', 'viewport', - 'waitFor', 'waitForFunction', 'waitForNavigation', 'waitForSelector', + 'waitForTimeout', 'waitForXPath', ]; @@ -110,6 +110,21 @@ PageRenderer.prototype._reset = function () { }); }; +/** + * For BC only. Puppeteer drop support for waitFor function in Version 10 + * @param selectorOrTimeoutOrFunction + */ +PageRenderer.prototype.waitFor = function (selectorOrTimeoutOrFunction) { + console.log('Using page.waitFor is deprecated, please use one of this instead: waitForSelector, waitForFunction, waitForTimeout'); + if (typeof selectorOrTimeoutOrFunction === 'function') { + this.webpage.waitForFunction(selectorOrTimeoutOrFunction) + } else if (typeof selectorOrTimeoutOrFunction === 'number') { + this.webpage.waitForTimeout(selectorOrTimeoutOrFunction) + } else if (typeof selectorOrTimeoutOrFunction === 'string') { + this.webpage.waitForSelector(selectorOrTimeoutOrFunction) + } +} + PageRenderer.prototype.isVisible = function (selector) { return this.webpage.evaluate(() => { return jQuery(selector).is(':visible'); @@ -121,11 +136,11 @@ PageRenderer.prototype.jQuery = async function (selector, options = {}) { ++this.selectorMarkerClass; - await this.waitFor(() => !! window.jQuery); + await this.waitForFunction(() => !! window.jQuery); if (options.waitFor) { try { - await this.waitFor((selector) => { + await this.waitForFunction((selector) => { return !!jQuery(selector).length; }, {}, selector); } catch (err) { @@ -142,7 +157,7 @@ PageRenderer.prototype.jQuery = async function (selector, options = {}) { }; PageRenderer.prototype.screenshotSelector = async function (selector) { - await this.waitFor(() => !! window.$, { timeout: 60000 }); + await this.waitForFunction(() => !! window.$, { timeout: 60000 }); const result = await this.webpage.evaluate(function (selector) { window.jQuery('html').addClass('uiTest'); @@ -250,7 +265,7 @@ PAGE_METHODS_TO_PROXY.forEach(function (methodName) { let result; if (methodName === 'screenshot') { // change viewport to entire page before screenshot - result = this.webpage.waitFor(() => !! document.documentElement) + result = this.webpage.waitForFunction(() => !! document.documentElement) .then(() => { return this.webpage.evaluate(() => JSON.stringify({ width: document.documentElement.scrollWidth, @@ -386,33 +401,25 @@ PageRenderer.prototype._setupWebpageEvents = function () { --this.activeRequestCount; const failure = request.failure(); + const response = request.response(); const errorMessage = failure ? failure.errorText : 'Unknown error'; if (!VERBOSE) { this._logMessage('Unable to load resource (URL:' + request.url() + '): ' + errorMessage); } - if (request.url().indexOf('action=getCss')) { - if (errorMessage === 'net::ERR_ABORTED') { - console.log('CSS request aborted.'); - } else if (request.url().indexOf('&reload=1') === -1) { - console.log('Loading CSS failed (' + errorMessage + ')... Try adding it with another style tag.'); - await this.webpage.addStyleTag({url: request.url() + '&reload=1'}); // add another get parameter to ensure browser doesn't use cache - await this.webpage.waitFor(1000); - } else { - console.log('Reloading CSS failed (' + errorMessage + ').'); - } - } - - if (request.url().indexOf('action=getCoreJs')) { - if (errorMessage === 'net::ERR_ABORTED') { - console.log('JS request aborted.'); - } else if (request.url().indexOf('&reload=1') === -1) { - console.log('Loading JS failed (' + errorMessage + ')... Try adding it with another script tag.'); - await this.webpage.addScriptTag({url: request.url() + '&reload=1'}); // add another get parameter to ensure browser doesn't use cache - await this.webpage.waitFor(1000); + var type = ''; + if (type = request.url().match(/action=get(Css|CoreJs|NonCoreJs)/)) { + if (errorMessage === 'net::ERR_ABORTED' && (!response || response.status() !== 500)) { + console.log(type[1]+' request aborted.'); + } else if (request.url().indexOf('&reload=') === -1) { + console.log('Loading '+type[1]+' failed (' + errorMessage + ')... Try adding it with another tag.'); + var method = type[1] == 'Css' ? 'addStyleTag' : 'addScriptTag'; + await this.waitForNetworkIdle(); // wait for other requests to finish before trying to reload + await this.webpage[method]({url: request.url() + '&reload=' + Date.now()}); // add another get parameter to ensure browser doesn't use cache + await this.webpage.waitForTimeout(1000); } else { - console.log('Reloading JS failed (' + errorMessage + ').'); + console.log('Reloading '+type[1]+' failed (' + errorMessage + ').'); } } }); @@ -427,19 +434,22 @@ PageRenderer.prototype._setupWebpageEvents = function () { this._logMessage(message); } - // if response of css request does not start with /*, we assume it had an error and try to load it again + // if response of css or js request does not start with /*, we assume it had an error and try to load it again // Note: We can't do that in requestfailed only, as the response code might be 200 even if it throws an exception - if (request.url().indexOf('action=getCss') !== -1) { + var type = ''; + if (type = request.url().match(/action=get(Css|CoreJs|NonCoreJs)/)) { var body = await response.buffer(); if (body.toString().substring(0, 2) === '/*') { return; } - if (request.url().indexOf('&reload=1') === -1) { - console.log('Loading CSS failed... Try adding it with another style tag.'); - await this.webpage.addStyleTag({url: request.url() + '&reload=1'}); // add another get parameter to ensure browser doesn't use cache - await this.webpage.waitFor(1000); + if (request.url().indexOf('&reload=') === -1) { + console.log('Loading '+type[1]+' failed... Try adding it with another tag.'); + var method = type[1] == 'Css' ? 'addStyleTag' : 'addScriptTag'; + await this.waitForNetworkIdle(); // wait for other requests to finish before trying to reload + await this.webpage[method]({url: request.url() + '&reload=' + Date.now()}); // add another get parameter to ensure browser doesn't use cache + await this.webpage.waitForTimeout(1000); } else { - console.log('Reloading CSS failed.'); + console.log('Reloading '+type[1]+' failed.'); } console.log('Response (size "' + body.length + '", status "' + response.status() + ', headers "' + JSON.stringify(response.headers()) + '"): ' + request.url() + "\n" + body.toString()); } |