diff options
| author | sgiehl <stefan@piwik.org> | 2018-01-13 15:35:21 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2018-01-13 15:35:21 +0300 |
| commit | 7159027c501dcc3337d2762cceaa4e47b976dc1a (patch) | |
| tree | 8b9f4ea4366d96e44c3eedb2e578210dd831d306 | |
| parent | 3966d0245ee878e52b5cef0a0c00ce46b3b6fc57 (diff) | |
fixes tests
5 files changed, 7 insertions, 8 deletions
diff --git a/tests/PHPUnit/Framework/TestRequest/Collection.php b/tests/PHPUnit/Framework/TestRequest/Collection.php index 287b4563a7..32fd749ebd 100644 --- a/tests/PHPUnit/Framework/TestRequest/Collection.php +++ b/tests/PHPUnit/Framework/TestRequest/Collection.php @@ -336,6 +336,7 @@ class Collection if (!in_array('UserCountry.getLocationFromIP', $apiToCall) && !in_array('UserCountry.getCountryCodeMapping', $apiToCall)) { $this->apiNotToCall = array('API.getPiwikVersion', + 'API.getMatomoVersion', 'UserCountry.getLocationFromIP', 'UserCountry.getCountryCodeMapping'); } else { diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMatomoVersion.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMatomoVersion.xml deleted file mode 100644 index 2fd0121936..0000000000 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMatomoVersion.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result>3.3.0-b2</result>
\ No newline at end of file diff --git a/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png b/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png index 67f1efddfb..ff513457b3 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png +++ b/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45e82f65da1182ca853d06091fb4185a173625277bff98e4cbbb8621952ffc20 -size 59482 +oid sha256:4db939009ddbe279435cf80ed72a8a1acd175355d425f1b6e82deb7789a7ce76 +size 249903 diff --git a/tests/UI/expected-screenshots/Menus_mobile_top.png b/tests/UI/expected-screenshots/Menus_mobile_top.png index c98a452232..cf2ed4b96c 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:0880e1f94c842f2b00fd528ebcce2916f0a849918429cf53ceb63b366464574b -size 196102 +oid sha256:eb7b7f63e02c1c40c36d28aaae060f0aa375cbd64bff59997f9b50164a1a6be7 +size 197464 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 2862eb1948..cad369c1be 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:f32191daa78bfb706a09fdfa994584d2749f683f7a90aa6678da0726bea9af12 -size 1015323 +oid sha256:ca756792db8b90cc5cd45354d3c56990ece69ff35b32f1a62e57cf456956feef +size 1015421 |
