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 d0b64d1315b..e3051785813 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:a8920fbf8eb36ea6e97cb813dd9e23920157e6f715973d3816a03f0cb67cec38 -size 313485 +oid sha256:e249dcfd3d6c5dd376f02dd941e0dd77f39a63137ebf7e302909f8fa51659e61 +size 313469 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png index b71973f1406..557c5af83c5 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:c693c10e0ead11e5d5e212d76036970158e848559a471d08225f3d32849821e3 -size 375987 +oid sha256:e83f9cbd716c3904012109de5e731fec452a70ddfabe0c4ddbc896d4ff7be41a +size 375911 diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png index fac7dc01716..67fdc97a030 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:f5efb505ffa5d1e68f7bffc50701391c69d3d1d866dc8268ce9ecef939623a06 -size 445467 +oid sha256:c586102da6a34417c4868ca3d4762f813962dcd2001c6ce283ae373972510aa6 +size 444934 diff --git a/plugins/SEO/tests/Integration/SEOTest.php b/plugins/SEO/tests/Integration/SEOTest.php index 6c9a9d27efd..182046764b0 100644 --- a/plugins/SEO/tests/Integration/SEOTest.php +++ b/plugins/SEO/tests/Integration/SEOTest.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\SEO\tests\Integration; use Piwik\DataTable\Renderer; +use Piwik\Piwik; use Piwik\Plugins\SEO\API; use Exception; use Piwik\Tests\Framework\Mock\FakeAccess; @@ -46,16 +47,13 @@ public function setUp(): void */ public function test_API() { - try { - $dataTable = API::getInstance()->getRank('http://www.microsoft.com/'); - } catch(Exception $e) { - $this->markTestSkipped('A SEO http request failed, Skipping this test for now. Error was: '.$e->getMessage()); - } + $dataTable = API::getInstance()->getRank('http://www.microsoft.com/'); $renderer = Renderer::factory('json'); $renderer->setTable($dataTable); $ranks = json_decode($renderer->render(), true); foreach ($ranks as $rank) { - if ($rank["id"] == "alexa") { // alexa is broken at the moment + if ($rank['rank'] == Piwik::translate('General_Error')) { + $this->markTestSkipped('An exception raised when fetching data. Skipping this test for now.'); continue; } $this->assertNotEmpty($rank['rank'], $rank['id'] . ' expected non-zero rank, got [' . $rank['rank'] . ']'); diff --git a/plugins/UserCountryMap/svg/world.svg b/plugins/UserCountryMap/svg/world.svg index bcb6fad8b9d..850e79f7da5 100644 --- a/plugins/UserCountryMap/svg/world.svg +++ b/plugins/UserCountryMap/svg/world.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file 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 c11c3e0d721..49f0a0de33d 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:338c2b1955aaafe666252c0cc3a21ad534b996ee941346b64c6616df6d1fad54 -size 182978 +oid sha256:4072cf29f83a44a4d61d4acda5bfb50c3b9da6f50417cdc58c225ef945b40217 +size 182956 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 2cc7b28cded..f22234873ae 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:996d28ee9812fae950cbf1f9cfd398fb66e60c3b25078905b10deb2dfdba5b10 -size 182285 +oid sha256:e51ead0e59962605f47aedc6b5153a5f4cfd9a3365899439e40c4e054d320d7d +size 182284 diff --git a/plugins/UsersManager/tests/UI/UsersManager_spec.js b/plugins/UsersManager/tests/UI/UsersManager_spec.js index 3e934ff0426..f4be261acb0 100644 --- a/plugins/UsersManager/tests/UI/UsersManager_spec.js +++ b/plugins/UsersManager/tests/UI/UsersManager_spec.js @@ -309,7 +309,7 @@ describe("UsersManager", function () { expect(await page.screenshotSelector('.usersManager')).to.matchImage({ imageName: 'permissions_bulk_access_set', - comparisonThreshold: 0.02 + comparisonThreshold: 0.025 }); }); diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index b9cb1a72ec3..f5c111c31eb 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:60364fa5ab35735de224a559a87277ea4c61381aa831d09528ecbc16d975e419 -size 707529 +oid sha256:b0c05d3be9ec1ab8eeec0bd7163bdf33030ef26029cacdbf38933d5f75eea8d8 +size 707778 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png index efe5aad2d31..41b8c99010a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ada04b2aa243cf02ed279acbc1860f582002649275a11daf7614226410533cbd -size 184675 +oid sha256:66d13f079fb1127d46de080b61e572a28abc8e0e6d5c63d9207d6c79fb914f01 +size 184667 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png index 5c0b882fadb..76f210f29a6 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:9d44956fbb3cc3d224aa2c83a1ecd9b1f63efa7a1d4f6e72ec07cc2688dbe455 -size 158592 +oid sha256:cdc24371de856666ee77a92eed6883d66e2ae453e65e8ae7899619b592a55cc6 +size 158589 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index 7d667eb627f..8cdef0e6e1b 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:368b31c19f12436b07a937ed8b28a22acc6d3f21fe7e0ccf4f07b9d9b57f9185 -size 116830 +oid sha256:610a4f8fee0d616055287399c3bd773dd9fec00a02ce62809371882fbbd540f4 +size 116862 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 7c529e2a4e5..51407fc3fe2 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:143ffd857e20caf7b82decffbc2aaffa6151a7284b5bc484b2fa448698e69eaa -size 232431 +oid sha256:4b78cb08a817c7bc53b2c97a96a4fe1db1fdc09a26838a01545fe2d73565e8cf +size 232430