From a491cf74587b471d03aa03d512f8e2d322f822b4 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Mon, 18 Nov 2024 11:38:01 +0100 Subject: [PATCH] update tests --- plugins/Marketplace/tests/Integration/PluginsTest.php | 7 +++++-- ...es_with_valid_license_disabled_multiUserEnvironment.png | 4 ++-- ...tplace_themes_with_valid_license_disabled_superuser.png | 4 ++-- ...Marketplace_themes_with_valid_license_disabled_user.png | 4 ++-- ...lace_themes_with_valid_license_multiUserEnvironment.png | 4 ++-- .../Marketplace_themes_with_valid_license_superuser.png | 4 ++-- .../Marketplace_themes_with_valid_license_user.png | 4 ++-- .../AllWebsitesDashboard_dashboard.png | 4 ++-- .../AllWebsitesDashboard_evolution_change.png | 4 ++-- .../AllWebsitesDashboard_no_sparklines.png | 4 ++-- .../AllWebsitesDashboard_widgetized.png | 4 ++-- ...ta_year__LanguagesManager.getAvailableLanguageNames.xml | 4 ++-- tests/PHPUnit/Unit/Translation/TranslatorTest.php | 4 ++-- 13 files changed, 29 insertions(+), 26 deletions(-) diff --git a/plugins/Marketplace/tests/Integration/PluginsTest.php b/plugins/Marketplace/tests/Integration/PluginsTest.php index d8e6c9c886f..525b4a33094 100644 --- a/plugins/Marketplace/tests/Integration/PluginsTest.php +++ b/plugins/Marketplace/tests/Integration/PluginsTest.php @@ -16,6 +16,7 @@ use Piwik\Plugins\Marketplace\Plugins; use Piwik\Plugins\Marketplace\tests\Framework\Mock\Client; use Piwik\Plugins\Marketplace\tests\Framework\Mock\Service; +use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\Mock\ProfessionalServices\Advertising; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Piwik\Plugin; @@ -191,6 +192,8 @@ public function testGetPluginInfoNoSuchPluginExists() public function testGetPluginInfoNotInstalledPluginShouldEnrichPluginInformation() { + Fixture::loadAllTranslations(); + $this->service->returnFixture('v2.0_plugins_Barometer_info.json'); $plugin = $this->plugins->getPluginInfo('Barometer'); @@ -269,7 +272,7 @@ public function testGetPluginInfoNotInstalledPluginShouldEnrichPluginInformation 'homepage' => 'http://geekproject.eu', ],], 'repositoryUrl' => 'https://github.com/halfdan/piwik-barometer-plugin', - 'lastUpdated' => 'Intl_4or41Intl_Time_AMt_357Intl_Time_AMt_S12ort', + 'lastUpdated' => 'Dec 23, 2014', 'latestVersion' => '0.5.0', 'numDownloads' => 0, 'screenshots' => @@ -310,7 +313,7 @@ public function testGetPluginInfoNotInstalledPluginShouldEnrichPluginInformation 'canBePurchased' => false, 'isEligibleForFreeTrial' => false, 'priceFrom' => null, - 'numDownloadsPretty' => 0, + 'numDownloadsPretty' => '0', 'hasDownloadLink' => true, 'licenseStatus' => '', 'category' => 'customisation', diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_multiUserEnvironment.png index cd9a9449e37..e323e7016e7 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:005979564796db60b443cbbeb25f8b76dafab3fe79d8869a120a8828e4bf7e24 -size 165427 +oid sha256:bb0de3b0b75f1867abf7d95fa11f007d224bd326a6ca695b9a5decc0747d151b +size 166289 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_superuser.png index 17aa4cee412..644d90ec2dc 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e3c0c77ebb0a3269b2a2a0783907b12bb1cd9ac6a0df5f45ee2d05a49d625a4 -size 155910 +oid sha256:76d19668c33b2c37ef5ef9941a415b7de36045f4a44ff9411a597f860146534b +size 156896 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_user.png index d1a81907320..1c74571282c 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d62d4d81b1f386fc171d013bdd05d3ccd6c96c6f6192552680198b1d134d579 -size 156515 +oid sha256:a332b9b30eccc77ecbc737335168d0c9d97232271aa9a82b8239646262ad5259 +size 157469 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 cd9a9449e37..e323e7016e7 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:005979564796db60b443cbbeb25f8b76dafab3fe79d8869a120a8828e4bf7e24 -size 165427 +oid sha256:bb0de3b0b75f1867abf7d95fa11f007d224bd326a6ca695b9a5decc0747d151b +size 166289 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 afd367ede1f..3c7c8e15781 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:309a4c5476f70eb58fc5735776c289ef13eba074a58a0405fd8ab78e60c06ad0 -size 156950 +oid sha256:d344549944c8a5ef37cbfd876d13c534cfa5d5222b91a0276587d7dfcfcccea6 +size 157828 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png index d1a81907320..1c74571282c 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d62d4d81b1f386fc171d013bdd05d3ccd6c96c6f6192552680198b1d134d579 -size 156515 +oid sha256:a332b9b30eccc77ecbc737335168d0c9d97232271aa9a82b8239646262ad5259 +size 157469 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_dashboard.png b/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_dashboard.png index 6b24d66a3ee..a09487813a9 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_dashboard.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_dashboard.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d57ba3d3576bfaf3888f278f21b4bfc8c65d22da257c9d920c7d560fd322071c -size 80648 +oid sha256:745f84e3336645cb4f8d24d472ce26d99cbd58280010b200f87d8a41c198272d +size 79055 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_evolution_change.png b/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_evolution_change.png index 02196e049b8..c60c4d492ca 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_evolution_change.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_evolution_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dc76362ca3d31e8ace82c4159131b3ba30956acc17097c9e59d5ad144612108 -size 79977 +oid sha256:57afb354bc287b54ef2221f40e74468fbf3c613e7be4b563627e90f6205d849a +size 78384 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_no_sparklines.png b/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_no_sparklines.png index 24678a5ed18..4a0cb0b4be4 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_no_sparklines.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_no_sparklines.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ec9e5f0eafd28f83cac0bad5be781b47df027c02daf7f3fad699677eb440e76 -size 79109 +oid sha256:c288fcfb594c5146c655565686a25abbbf263e39aea09f3fd284e5c07c414624 +size 77460 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_widgetized.png b/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_widgetized.png index dc11db1eae5..38f2faf7a82 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_widgetized.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_widgetized.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac540ba0084b71daff1e9b3fbba2b79214e93361c6bdbdc1de17a864c004a034 -size 73389 +oid sha256:e822ecfe2b58c8a310062236437528893492e598939acf6574866e0f0e2fcb9e +size 71482 diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml index 287716ad5d8..ae69043aff6 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml @@ -157,7 +157,7 @@ ka - ქართული + Ქართული Georgian @@ -167,7 +167,7 @@ ku - Kurdî + Kurdî (kurmancî) Kurdish diff --git a/tests/PHPUnit/Unit/Translation/TranslatorTest.php b/tests/PHPUnit/Unit/Translation/TranslatorTest.php index b3040c7c4be..09c5f5fd2d8 100644 --- a/tests/PHPUnit/Unit/Translation/TranslatorTest.php +++ b/tests/PHPUnit/Unit/Translation/TranslatorTest.php @@ -112,7 +112,7 @@ public function getAndListingData(): array [['1', '2', '3'], 'cs', '1, 2 a 3'], [['1', '2', '3'], 'de', '1, 2 und 3'], [['1', '2', '3', '4'], 'de', '1, 2, 3 und 4'], - [['1', '2', '3', '4'], 'am', '1፣ 2፣ 3, እና 4'], + [['1', '2', '3', '4'], 'am', '1፣ 2፣ 3 እና 4'], ]; } @@ -141,7 +141,7 @@ public function getOrListingData(): array [['1', '2', '3'], 'cs', '1, 2 nebo 3'], [['1', '2', '3'], 'de', '1, 2 oder 3'], [['1', '2', '3', '4'], 'de', '1, 2, 3 oder 4'], - [['1', '2', '3', '4'], 'am', '1፣ 2፣ 3፣ ወይም 4'], + [['1', '2', '3', '4'], 'am', '1፣ 2፣ 3 ወይም 4'], ]; }