From caf5b95a8ef1728e7f12bee0baf4e51917925152 Mon Sep 17 00:00:00 2001 From: dizzy Date: Wed, 1 Dec 2021 01:23:43 -0800 Subject: [PATCH] do not use real mysql version in tests for running UI tests (#18407) * do not use real mysql version in tests for running UI tests locally * undo customalerts update * update screenshot * updates expected screenshots Co-authored-by: sgiehl --- plugins/CoreHome/Widgets/GetSystemSummary.php | 5 +++++ .../UI/expected-screenshots/DashboardManager_removed.png | 4 ++-- .../tests/UI/expected-screenshots/Dashboard_removed.png | 4 ++-- .../EmptySite_emptySiteDashboard_ignored.png | 4 ++-- tests/UI/expected-screenshots/Theme_home.png | 4 ++-- .../UI/expected-screenshots/UIIntegrationTest_admin_home.png | 4 ++-- .../UI/expected-screenshots/UIIntegrationTest_api_error.png | 4 ++-- .../UI/expected-screenshots/UIIntegrationTest_dashboard1.png | 4 ++-- 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/plugins/CoreHome/Widgets/GetSystemSummary.php b/plugins/CoreHome/Widgets/GetSystemSummary.php index 3d56a997901..362fc6817cb 100644 --- a/plugins/CoreHome/Widgets/GetSystemSummary.php +++ b/plugins/CoreHome/Widgets/GetSystemSummary.php @@ -20,6 +20,7 @@ class GetSystemSummary extends Widget { + const TEST_MYSQL_VERSION = 'mysql-version-redacted'; /** * @var StoredSegmentService */ @@ -108,6 +109,10 @@ public function render() private function getMySqlVersion() { + if (defined('PIWIK_TEST_MODE')) { + return self::TEST_MYSQL_VERSION; + } + $db = Db::get(); return $db->getServerVersion(); } diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index 7a774080188..0c5f7def65d 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:6761130ea8280414c4692cd272961ae1dd0865fb429ed5333497ad83cce4adb8 -size 481164 +oid sha256:810cfc5ce32f1ee1902352bb3304204bfae7b684cae6a183956a694b7bbd06fb +size 481367 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index 053668c66f1..c062ed194ed 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:5b2d70d1fc339caf961b9372fb33d3b48a472e26ea0fd6e08dbcb6e9c50e1647 -size 742857 +oid sha256:e2628cb9ae6606add2435568934c92bb9b39d8ff4d6b484d306d9c4968f88721 +size 743230 diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png index ae05336b664..212214bf1e8 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:2c9684922e24d6d842b2052fe579218afe18ec0474ebb39d4d51879c3f315f7c -size 377102 +oid sha256:92d30918a85e6ecfb5c099792d4eb247ae93bdf2d5a17eb093cf5c51c9d81da3 +size 377439 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 012bc48d62a..6e1225a70ca 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:02301c0f6ca92260949c1fd295f6fedc4f8f26ce5e7bcb415e8325d7af5636db -size 735179 +oid sha256:006e73196beb17804559d52d7a0614cc7c277e91c5d8fdaa17ea663ea20f337d +size 735199 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index c6b4122e540..12f3be76873 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17ea00cec479ee24773810393f1b1e6a678caf78aa9b649e6ed99b497580c8de -size 161295 +oid sha256:3fd51340965b49d612bc3b6c269ada8cd816b7c31e62544b4efd76c7ab6046cc +size 161567 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png index c6b4122e540..12f3be76873 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17ea00cec479ee24773810393f1b1e6a678caf78aa9b649e6ed99b497580c8de -size 161295 +oid sha256:3fd51340965b49d612bc3b6c269ada8cd816b7c31e62544b4efd76c7ab6046cc +size 161567 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 063802a2c37..452524bb45a 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:e79c58d93b04fd180a00df211a56343a37ab354353c96184b759bb4f52b9af18 -size 661894 +oid sha256:cd5784bd249cca39da04d1ff40f624607666834875b20e07e04de31b3da63d36 +size 662080