diff options
| author | sgiehl <stefan@matomo.org> | 2020-05-08 15:41:26 +0300 |
|---|---|---|
| committer | sgiehl <stefan@matomo.org> | 2020-05-08 17:41:34 +0300 |
| commit | 58991fbe62be4e3d1af1e6a1772aff25934c51d3 (patch) | |
| tree | 6d0c5390383dacff54849753885b70ef026a0a1e /plugins/CoreConsole | |
| parent | 1ac50c2a702bf22189a246c99b2dc9c0e7979217 (diff) | |
| parent | bd9aa9db1a95e6f1ef74b45e3723849fab2f292c (diff) | |
Merge remote-tracking branch 'origin/3.x-dev' into 4.x-dev
Diffstat (limited to 'plugins/CoreConsole')
3 files changed, 22 insertions, 16 deletions
diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml index f0f2986a8a..6afcb33679 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml @@ -106,8 +106,8 @@ <pageId>71</pageId> <bandwidth /> - <timeSpent>50</timeSpent> - <timeSpentPretty>50s</timeSpentPretty> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> <pageviewPosition>2</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> @@ -131,8 +131,8 @@ <pageId>75</pageId> <bandwidth /> - <timeSpent>49</timeSpent> - <timeSpentPretty>49s</timeSpentPretty> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> <pageviewPosition>6</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> @@ -181,8 +181,8 @@ <pageId>72</pageId> <bandwidth /> - <timeSpent>26</timeSpent> - <timeSpentPretty>26s</timeSpentPretty> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> <pageviewPosition>3</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> @@ -231,8 +231,8 @@ <pageId>73</pageId> <bandwidth /> - <timeSpent>8</timeSpent> - <timeSpentPretty>8s</timeSpentPretty> + <timeSpent>1</timeSpent> + <timeSpentPretty>1s</timeSpentPretty> <pageviewPosition>4</pageviewPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml index f0f2986a8a..6afcb33679 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml @@ -106,8 +106,8 @@ <pageId>71</pageId> <bandwidth /> - <timeSpent>50</timeSpent> - <timeSpentPretty>50s</timeSpentPretty> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> <pageviewPosition>2</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> @@ -131,8 +131,8 @@ <pageId>75</pageId> <bandwidth /> - <timeSpent>49</timeSpent> - <timeSpentPretty>49s</timeSpentPretty> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> <pageviewPosition>6</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> @@ -181,8 +181,8 @@ <pageId>72</pageId> <bandwidth /> - <timeSpent>26</timeSpent> - <timeSpentPretty>26s</timeSpentPretty> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> <pageviewPosition>3</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> @@ -231,8 +231,8 @@ <pageId>73</pageId> <bandwidth /> - <timeSpent>8</timeSpent> - <timeSpentPretty>8s</timeSpentPretty> + <timeSpent>1</timeSpent> + <timeSpentPretty>1s</timeSpentPretty> <pageviewPosition>4</pageviewPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_range_archive__DevicesDetection.getType_range.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_range_archive__DevicesDetection.getType_range.xml index c75fcc08b0..0358d288a6 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_range_archive__DevicesDetection.getType_range.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_range_archive__DevicesDetection.getType_range.xml @@ -125,4 +125,10 @@ <segment>deviceType==tv</segment> <logo>plugins/Morpheus/icons/dist/devices/tv.png</logo> </row> + <row> + <label>Wearable</label> + <nb_visits>0</nb_visits> + <segment>deviceType==wearable</segment> + <logo>plugins/Morpheus/icons/dist/devices/wearable.png</logo> + </row> </result>
\ No newline at end of file |