diff options
70 files changed, 154 insertions, 145 deletions
diff --git a/.travis.yml b/.travis.yml index 0303f518ec..d5c4427fa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ # do not edit this file manually, instead run the generate:travis-yml console command # if you are a Piwik core developer, to auto generate the .travis.yml: -# 1) edit this template file: https://github.com/piwik/travis-scripts/blob/master/generator/templates/travis.yml.twig -# 2) commit the updated submodule in `piwik/tests/travis/` +# 1) edit this template file: https://github.com/matomo-org/travis-scripts/blob/master/generator/templates/travis.yml.twig +# 2) commit the updated submodule in `matomo/tests/travis/` # when modifying this file, please consider whether your changes should apply to plugin .travis.yml files. if not, check whether the pluginName twig var is empty, # otherwise your changes will be synced with every plugin that uses an auto generated .travis.yml @@ -13,12 +13,13 @@ language: php services: - redis-server + - mysql addons: apt: packages: - nginx - - realpath + - coreutils - lftp git: @@ -56,31 +57,35 @@ matrix: - php: 7.2 env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL sudo: false + service: + - mysql addons: apt: packages: - nginx - - realpath + - coreutils - php: 7.2 env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 sudo: false addons: false # All tests after another - - php: 7.3 + - php: 7.4 env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-first-half-only" sudo: required - - php: 7.3 + - php: 7.4 env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-second-half-only" sudo: required # UITests use a specific version because the default 5.5 (== 5.5.38) is missing FreeType support - php: 7.2 env: TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL UITEST_EXTRA_OPTIONS="--run-first-half-only" + dist: xenial sudo: false - php: 7.2 env: TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL UITEST_EXTRA_OPTIONS="--run-second-half-only" + dist: xenial sudo: false -dist: trusty +dist: bionic script: $PIWIK_ROOT_DIR/tests/travis/travis.sh @@ -90,7 +95,7 @@ before_install: install: - git fetch -q - - export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" + - export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --distribution=\"bionic\" --verbose" - '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' - ./tests/travis/configure_git.sh diff --git a/composer.lock b/composer.lock index 749a8e62ba..ecb39c7532 100644 --- a/composer.lock +++ b/composer.lock @@ -488,16 +488,16 @@ }, { "name": "matomo/ini", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/matomo-org/component-ini.git", - "reference": "4cf2d9d73f884a1ce0d9a8c8a119d56f44771c80" + "reference": "f7b0d6ce594b34ead16864fbc5062c771328ac31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/component-ini/zipball/4cf2d9d73f884a1ce0d9a8c8a119d56f44771c80", - "reference": "4cf2d9d73f884a1ce0d9a8c8a119d56f44771c80", + "url": "https://api.github.com/repos/matomo-org/component-ini/zipball/f7b0d6ce594b34ead16864fbc5062c771328ac31", + "reference": "f7b0d6ce594b34ead16864fbc5062c771328ac31", "shasum": "" }, "require": { @@ -505,7 +505,7 @@ }, "require-dev": { "athletic/athletic": "0.1.*", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.8.36" }, "type": "library", "autoload": { @@ -517,7 +517,7 @@ "license": [ "LGPL-3.0" ], - "time": "2019-07-03T07:42:01+00:00" + "time": "2020-01-12T18:54:50+00:00" }, { "name": "matomo/matomo-php-tracker", diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php index 376e78fc5b..dbab685212 100644 --- a/core/DataTable/Renderer.php +++ b/core/DataTable/Renderer.php @@ -265,7 +265,7 @@ abstract class Renderer extends BaseFactory $api = \Piwik\Plugins\API\API::getInstance(); $meta = $api->getMetadata($this->idSite, $apiModule, $apiAction); - if (is_array($meta[0])) { + if (isset($meta[0]) && is_array($meta[0])) { $meta = $meta[0]; } diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php index ada62e67c1..dfd558f0ca 100644 --- a/core/DataTable/Renderer/Csv.php +++ b/core/DataTable/Renderer/Csv.php @@ -311,8 +311,9 @@ class Csv extends Renderer $prettyDate = $period->getLocalizedLongString(); $meta = $this->getApiMetaData(); + $name = !empty($meta['name']) ? $meta['name'] : ''; - $fileName .= ' _ ' . $meta['name'] + $fileName .= ' _ ' . $name . ' _ ' . $prettyDate . '.csv'; } diff --git a/core/NumberFormatter.php b/core/NumberFormatter.php index 808f547eee..ac1634067b 100644 --- a/core/NumberFormatter.php +++ b/core/NumberFormatter.php @@ -121,7 +121,7 @@ class NumberFormatter */ public function formatPercentEvolution($value) { - $isPositiveEvolution = !empty($value) && ($value > 0 || $value[0] == '+'); + $isPositiveEvolution = !empty($value) && ($value > 0 || substr($value, 0, 1) === '+'); $formatted = self::formatPercent($value); 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 aa4611320b..f85fef595a 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:7705f452376551b6bfa30d1eebbc47a6fe4e156a2b72d2a5f99697356516f754 -size 24706 +oid sha256:54b842fd7a71ffa84c7d5ef3912e85c2fefd33430428fc3d964410da63fdcb88 +size 24707 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_ask_confirmation.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_ask_confirmation.png index aac5464a1a..149901d84b 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_ask_confirmation.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_ask_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d092584296423b0c6c39056898f772133dd5270a65bd1ef613dafc73271e3356 -size 7579 +oid sha256:79afc61b65a622a84dcc02c2aee9f82acaf6e4c43d2d01788b837e7b26646a15 +size 7577 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 aa4611320b..f85fef595a 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:7705f452376551b6bfa30d1eebbc47a6fe4e156a2b72d2a5f99697356516f754 -size 24706 +oid sha256:54b842fd7a71ffa84c7d5ef3912e85c2fefd33430428fc3d964410da63fdcb88 +size 24707 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_ask_confirmation.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_ask_confirmation.png index 0f8b3e0e3a..3dadaf2c84 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_ask_confirmation.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_ask_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e49738de18c2ced77e03a474725ab5c451ff13b0cccef6916aacf6a061603026 -size 7661 +oid sha256:475f045ae04e071a2296fc851e6913176facdcd5050f294192b4bb65f4faf5cd +size 7660 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png index b48df1775b..c3a8d28729 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:f2c20dfe052e447a631b4dd2fa5cd82ab403ea6c93a6316620587be6013a3120 -size 4752 +oid sha256:37d9eb86e57ebdcdaf5a0ab5faeb7ee6a71de6b2d7a7576d451b0fb823325155 +size 4753 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png index 93762afaa0..08ec15bc4f 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:c71f17e97469957e9c24170189a2c390d8ebc20f7dd6ec2fbb8e4262808d5f4d +oid sha256:3aa84abbc6d84620b272ed3db58367463ed27f7f2e6cda1ef10f19bad2e5833d size 5016 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_loaded.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_loaded.png index 9ccf35e199..36ebf1cb11 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_loaded.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63bd1995577a6ca6d8565a1203e2bb604fa08b8f93685efadc5dabc45b9db808 -size 1674 +oid sha256:28c8366615746ea9789aad0d2e906f52917cf66a9b11973e920e492ba762a621 +size 1668 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index 549834b0e8..47c703feeb 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:cc7be4fc4ffa5d73f6013db8b00ab8fcfb038f73d2dce6cf9925b54a4d4953f1 -size 470837 +oid sha256:eee525909746024067f8b64258bc9fc1744bb43dd91a05e01d4227e7f44f0eb9 +size 470922 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index 47c89aed69..498f244d02 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13a6d0187360183e38a121cfe5e1000d507ed2502a6bfc4a3381e9fa20ee5ab8 -size 733428 +oid sha256:e02428fc26d6e3b9aa8ddaabaa66b86fed1fd1fc78d340157f198e34097f1687 +size 733550 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index 47c89aed69..498f244d02 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:13a6d0187360183e38a121cfe5e1000d507ed2502a6bfc4a3381e9fa20ee5ab8 -size 733428 +oid sha256:e02428fc26d6e3b9aa8ddaabaa66b86fed1fd1fc78d340157f198e34097f1687 +size 733550 diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png index 0382b06949..eec5d7c2b3 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:e915ebdb66fed2e65b29dd9460f5b0127b168b46df92655219695f81e2926b2e -size 204414 +oid sha256:7ec0adc056f18550c949c8542beb676657e8fa12f727787bed93cdd8a964f911 +size 204459 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 d344c85afd..0bf28a6ac1 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:52e4b201cfd1f5dfaed675faa499ddf8ff45b5cf29b3df1a9ab9ce6c79c4baf4 -size 28418 +oid sha256:0e8e23bd86b18f8361b1edba4b5a740669e09920c3b4edf2645e4444ef83de38 +size 28414 diff --git a/plugins/ImageGraph/tests/UI/ImageGraph_spec.js b/plugins/ImageGraph/tests/UI/ImageGraph_spec.js index 573bd0cc04..c7fb5bb402 100644 --- a/plugins/ImageGraph/tests/UI/ImageGraph_spec.js +++ b/plugins/ImageGraph/tests/UI/ImageGraph_spec.js @@ -22,7 +22,7 @@ describe("ImageGraph", function () { }); it("should render horizontal bar graphs correctly", async function() { - await page.goto(getImageGraphUrl('UserSettings', 'getBrowser', 'horizontalBar', 'year', '2012-01-01')); + await page.goto(getImageGraphUrl('DevicesDetection', 'getBrowsers', 'horizontalBar', 'year', '2012-01-01')); expect(await page.screenshot({ fullPage: true })).to.matchImage('horizontal_bar'); }); diff --git a/plugins/ImageGraph/tests/UI/expected-screenshots/ImageGraph_horizontal_bar.png b/plugins/ImageGraph/tests/UI/expected-screenshots/ImageGraph_horizontal_bar.png index 9e47bd6438..6d76a531fc 100644 --- a/plugins/ImageGraph/tests/UI/expected-screenshots/ImageGraph_horizontal_bar.png +++ b/plugins/ImageGraph/tests/UI/expected-screenshots/ImageGraph_horizontal_bar.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1f2130952eab4290e33548654633b5855539583c12a618fcc1226aa7d1424ce -size 13748 +oid sha256:130231455a8ba1084cd1232340a0c14cdfb30024c44adb8a7bc50d2abfd0a9ec +size 16255 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_nothing_to_see_here.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_nothing_to_see_here.png index bbd43c59d3..302ae3c6bf 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_nothing_to_see_here.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_nothing_to_see_here.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f23267eeb24385e283f4ac459448080457b850dadacff31d6a4fe1c74d10d7c -size 5913 +oid sha256:4c35ab2a0034d9b9e9c1ee1443ac4d78981ea127c43d72d54061755bb806f1bf +size 8447 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 0fb87d7b34..47a5e1a8f0 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:bf22c833f9099736e22a556be732190ae3c712322399a071a00246904a6aed58 -size 188659 +oid sha256:74188bffbfc08b6cc2bf85f93ec25708fe82293b5fcf675020b293510530c92b +size 188669 diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_created.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_created.png index 993a5363ee..7e69712e3f 100644 --- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_created.png +++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_created.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fafeb630a5937bafbcc89cb3878f51e48c265b914a303addfcc7451c7098fa78 +oid sha256:5bfe93cecb69ecc9a34bd8c6879a616206c973d9ddfcfff7c8a3a166ada8b0e3 size 14283 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 49126f0b5a..0975847584 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:ddb207fe8dbd7b42842aec655448cced4f09289ef92d0cfaa4527d707207f6d8 +oid sha256:ef8bea48adad06ea9e62ac5135e1afb12e504f05ad771b9fe015a6465133a540 size 51717 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 7044c8ecc4..948488af94 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:86991219458971f9caf9203ce94da19485096c345cfafd99246d7f204eed2bf0 -size 40000 +oid sha256:26afd93f1362e697acbe14a5fdfef6527f9b6551444201e944aefdd6d4bd5c9d +size 40002 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 bca3118156..101e45f989 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:c7b27fe264d6b12a0383fe1e788c43d7544dbc7d8cd94752bedc56b081757804 -size 102195 +oid sha256:0fc3adfe22fcf991edf80bece110b3e7c6b0bd7cd87dd55a48fde642cb726b9b +size 102196 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 2a5eb11509..6fadc05759 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:1af35b413e9e473265cea9a087881ae11381c5ef48396854f4a638882e546d1d -size 8980 +oid sha256:9b59ee6a447784996410aba5a54c5e2cb03608ca2b59277aca245754f5095e34 +size 13253 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 657a14320f..a840320928 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:b12bd794d390f498ccb10e35280a024be58c19135e05036abf68f5c2eb1cd4b1 -size 34063 +oid sha256:bb3990f1d246584578cb0ea6778dd4384e0034b31de6b17465d9a1e7d5c74654 +size 34062 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_exceededLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_exceededLicense.png index a11d055d25..291b94ecfd 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_exceededLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_exceededLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c738e9c8eece344df853b310c050c975dff8b02d1c5e45b56716dbf54164bf2e -size 24228 +oid sha256:1acbdf6c46535cb7440687a74c63d04d52dac7750efb693d0dc0307e3830bb3a +size 24229 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 798359d0d4..72c8f15e63 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:a4e2f77f53e70a331e58541d38450190259fe0c00f6c93902c16341bfc9fa21e -size 21993 +oid sha256:634329b245566bb0c9d186787e385f62231306ac6209c0674d5d0954e7dba42c +size 21996 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 2c007b4001..3572d5c3b3 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:eaa496d2524a715960fe4b7e56fb9898fc083c3589d875a319ed31ae141c0cbd -size 24023 +oid sha256:e88c5a8963588aacc177324f385c91d38a042fb6d5c71ebcff185936b9be9bd6 +size 24025 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png index 2a03fe90a3..2a688348f3 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b4e2e9f9b01e581cfdc1d7ed6a44fc0a198d308818a63c7a7728da645de4ff7 -size 16488 +oid sha256:3875a88ebbb05bbc85360104df643855d02d6f3edffd0fb6c69c770dd6386d0a +size 16483 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png index 02fb203a9c..d89c591ca9 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38df21a74aab1de0c94015644ae30082ffdb1d7c6adcb6b5d08637ccd3e74a94 -size 13580 +oid sha256:8df23b519e18b5e0fab17464e962d878dc664de202c935ece00ede48b6559ec9 +size 13574 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 59270314fa..471467cb03 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:aedacc8391c6aa9078d0d89dbfa42109383cc282ea43119b41f4ec3ea8bd6339 -size 34391 +oid sha256:1087d60fce3295147b6e6a0cbbb2ffcb25114f6205b2bb1029da1f8997fe06b7 +size 34392 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 a6eeed7e91..690a783807 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:a46eff4e13c22fdead2aff2276512a44680987ada275fa91d86872a3543a09f7 -size 34004 +oid sha256:da6fedb5623359bb700804f00e1aa63ec869fa8d4e636fb4b1c2fcf02b402163 +size 34006 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png index 262886a9ac..3f1c636f41 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:124c5faad6ffcd3ab657658896ade8c1e180185397bf5b2beec9f4761971c984 -size 17211 +oid sha256:78f503862d19741ed0626b424c68f3063c844646c21a989e62883d4b49ab2b14 +size 17210 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_unconfirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_unconfirmed.png index 4aff2f54ba..5b85d54883 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_unconfirmed.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_unconfirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e41e6690c96286c93a7c76fc81d2dedeb49e14391c7022701412bbd23a162087 -size 9193 +oid sha256:93c289ea5b8d6cb2769a86b38ad5054e371f1f472c6cd500860f1b0ab1278b63 +size 9188 diff --git a/plugins/Referrers/tests/System/ApiTest.php b/plugins/Referrers/tests/System/ApiTest.php index ffcd06a46a..157c153325 100644 --- a/plugins/Referrers/tests/System/ApiTest.php +++ b/plugins/Referrers/tests/System/ApiTest.php @@ -62,7 +62,7 @@ class ApiTest extends SystemTestCase 'idSite' => 1, 'date' => '2010-01-01', 'periods' => 'year', - 'testSuffix' => 'phpSerialized', + 'testSuffix' => 'phpSerialized' . (version_compare(PHP_VERSION, '7.4', '>=') ? '74' : ''), 'format' => 'original', ], ]; diff --git a/plugins/Referrers/tests/System/expected/test_phpSerialized74__Referrers.getReferrerType_year.original b/plugins/Referrers/tests/System/expected/test_phpSerialized74__Referrers.getReferrerType_year.original new file mode 100644 index 0000000000..2a5e6d0441 --- /dev/null +++ b/plugins/Referrers/tests/System/expected/test_phpSerialized74__Referrers.getReferrerType_year.original @@ -0,0 +1 @@ +O:15:"Piwik\DataTable":4:{s:7:"*rows";a:2:{i:0;O:19:"Piwik\DataTable\Row":3:{i:0;i:0;i:1;a:9:{s:5:"label";s:14:"Search Engines";s:9:"nb_visits";i:31;s:10:"nb_actions";i:31;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:31;s:19:"nb_visits_converted";i:0;s:26:"sum_daily_nb_uniq_visitors";i:31;s:18:"sum_daily_nb_users";i:0;}i:2;a:4:{s:15:"maxVisitsSummed";i:0;s:29:"Piwik\DataTable\Rowmetadata";a:2:{s:7:"segment";s:20:"referrerType==search";s:13:"referrer_type";i:2;}s:37:"Piwik\DataTable\RowisSubtableLoaded";b:0;s:10:"subtableId";N;}}i:1;O:19:"Piwik\DataTable\Row":3:{i:0;i:0;i:1;a:12:{s:5:"label";s:8:"Websites";s:9:"nb_visits";i:31;s:10:"nb_actions";i:31;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:11315;s:12:"bounce_count";i:31;s:19:"nb_visits_converted";i:31;s:5:"goals";a:2:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:31;s:19:"nb_visits_converted";i:31;s:7:"revenue";d:0;}s:8:"idgoal=2";a:3:{s:14:"nb_conversions";i:62;s:19:"nb_visits_converted";i:31;s:7:"revenue";d:0;}}s:14:"nb_conversions";i:93;s:7:"revenue";d:0;s:26:"sum_daily_nb_uniq_visitors";i:31;s:18:"sum_daily_nb_users";i:0;}i:2;a:4:{s:15:"maxVisitsSummed";i:0;s:29:"Piwik\DataTable\Rowmetadata";a:2:{s:7:"segment";s:21:"referrerType==website";s:13:"referrer_type";i:3;}s:37:"Piwik\DataTable\RowisSubtableLoaded";b:0;s:10:"subtableId";N;}}}s:13:"*summaryRow";N;s:11:"*metadata";a:6:{s:11:"ts_archived";s:19:"today-date-removed-in-tests";s:4:"site";O:10:"Piwik\Site":2:{s:5:"*id";i:1;s:16:"Piwik\Sitesite";a:20:{s:6:"idsite";i:1;s:4:"name";s:10:"Piwik test";s:8:"main_url";s:16:"http://piwik.net";s:10:"ts_created";s:19:"2010-01-31 11:22:33";s:9:"ecommerce";i:0;s:10:"sitesearch";i:1;s:29:"sitesearch_keyword_parameters";s:0:"";s:30:"sitesearch_category_parameters";s:0:"";s:8:"timezone";s:3:"UTC";s:8:"currency";s:3:"USD";s:20:"exclude_unknown_urls";i:0;s:12:"excluded_ips";s:0:"";s:19:"excluded_parameters";s:0:"";s:20:"excluded_user_agents";s:0:"";s:5:"group";s:0:"";s:4:"type";s:7:"website";s:17:"keep_url_fragment";i:0;s:13:"creator_login";s:14:"superUserLogin";s:13:"timezone_name";s:3:"UTC";s:13:"currency_name";s:9:"US Dollar";}}s:6:"period";O:17:"Piwik\Period\Year":1:{s:7:"*date";O:10:"Piwik\Date":2:{s:12:"*timestamp";i:1262304000;s:11:"*timezone";s:3:"UTC";}}s:7:"segment";s:0:"";s:13:"segmentPretty";s:10:"All visits";s:6:"totals";a:15:{s:9:"nb_visits";i:62;s:10:"nb_actions";i:62;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:11315;s:12:"bounce_count";i:62;s:19:"nb_visits_converted";i:31;s:26:"sum_daily_nb_uniq_visitors";i:62;s:18:"sum_daily_nb_users";i:0;s:5:"goals";a:2:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:31;s:19:"nb_visits_converted";i:31;s:7:"revenue";d:0;}s:8:"idgoal=2";a:3:{s:14:"nb_conversions";i:62;s:19:"nb_visits_converted";i:31;s:7:"revenue";d:0;}}s:14:"nb_conversions";i:93;s:7:"revenue";d:0;s:15:"conversion_rate";s:3:"50%";s:20:"nb_actions_per_visit";d:1;s:16:"avg_time_on_site";d:183;s:11:"bounce_rate";s:4:"100%";}}s:12:"*totalsRow";N;}
\ No newline at end of file diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_0_initial.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_0_initial.png index 66e247d575..b68007c870 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_0_initial.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_0_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac55b2285d8ac9afaf540070afbfa0ca8a1f440d5c6910fc7bcfff7fcd206515 -size 1369 +oid sha256:46a62b5a171a8d25dd0b991de33026e5ee9bb572bfb9c667f0ebffbada720dc9 +size 1370 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_7_segment_editor_closed.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_7_segment_editor_closed.png index 66e247d575..b68007c870 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_7_segment_editor_closed.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_7_segment_editor_closed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac55b2285d8ac9afaf540070afbfa0ca8a1f440d5c6910fc7bcfff7fcd206515 -size 1369 +oid sha256:46a62b5a171a8d25dd0b991de33026e5ee9bb572bfb9c667f0ebffbada720dc9 +size 1370 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png index 52f789287e..7cbc07a521 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64e7af85fba2344800ac8a2e98afb75244104abdd863b0b7c224f9391e7a4b15 -size 7145 +oid sha256:ebd734c886f72544bc3eabbe3e5774a6a8f4383e800c7a3ed2990391589bfc34 +size 7138 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png index da98fd889c..ea67128df7 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b27fbca11b0c05b613440bd06bc9e9a88bd877d90958df610e22ddff1e937d71 -size 24882 +oid sha256:eaf8668871e120e2464dbe7bc275c5b78582e126ae216c96b6f60eb3791225a7 +size 24877 diff --git a/plugins/TestRunner/Commands/GenerateTravisYmlFile.php b/plugins/TestRunner/Commands/GenerateTravisYmlFile.php index a70a0ccb20..d5e2072a47 100644 --- a/plugins/TestRunner/Commands/GenerateTravisYmlFile.php +++ b/plugins/TestRunner/Commands/GenerateTravisYmlFile.php @@ -43,6 +43,7 @@ class GenerateTravisYmlFile extends ConsoleCommand ->addOption('force-php-tests', null, InputOption::VALUE_NONE, "Forces the presence of the PHP tests jobs for plugin builds.") ->addOption('force-ui-tests', null, InputOption::VALUE_NONE, "Forces the presence of the UI tests jobs for plugin builds.") ->addOption('dist-trusty', null, InputOption::VALUE_NONE, "If supplied, the .travis.yml file will use travis' trusty distribution.") + ->addOption('distribution', null, InputOption::VALUE_REQUIRED, "If supplied, the .travis.yml file will use the given travis' distribution. Possible values are trusty, xenial or bionic") ->addOption('sudo-false', null, InputOption::VALUE_NONE, "If supplied, the .travis.yml file will use travis' container environment."); } diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png index e9cc3431d7..8a34137877 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34284500620767477b3facc712349ab7a10fb73a8dcfdedd5af9216b8a117501 +oid sha256:8db391ffc5e5fa5f5984e7dd13c638d66216eda4afada9ddd76367dde76bfdfc size 14224 diff --git a/plugins/UsersManager/tests/Integration/ModelTest.php b/plugins/UsersManager/tests/Integration/ModelTest.php index b961e467ec..4c8ea750f1 100644 --- a/plugins/UsersManager/tests/Integration/ModelTest.php +++ b/plugins/UsersManager/tests/Integration/ModelTest.php @@ -152,21 +152,17 @@ class ModelTest extends IntegrationTestCase )), $tokens); } - /** - * @expectedException \Exception - * @expectedExceptionMessage does not exist - */ public function test_addTokenAuth_throwsException_ifUserNotExists() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('does not exist'); $this->model->addTokenAuth('foobar', 'token', 'MyDescription', '2020-01-02 03:04:05', '2030-01-05 03:04:05'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Duplicate entry - */ public function test_addTokenAuth_throwsException_FailsAddingSameTwice() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Duplicate entry'); $this->model->addTokenAuth($this->login, 'token', 'My description', '2020-01-02 03:04:05'); $this->model->addTokenAuth($this->login, 'token', 'My duplicate', '2020-01-03 03:04:05'); } @@ -179,12 +175,10 @@ class ModelTest extends IntegrationTestCase $this->assertEquals(2, $id); } - /** - * @expectedException \Exception - * @expectedExceptionMessage General_ValidatorErrorEmptyValue - */ public function test_addTokenAuth_throwsException_NoDescription() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('General_ValidatorErrorEmptyValue'); $this->model->addTokenAuth($this->login, 'token', '', '2020-01-02 03:04:05'); } diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png index 41c52b66b0..c9a7f11a6c 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fe82c2879e2e593c2b3f55bd204e16cc3f5354162adc76f06eb246ca7f8fd11 -size 12440 +oid sha256:1e39fdcc54246fcf2ba49dac1e637f4eed79891666eb56236cb78eea49adc5b5 +size 12441 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 4fcc9d7525..1424e259f6 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:604165406d33bede16f4aebe0baec6739082387227fe8d62b2db4d1a275e2245 -size 108835 +oid sha256:3121775301b233a88ceefc0b3d7f50ee80365d01bc4f43a6665ff46f58ccb1f4 +size 108812 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png index 03111ed718..3836957b92 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0acacd81363d52994a9cfb1e47f7185e60b24be356ea4a8bb545089f7ac2a532 -size 36199 +oid sha256:6048de72d919a423500ee5dd956f54e60f9f26b9a27d307d5bcae60ab676e2ba +size 36200 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png index 31d215e4df..094ce72e4f 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab0da6c86a912dd33cc177862a81b800cf2633243b1dcce90c3833f310d52dd6 -size 36101 +oid sha256:6035d3b1671db3ff0f684c778b2ffe517ae5fd5d2d776ef109669c6945d27902 +size 36103 diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php index 1cc27afef4..a067283be7 100644 --- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php +++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php @@ -461,9 +461,7 @@ abstract class SystemTestCase extends TestCase ProcessedMetric::class, ], true); - if ($unserialized === false) { - throw new \Exception("Unknown serialization error."); - } + self::assertTrue($unserialized !== false, "Unknown serialization error."); } catch (\Exception $ex) { $this->comparisonFailures[] = new \Exception("Processed response in '$processedFilePath' could not be unserialized: " . $ex->getMessage()); } diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php index 0be0deb0b7..65c9f30aec 100644 --- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php @@ -80,7 +80,9 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase { $files = Filesystem::globr(PIWIK_INCLUDE_PATH . '/plugins', '*.png'); // filter expected screenshots as they might not be checked out and downloaded when stored in git-lfs - $files = array_filter($files, function($value) { return !preg_match('/expected-screenshots/', $value); }); + $files = array_filter($files, function($value) { + return !preg_match('/expected-screenshots/', $value) && !preg_match('~icons/src~', $value); + }); $this->checkFilesAreInPngFormat($files); $files = Filesystem::globr(PIWIK_INCLUDE_PATH . '/core', '*.png'); $this->checkFilesAreInPngFormat($files); @@ -117,6 +119,9 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase $screenshots = array_map($cleanPath, $screenshots); $lfsFiles = `git lfs ls-files`; + if (empty($lfsFiles)) { + $lfsFiles = `git lfs ls-files --exclude=`; + } $submodules = `git submodule | awk '{ print $2 }'`; $submodules = explode("\n", $submodules); $storedLfsFiles = explode("\n", $lfsFiles); @@ -445,6 +450,7 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase strpos($file, 'yuicompressor') !== false || (strpos($file, '/vendor') !== false && strpos($file, '/vendor/piwik') === false) || strpos($file, '/tmp/') !== false || + strpos($file, '/Morpheus/icons/src/') !== false || strpos($file, '/phantomjs/') !== false ) { continue; @@ -862,7 +868,7 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase $countFileChecked = 0; foreach ($files as $file) { - if($this->isFileBelongToTests($file)) { + if($this->isFileBelongToTests($file) || is_dir($file)) { continue; } diff --git a/tests/PHPUnit/Unit/Config/IniFileChainCacheTest.php b/tests/PHPUnit/Unit/Config/IniFileChainCacheTest.php index a87fbca4a8..3258ced10f 100644 --- a/tests/PHPUnit/Unit/Config/IniFileChainCacheTest.php +++ b/tests/PHPUnit/Unit/Config/IniFileChainCacheTest.php @@ -118,7 +118,10 @@ class IniFileChainCacheTest extends IniFileChainTest unset($value['settingsChain']); $this->assertEquals(array('mergedSettings' => $expected), $value); - $this->assertArraySubset($defaultSettingFiles, array_keys($settingsChain)); + foreach ($defaultSettingFiles as $defaultSettingFile) { + self::assertTrue(array_key_exists($defaultSettingFile, $settingsChain)); + } + $this->assertNotEmpty(array_keys($settingsChain)); } diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png index 95e26e945e..f7cdf84a2b 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:bf3b3b1cddfb43aad8b48c4d433eb9888c1275bd557fbc6b1553a9d76ef69788 -size 366874 +oid sha256:dc9ddb34a961a7dad774581da922e498e31932267b4c002b03e7f17f66a27105 +size 366974 diff --git a/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png b/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png index 0be73caddb..9c1539b2a2 100644 --- a/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png +++ b/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fbe1fb451170e44106fb99adbc2a0fffe1026cd6397967300744dbb284d80eb -size 3019 +oid sha256:0ef870dd7c5b44b16946e86594075053f9358ba43d95bdc903a68ec5780bb433 +size 3018 diff --git a/tests/UI/expected-screenshots/PeriodSelector_day_selected.png b/tests/UI/expected-screenshots/PeriodSelector_day_selected.png index c3e48f1e21..b3ff20d051 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:af3be8e073ff2e4ab0c3a09c25e3f693a10e46e836eb93a3f5aa98bb65265d9e -size 21919 +oid sha256:4c3db951896182cf289d614249d0dd21b52cafc66e840de9c50c5bd7f2d05e3b +size 21917 diff --git a/tests/UI/expected-screenshots/PeriodSelector_expanded.png b/tests/UI/expected-screenshots/PeriodSelector_expanded.png index 3bc847ce1d..a2045c7c82 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:bff39220f6ce33728a1a072e65bc2e97303ee3c06851cc4b304d04092204dc75 -size 21881 +oid sha256:30ebcbe72e9924c42e29a87cd630ee7aa2e7ebfc846c16e72dafc79faa914190 +size 21878 diff --git a/tests/UI/expected-screenshots/PeriodSelector_loaded.png b/tests/UI/expected-screenshots/PeriodSelector_loaded.png index ae5c063f1a..149ed2b28e 100644 --- a/tests/UI/expected-screenshots/PeriodSelector_loaded.png +++ b/tests/UI/expected-screenshots/PeriodSelector_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9466255c99eaf0f19ea9293a4a3d1626f843744d0dfc2ef240c4ea518518097c -size 1179 +oid sha256:8900500e10b77c3b5b218f7b06c01cf28da1a3639bdf26fecf0d23c10fcfe55f +size 1182 diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png index b675594095..4cff915445 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:26bf10268cb87ad89aa1b79012baf6dae68d8f88a660c086a2d0ee100de7bb67 -size 69675 +oid sha256:9052a83c80c24c8e83a3c5a976fd15ed40a5a6842c1319f3f3ba6d601d4b73b1 +size 69676 diff --git a/tests/UI/expected-screenshots/QuickAccess_initially.png b/tests/UI/expected-screenshots/QuickAccess_initially.png index 21bc32ad13..aec4519b98 100644 --- a/tests/UI/expected-screenshots/QuickAccess_initially.png +++ b/tests/UI/expected-screenshots/QuickAccess_initially.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da0dcb9c307109c0bd261dce1b4b9100f008d19e036a80f717ee8edd4cc466b0 -size 693 +oid sha256:e3e6e666388d6f4f88c6d1fb2e7fddc2a29db1d71c21e90da3ac87a5f2babd11 +size 708 diff --git a/tests/UI/expected-screenshots/QuickAccess_shortcut.png b/tests/UI/expected-screenshots/QuickAccess_shortcut.png index 41d8f7312c..319a5927a7 100644 --- a/tests/UI/expected-screenshots/QuickAccess_shortcut.png +++ b/tests/UI/expected-screenshots/QuickAccess_shortcut.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3512364bfe8dfb2d1f9f9c9b66c95c45cd93189403a35d84d0cd5cd6f9cbe2d -size 225 +oid sha256:6a8a5bd4e5aaf37be790e29288a8972ced4810a8387bd66d75bc7a73d36b1156 +size 238 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 071429edc9..a72eba5e0e 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:cf93a82405adc4189c9b48c6a151da4e6f9110b70c0b00346267f9db86c9bce7 -size 726434 +oid sha256:2d796bfd347904bc2a72fd91f38e14f2d93a2666e9b6d2479aa8730ba2dd1dae +size 726555 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index fc523b3ecd..1c312f16d7 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:feef74ae9b19fbac36006e66ac1bfad9d23cbbedb1c00ebbddd13929acb9649b -size 150459 +oid sha256:9cd3915cb2b14a4cb8baec9521dbd165fddae081f9e2b5bce6465681d3789c5d +size 150560 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 12f82f652c..906bca7c7a 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:ad95a9e2a316e6ca72143e82ce5c65c3a4695f01427d1e1263379322ce0cb947 -size 25985 +oid sha256:58c17a8c0f7370598c4af1e08c6f3ed0354036b53cddb32cc2f6bcc0afb7a66d +size 34696 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png index fc523b3ecd..1c312f16d7 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:feef74ae9b19fbac36006e66ac1bfad9d23cbbedb1c00ebbddd13929acb9649b -size 150459 +oid sha256:9cd3915cb2b14a4cb8baec9521dbd165fddae081f9e2b5bce6465681d3789c5d +size 150560 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 3a8d09362f..502714d762 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:4ba277c0bf29a50a9fd0a3d70ea85d50b8e2f6f63c670306c94d35e2f8fda0f1 -size 650975 +oid sha256:e9a650eebb6bdb2a48a3fbf2d9679c9958b55a25606fd40702934e70f8780d00 +size 651145 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 827bac097f..c4163f0f00 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:c266e66c4faeb80cba4a71b5263eddf6955295f38ef517be46838597ab734309 -size 1565814 +oid sha256:a55b55617bdf39b6f3fec23e4d7a6e73c53af24f54058ad72043d9302f7da6c1 +size 1565116 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index a50a953b98..677cb2a612 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:33774fc5569e27a76a3fa279136fa72e9d6e23c979c9c346c99e8baa5f37006e -size 713021 +oid sha256:f5286545986bb0d2060ada3f152882757597cefa4e9d00a526dcc02ec193ab15 +size 707643 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_opt_out.png b/tests/UI/expected-screenshots/UIIntegrationTest_opt_out.png index 214d1b0f11..177d4245a2 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:64474366756aa3c44809433e623d2f3f33a073e74c460106438ceb74d2e48bfd -size 21459 +oid sha256:50e4c06ca84fa647addaaf32450f83cb8ec275b91d8fd486d3bcabddef9ecc4e +size 27053 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_shortcuts.png b/tests/UI/expected-screenshots/UIIntegrationTest_shortcuts.png index c42dce0ba4..f8dba3108f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_shortcuts.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_shortcuts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1d6e02c8ececae9a2b137aebb6a556bdb99fd9f3698ebda0222315a071505c0 -size 33333 +oid sha256:3330c2c83be1e7038c44c488eaedfd8d0932398438308c8bf88d97cb38bf5813 +size 33331 diff --git a/tests/travis b/tests/travis -Subproject f215e0066c4ea0c45cceaee3ed6a06fc623ebaf +Subproject ca0dfcfa2ca0e552fc65b77649dffbf101a6a17 |
