diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-02-13 11:35:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 11:35:00 +0300 |
| commit | 5eb911a556259eb4ce3cd05e4d1b1e5d01f7785b (patch) | |
| tree | feb48afc4590a474182391cff330cfb737aa661c | |
| parent | 930acadc65067265348d0310f928e533021cdfe0 (diff) | |
Should fix rounding tests on Mysqli driver (#11339)
* Fix MySQLI rounding tests
* CustomDimensions: Fixed require string
* Submodule
* submodule
* UI test
* Fixes #11299
| m--------- | misc/log-analytics | 0 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/Controller.php | 2 | ||||
| m--------- | plugins/CustomDimensions | 0 | ||||
| -rw-r--r-- | tests/PHPUnit/Framework/TestRequest/Response.php | 3 | ||||
| -rw-r--r-- | tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png | 4 |
5 files changed, 6 insertions, 3 deletions
diff --git a/misc/log-analytics b/misc/log-analytics -Subproject ab997050199311e881b66b99906dbd982c002da +Subproject 55a410cf6fcd4249a0b6f820c6b88d56ee7cdf2 diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 50cb830f56..8481410e0c 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -56,7 +56,7 @@ class Controller extends ControllerAdmin $hasPiwikBlog = $widgetsList->isDefined('RssWidget', 'rssPiwik'); $hasPremiumFeatures = $widgetsList->isDefined('Marketplace', 'getPremiumFeatures'); $hasNewPlugins = $widgetsList->isDefined('Marketplace', 'getNewPlugins'); - $hasDiagnostics = $widgetsList->isDefined('About Piwik', 'Installation_SystemCheck'); + $hasDiagnostics = $widgetsList->isDefined('Installation', 'getSystemCheck'); return $this->renderTemplate('home', array( 'isMarketplaceEnabled' => $isMarketplaceEnabled, diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 9f9437e7f44b69b9f128019ad6ee568239148ff +Subproject 3460c802ad121db9ab9e8e70bc68733f1f109f7 diff --git a/tests/PHPUnit/Framework/TestRequest/Response.php b/tests/PHPUnit/Framework/TestRequest/Response.php index 5969725de7..56d4c7080d 100644 --- a/tests/PHPUnit/Framework/TestRequest/Response.php +++ b/tests/PHPUnit/Framework/TestRequest/Response.php @@ -253,6 +253,9 @@ class Response $response = str_replace('.000000</l', '</l', $response); //lat/long $response = str_replace('.00</revenue>', '</revenue>', $response); + // eg. <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + $response = str_replace('.00</t', '</t', $response); + return $response; } diff --git a/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png b/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png index b0b110eee9..c8bcd22ae5 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png +++ b/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d94a49eeccd387323a6e4c2d275099d56893275145c006e844b4298cf42751ad -size 105759 +oid sha256:c8bb4b50b39944cd1c0cf8b5a282c8ec4ec8223d4e760ee79c333225bfb1ca04 +size 106399 |
