Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2015-12-25 21:47:55 +0300
committersgiehl <stefan@piwik.org>2015-12-25 21:47:55 +0300
commitb22dee447834c12f1095ba8ecf356970b2312dbf (patch)
tree46a966716922f3d44734929486c43a26d37230f7 /tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
parent72fa5107adcdbe1f4b8850f89c95dd3d5f5e6f4a (diff)
parent611316e743d17d819b511d008da0e80e6425b686 (diff)
Merge branch 'master' into 3.0
Conflicts: core/Version.php plugins/CoreConsole/Commands/ManagePlugin.php plugins/CoreHome/angularjs/siteselector/siteselector.directive.js plugins/CoreHome/javascripts/corehome.js plugins/Ecommerce/Menu.php plugins/Events/Events.php plugins/Goals/Goals.php plugins/Live/templates/index.twig plugins/UserCountryMap/UserCountryMap.php plugins/UsersManager/stylesheets/usersManager.less plugins/VisitsSummary/Controller.php plugins/VisitsSummary/Reports/Get.php tests/UI/expected-ui-screenshots
Diffstat (limited to 'tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml')
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
index a752c1e0bd..2e1a51f476 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
@@ -89,7 +89,7 @@
<nb_events>2</nb_events>
<nb_events_with_value>2</nb_events_with_value>
<sum_event_value>19.32</sum_event_value>
- <min_event_value>0</min_event_value>
+ <min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
@@ -101,7 +101,7 @@
<nb_events>2</nb_events>
<nb_events_with_value>2</nb_events_with_value>
<sum_event_value>19.32</sum_event_value>
- <min_event_value>0</min_event_value>
+ <min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>