diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 19917a02cfff..9c68aef048b7 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -2125,10 +2125,10 @@
1
- 8
- 1.2.4.3
+ 30
+ 113.62.1.1
- 9b641f2d195745f4
+ d5a95c7fe2a8286d
action
@@ -2137,7 +2137,7 @@
4
- 19
+ 80
1623
27 min 3s
@@ -2155,7 +2155,7 @@
1
5
- 19
+ 80
http://piwik.net/space/quest/iv
direct
@@ -2192,7 +2192,7 @@
31
- 20
+ 81
1
plugins/Morpheus/images/download.png
@@ -2209,7 +2209,7 @@
32
- 21
+ 82
1
plugins/Morpheus/images/link.png
@@ -2221,7 +2221,7 @@
ecommerceOrder
- 1004
+ 3004
111.11
100
11
@@ -2244,7 +2244,7 @@
plugins/Morpheus/images/ecommerceOrder.png
plugins/Morpheus/images/ecommerceOrder.svg
- Ordered (1004)
+ Ordered (3004)
$111.11 revenue - 1 items: My Product)
@@ -2254,7 +2254,7 @@
8
- 22
+ 83
Cat3
Action3
@@ -2310,36 +2310,36 @@
- fr
- French
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows XP
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- XP
- Gecko
- Gecko (Firefox)
- Firefox 3.6
- Firefox
- plugins/Morpheus/icons/dist/browsers/FF.png
- FF
- 3.6
+
+ Unknown
+ Tablet
+ plugins/Morpheus/icons/dist/devices/tablet.png
+ Sony
+ Xperia Tablet S
+ Android 4.1
+ Android
+ plugins/Morpheus/icons/dist/os/AND.png
+ AND
+ 4.1
+ Blink
+ Blink (Chrome, Opera)
+ Chrome 34.0
+ Chrome
+ plugins/Morpheus/icons/dist/browsers/CH.png
+ CH
+ 34.0
1
- Europe
- eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- London, City of
- LND
- London
- London, London, City of, United Kingdom
-
-
+ Asia
+ asi
+ China
+ cn
+ plugins/Morpheus/icons/dist/flags/cn.png
+ Xizang Zizhiqu
+ XZ
+ Lhasa
+ Lhasa, Xizang Zizhiqu, China
+ 29.650000
+ 91.100000
12:34:06
12
0
@@ -2361,22 +2361,14 @@
-
- Cvar 1 name
- Cvar1 value is 3
-
-
- Cvar 5 name
- Cvar5 value is 3
-
1
- 30
- 113.62.1.1
+ 8
+ 1.2.4.3
- d5a95c7fe2a8286d
+ 9b641f2d195745f4
action
@@ -2385,7 +2377,7 @@
4
- 80
+ 19
1623
27 min 3s
@@ -2403,7 +2395,7 @@
1
5
- 80
+ 19
http://piwik.net/space/quest/iv
direct
@@ -2440,7 +2432,7 @@
31
- 81
+ 20
1
plugins/Morpheus/images/download.png
@@ -2457,7 +2449,7 @@
32
- 82
+ 21
1
plugins/Morpheus/images/link.png
@@ -2469,7 +2461,7 @@
ecommerceOrder
- 3004
+ 1004
111.11
100
11
@@ -2492,7 +2484,7 @@
plugins/Morpheus/images/ecommerceOrder.png
plugins/Morpheus/images/ecommerceOrder.svg
- Ordered (3004)
+ Ordered (1004)
$111.11 revenue - 1 items: My Product)
@@ -2502,7 +2494,7 @@
8
- 83
+ 22
Cat3
Action3
@@ -2558,36 +2550,36 @@
-
- Unknown
- Tablet
- plugins/Morpheus/icons/dist/devices/tablet.png
- Sony
- Xperia Tablet S
- Android 4.1
- Android
- plugins/Morpheus/icons/dist/os/AND.png
- AND
- 4.1
- Blink
- Blink (Chrome, Opera)
- Chrome 34.0
- Chrome
- plugins/Morpheus/icons/dist/browsers/CH.png
- CH
- 34.0
+ fr
+ French
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows XP
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ XP
+ Gecko
+ Gecko (Firefox)
+ Firefox 3.6
+ Firefox
+ plugins/Morpheus/icons/dist/browsers/FF.png
+ FF
+ 3.6
1
- Asia
- asi
- China
- cn
- plugins/Morpheus/icons/dist/flags/cn.png
- Xizang Zizhiqu
- XZ
- Lhasa
- Lhasa, Xizang Zizhiqu, China
- 29.650000
- 91.100000
+ Europe
+ eur
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ London, City of
+ LND
+ London
+ London, London, City of, United Kingdom
+
+
12:34:06
12
0
@@ -2609,14 +2601,22 @@
+
+ Cvar 1 name
+ Cvar1 value is 3
+
+
+ Cvar 5 name
+ Cvar5 value is 3
+
1
- 7
- 1.2.4.3
+ 29
+ 113.62.1.1
- 9b641f2d195745f4
+ d5a95c7fe2a8286d
action
@@ -2625,7 +2625,7 @@
2
- 18
+ 79
0
0s
@@ -2653,7 +2653,7 @@
1
5
- 18
+ 79
http://piwik.net/grue/lair
direct
@@ -2707,36 +2707,36 @@
- fr
- French
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows XP
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- XP
- Gecko
- Gecko (Firefox)
- Firefox 3.6
- Firefox
- plugins/Morpheus/icons/dist/browsers/FF.png
- FF
- 3.6
+
+ Unknown
+ Tablet
+ plugins/Morpheus/icons/dist/devices/tablet.png
+ Sony
+ Xperia Tablet S
+ Android 4.1
+ Android
+ plugins/Morpheus/icons/dist/os/AND.png
+ AND
+ 4.1
+ Blink
+ Blink (Chrome, Opera)
+ Chrome 34.0
+ Chrome
+ plugins/Morpheus/icons/dist/browsers/CH.png
+ CH
+ 34.0
0
- Europe
- eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- London, City of
- LND
- London
- London, London, City of, United Kingdom
-
-
+ Asia
+ asi
+ China
+ cn
+ plugins/Morpheus/icons/dist/flags/cn.png
+ Xizang Zizhiqu
+ XZ
+ Lhasa
+ Lhasa, Xizang Zizhiqu, China
+ 29.650000
+ 91.100000
12:34:06
12
0
@@ -2770,10 +2770,10 @@
1
- 29
- 113.62.1.1
+ 7
+ 1.2.4.3
- d5a95c7fe2a8286d
+ 9b641f2d195745f4
action
@@ -2782,7 +2782,7 @@
2
- 79
+ 18
0
0s
@@ -2810,7 +2810,7 @@
1
5
- 79
+ 18
http://piwik.net/grue/lair
direct
@@ -2864,36 +2864,36 @@
-
- Unknown
- Tablet
- plugins/Morpheus/icons/dist/devices/tablet.png
- Sony
- Xperia Tablet S
- Android 4.1
- Android
- plugins/Morpheus/icons/dist/os/AND.png
- AND
- 4.1
- Blink
- Blink (Chrome, Opera)
- Chrome 34.0
- Chrome
- plugins/Morpheus/icons/dist/browsers/CH.png
- CH
- 34.0
+ fr
+ French
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows XP
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ XP
+ Gecko
+ Gecko (Firefox)
+ Firefox 3.6
+ Firefox
+ plugins/Morpheus/icons/dist/browsers/FF.png
+ FF
+ 3.6
0
- Asia
- asi
- China
- cn
- plugins/Morpheus/icons/dist/flags/cn.png
- Xizang Zizhiqu
- XZ
- Lhasa
- Lhasa, Xizang Zizhiqu, China
- 29.650000
- 91.100000
+ Europe
+ eur
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ London, City of
+ LND
+ London
+ London, London, City of, United Kingdom
+
+
12:34:06
12
0
@@ -2927,10 +2927,10 @@
1
- 6
- 1.2.4.2
+ 28
+ 2003:f6:93bf:26f:9ec7:a6ff:fe29:27df
- 85aaa85a2071daf5
+ 47b25ed9972126db
action
@@ -2939,7 +2939,7 @@
4
- 13
+ 74
1621
27 min 1s
@@ -2957,7 +2957,7 @@
1
5
- 13
+ 74
http://piwik.net/space/quest/iv
direct
@@ -2975,7 +2975,7 @@
- 14
+ 75
Bring on the party
CAT
@@ -3013,7 +3013,7 @@
26
- 15
+ 76
2
plugins/Morpheus/images/download.png
@@ -3030,7 +3030,7 @@
27
- 16
+ 77
2
plugins/Morpheus/images/link.png
@@ -3046,7 +3046,7 @@
8
- 17
+ 78
Cat2
Action2
@@ -3102,36 +3102,36 @@
- fr
- French
+
+ Unknown
Desktop
plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
+ Dell
Generic Desktop
- Windows XP
+ Windows 7
Windows
plugins/Morpheus/icons/dist/os/WIN.png
WIN
- XP
- Gecko
- Gecko (Firefox)
- Firefox 3.6
- Firefox
- plugins/Morpheus/icons/dist/browsers/FF.png
- FF
- 3.6
+ 7
+ Trident
+ Trident (IE)
+ Internet Explorer 11.0
+ Internet Explorer
+ plugins/Morpheus/icons/dist/browsers/IE.png
+ IE
+ 11.0
1
- Europe
- eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- Warwickshire
- WAR
- Stratford-upon-Avon
- Stratford-upon-Avon, Warwickshire, United Kingdom
- 124.456000
- 22.231000
+ North America
+ amn
+ United States
+ us
+ plugins/Morpheus/icons/dist/flags/us.png
+
+
+
+ United States
+ 38
+ -97
12:34:06
12
0
@@ -3153,22 +3153,14 @@
-
- Cvar 1 name
- Cvar1 value is 2
-
-
- Cvar 5 name
- Cvar5 value is 2
-
1
- 28
- 2003:f6:93bf:26f:9ec7:a6ff:fe29:27df
+ 6
+ 1.2.4.2
- 47b25ed9972126db
+ 85aaa85a2071daf5
action
@@ -3177,7 +3169,7 @@
4
- 74
+ 13
1621
27 min 1s
@@ -3195,7 +3187,7 @@
1
5
- 74
+ 13
http://piwik.net/space/quest/iv
direct
@@ -3213,7 +3205,7 @@
- 75
+ 14
Bring on the party
CAT
@@ -3251,7 +3243,7 @@
26
- 76
+ 15
2
plugins/Morpheus/images/download.png
@@ -3268,7 +3260,7 @@
27
- 77
+ 16
2
plugins/Morpheus/images/link.png
@@ -3284,7 +3276,7 @@
8
- 78
+ 17
Cat2
Action2
@@ -3340,36 +3332,36 @@
-
- Unknown
+ fr
+ French
Desktop
plugins/Morpheus/icons/dist/devices/desktop.png
- Dell
+ Unknown
Generic Desktop
- Windows 7
+ Windows XP
Windows
plugins/Morpheus/icons/dist/os/WIN.png
WIN
- 7
- Trident
- Trident (IE)
- Internet Explorer 11.0
- Internet Explorer
- plugins/Morpheus/icons/dist/browsers/IE.png
- IE
- 11.0
+ XP
+ Gecko
+ Gecko (Firefox)
+ Firefox 3.6
+ Firefox
+ plugins/Morpheus/icons/dist/browsers/FF.png
+ FF
+ 3.6
1
- North America
- amn
- United States
- us
- plugins/Morpheus/icons/dist/flags/us.png
-
-
-
- United States
- 38
- -97
+ Europe
+ eur
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ Warwickshire
+ WAR
+ Stratford-upon-Avon
+ Stratford-upon-Avon, Warwickshire, United Kingdom
+ 124.456000
+ 22.231000
12:34:06
12
0
@@ -3391,14 +3383,22 @@
+
+ Cvar 1 name
+ Cvar1 value is 2
+
+
+ Cvar 5 name
+ Cvar5 value is 2
+
1
- 5
- 1.2.4.2
+ 27
+ 2003:f6:93bf:26f:9ec7:a6ff:fe29:27df
- 85aaa85a2071daf5
+ 47b25ed9972126db
action
@@ -3407,7 +3407,7 @@
2
- 12
+ 73
0
0s
@@ -3435,7 +3435,7 @@
1
5
- 12
+ 73
http://piwik.net/grue/lair
direct
@@ -3489,36 +3489,36 @@
- fr
- French
+
+ Unknown
Desktop
plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
+ Dell
Generic Desktop
- Windows XP
+ Windows 7
Windows
plugins/Morpheus/icons/dist/os/WIN.png
WIN
- XP
- Gecko
- Gecko (Firefox)
- Firefox 3.6
- Firefox
- plugins/Morpheus/icons/dist/browsers/FF.png
- FF
- 3.6
+ 7
+ Trident
+ Trident (IE)
+ Internet Explorer 11.0
+ Internet Explorer
+ plugins/Morpheus/icons/dist/browsers/IE.png
+ IE
+ 11.0
0
- Europe
- eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- Warwickshire
- WAR
- Stratford-upon-Avon
- Stratford-upon-Avon, Warwickshire, United Kingdom
- 124.456000
- 22.231000
+ North America
+ amn
+ United States
+ us
+ plugins/Morpheus/icons/dist/flags/us.png
+
+
+
+ United States
+ 38
+ -97
12:34:06
12
0
@@ -3552,10 +3552,10 @@
1
- 27
- 2003:f6:93bf:26f:9ec7:a6ff:fe29:27df
+ 5
+ 1.2.4.2
- 47b25ed9972126db
+ 85aaa85a2071daf5
action
@@ -3564,7 +3564,7 @@
2
- 73
+ 12
0
0s
@@ -3592,7 +3592,7 @@
1
5
- 73
+ 12
http://piwik.net/grue/lair
direct
@@ -3646,36 +3646,36 @@
-
- Unknown
+ fr
+ French
Desktop
plugins/Morpheus/icons/dist/devices/desktop.png
- Dell
+ Unknown
Generic Desktop
- Windows 7
+ Windows XP
Windows
plugins/Morpheus/icons/dist/os/WIN.png
WIN
- 7
- Trident
- Trident (IE)
- Internet Explorer 11.0
- Internet Explorer
- plugins/Morpheus/icons/dist/browsers/IE.png
- IE
- 11.0
+ XP
+ Gecko
+ Gecko (Firefox)
+ Firefox 3.6
+ Firefox
+ plugins/Morpheus/icons/dist/browsers/FF.png
+ FF
+ 3.6
0
- North America
- amn
- United States
- us
- plugins/Morpheus/icons/dist/flags/us.png
-
-
-
- United States
- 38
- -97
+ Europe
+ eur
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ Warwickshire
+ WAR
+ Stratford-upon-Avon
+ Stratford-upon-Avon, Warwickshire, United Kingdom
+ 124.456000
+ 22.231000
12:34:06
12
0
@@ -3709,10 +3709,10 @@
1
- 4
- 1.2.4.1
+ 34
+ 103.29.196.229
- f482ecaa17f17080
+ e61a3357f12d99f5
action
@@ -3721,7 +3721,7 @@
4
- 8
+ 91
1621
27 min 1s
@@ -3739,7 +3739,7 @@
1
5
- 8
+ 91
http://piwik.net/space/quest/iv
direct
@@ -3776,7 +3776,7 @@
21
- 9
+ 92
1
plugins/Morpheus/images/download.png
@@ -3793,7 +3793,7 @@
22
- 10
+ 93
1
plugins/Morpheus/images/link.png
@@ -3809,7 +3809,7 @@
8
- 11
+ 94
Cat1
Action1
@@ -3871,28 +3871,28 @@
plugins/Morpheus/icons/dist/devices/desktop.png
Unknown
Generic Desktop
- Windows XP
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- XP
+ Ubuntu 9.04
+ Ubuntu
+ plugins/Morpheus/icons/dist/os/UBT.png
+ UBT
+ 9.04
Gecko
Gecko (Firefox)
- Firefox 3.6
+ Firefox 3.0
Firefox
plugins/Morpheus/icons/dist/browsers/FF.png
FF
- 3.6
+ 3.0
1
- Europe
- eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- Warwickshire
- WAR
- Nuneaton and Bedworth
- Nuneaton and Bedworth, Warwickshire, United Kingdom
+ Asia
+ asi
+ Indonesia
+ id
+ plugins/Morpheus/icons/dist/flags/id.png
+
+
+
+ Indonesia
12:34:06
@@ -3928,10 +3928,10 @@
1
- 22
- ::ffff:137.82.130.49
+ 26
+ 137.82.0.0
- 65eefc1c2b3aa35c
+ 02bc7f4e9b9d3069
action
@@ -3940,7 +3940,7 @@
4
- 58
+ 69
1621
27 min 1s
@@ -3958,7 +3958,7 @@
1
5
- 58
+ 69
http://piwik.net/space/quest/iv
direct
@@ -3995,7 +3995,7 @@
21
- 59
+ 70
1
plugins/Morpheus/images/download.png
@@ -4012,7 +4012,7 @@
22
- 60
+ 71
1
plugins/Morpheus/images/link.png
@@ -4028,7 +4028,7 @@
8
- 61
+ 72
Cat1
Action1
@@ -4084,24 +4084,24 @@
- fr
- French
- Smartphone
- plugins/Morpheus/icons/dist/devices/smartphone.png
- HTC
- Desire
- MildWild 8.0
- MildWild
- plugins/Morpheus/icons/dist/os/AND.png
- MLD
- 8.0
- WebKit
- WebKit (Safari)
- Android Browser
- Android Browser
- plugins/Morpheus/icons/dist/browsers/AN.png
- AN
-
+
+ Unknown
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows Vista
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ Vista
+ Trident
+ Trident (IE)
+ Internet Explorer 8.0
+ Internet Explorer
+ plugins/Morpheus/icons/dist/browsers/IE.png
+ IE
+ 8.0
1
North America
amn
@@ -4135,22 +4135,14 @@
-
- Cvar 1 name
- Cvar1 value is 1
-
-
- Cvar 5 name
- Cvar5 value is 1
-
1
- 26
- 137.82.0.0
+ 22
+ ::ffff:137.82.130.49
- 02bc7f4e9b9d3069
+ 65eefc1c2b3aa35c
action
@@ -4159,7 +4151,7 @@
4
- 69
+ 58
1621
27 min 1s
@@ -4177,7 +4169,7 @@
1
5
- 69
+ 58
http://piwik.net/space/quest/iv
direct
@@ -4214,7 +4206,7 @@
21
- 70
+ 59
1
plugins/Morpheus/images/download.png
@@ -4231,7 +4223,7 @@
22
- 71
+ 60
1
plugins/Morpheus/images/link.png
@@ -4247,7 +4239,7 @@
8
- 72
+ 61
Cat1
Action1
@@ -4303,24 +4295,24 @@
-
- Unknown
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows Vista
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- Vista
- Trident
- Trident (IE)
- Internet Explorer 8.0
- Internet Explorer
- plugins/Morpheus/icons/dist/browsers/IE.png
- IE
- 8.0
+ fr
+ French
+ Smartphone
+ plugins/Morpheus/icons/dist/devices/smartphone.png
+ HTC
+ Desire
+ MildWild 8.0
+ MildWild
+ plugins/Morpheus/icons/dist/os/AND.png
+ MLD
+ 8.0
+ WebKit
+ WebKit (Safari)
+ Android Browser
+ Android Browser
+ plugins/Morpheus/icons/dist/browsers/AN.png
+ AN
+
1
North America
amn
@@ -4354,14 +4346,22 @@
+
+ Cvar 1 name
+ Cvar1 value is 1
+
+
+ Cvar 5 name
+ Cvar5 value is 1
+
1
- 34
- 103.29.196.229
+ 4
+ 1.2.4.1
- e61a3357f12d99f5
+ f482ecaa17f17080
action
@@ -4370,7 +4370,7 @@
4
- 91
+ 8
1621
27 min 1s
@@ -4388,7 +4388,7 @@
1
5
- 91
+ 8
http://piwik.net/space/quest/iv
direct
@@ -4425,7 +4425,7 @@
21
- 92
+ 9
1
plugins/Morpheus/images/download.png
@@ -4442,7 +4442,7 @@
22
- 93
+ 10
1
plugins/Morpheus/images/link.png
@@ -4458,7 +4458,7 @@
8
- 94
+ 11
Cat1
Action1
@@ -4520,28 +4520,28 @@
plugins/Morpheus/icons/dist/devices/desktop.png
Unknown
Generic Desktop
- Ubuntu 9.04
- Ubuntu
- plugins/Morpheus/icons/dist/os/UBT.png
- UBT
- 9.04
+ Windows XP
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ XP
Gecko
Gecko (Firefox)
- Firefox 3.0
+ Firefox 3.6
Firefox
plugins/Morpheus/icons/dist/browsers/FF.png
FF
- 3.0
+ 3.6
1
- Asia
- asi
- Indonesia
- id
- plugins/Morpheus/icons/dist/flags/id.png
-
-
-
- Indonesia
+ Europe
+ eur
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ Warwickshire
+ WAR
+ Nuneaton and Bedworth
+ Nuneaton and Bedworth, Warwickshire, United Kingdom
12:34:06
@@ -4577,10 +4577,10 @@
1
- 3
- 1.2.4.1
+ 33
+ 103.29.196.229
- f482ecaa17f17080
+ e61a3357f12d99f5
action
@@ -4589,7 +4589,7 @@
2
- 7
+ 90
17.4
MyName
Custom SKU
@@ -4626,7 +4626,7 @@
1
5
- 7
+ 90
http://piwik.net/grue/lair
direct
@@ -4686,28 +4686,28 @@
plugins/Morpheus/icons/dist/devices/desktop.png
Unknown
Generic Desktop
- Windows XP
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- XP
+ Ubuntu 9.04
+ Ubuntu
+ plugins/Morpheus/icons/dist/os/UBT.png
+ UBT
+ 9.04
Gecko
Gecko (Firefox)
- Firefox 3.6
+ Firefox 3.0
Firefox
plugins/Morpheus/icons/dist/browsers/FF.png
FF
- 3.6
+ 3.0
0
- Europe
- eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- Warwickshire
- WAR
- Nuneaton and Bedworth
- Nuneaton and Bedworth, Warwickshire, United Kingdom
+ Asia
+ asi
+ Indonesia
+ id
+ plugins/Morpheus/icons/dist/flags/id.png
+
+
+
+ Indonesia
12:34:06
@@ -4743,10 +4743,10 @@
1
- 21
- ::ffff:137.82.130.49
+ 25
+ 137.82.0.0
- 65eefc1c2b3aa35c
+ 02bc7f4e9b9d3069
action
@@ -4755,7 +4755,7 @@
2
- 57
+ 68
17.4
MyName
Custom SKU
@@ -4792,7 +4792,7 @@
1
5
- 57
+ 68
http://piwik.net/grue/lair
direct
@@ -4846,24 +4846,24 @@
- fr
- French
- Smartphone
- plugins/Morpheus/icons/dist/devices/smartphone.png
- HTC
- Desire
- MildWild 8.0
- MildWild
- plugins/Morpheus/icons/dist/os/AND.png
- MLD
- 8.0
- WebKit
- WebKit (Safari)
- Android Browser
- Android Browser
- plugins/Morpheus/icons/dist/browsers/AN.png
- AN
-
+
+ Unknown
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows Vista
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ Vista
+ Trident
+ Trident (IE)
+ Internet Explorer 8.0
+ Internet Explorer
+ plugins/Morpheus/icons/dist/browsers/IE.png
+ IE
+ 8.0
0
North America
amn
@@ -4909,10 +4909,10 @@
1
- 25
- 137.82.0.0
+ 21
+ ::ffff:137.82.130.49
- 02bc7f4e9b9d3069
+ 65eefc1c2b3aa35c
action
@@ -4921,7 +4921,7 @@
2
- 68
+ 57
17.4
MyName
Custom SKU
@@ -4958,7 +4958,7 @@
1
5
- 68
+ 57
http://piwik.net/grue/lair
direct
@@ -5012,24 +5012,24 @@
-
- Unknown
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows Vista
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- Vista
- Trident
- Trident (IE)
- Internet Explorer 8.0
- Internet Explorer
- plugins/Morpheus/icons/dist/browsers/IE.png
- IE
- 8.0
+ fr
+ French
+ Smartphone
+ plugins/Morpheus/icons/dist/devices/smartphone.png
+ HTC
+ Desire
+ MildWild 8.0
+ MildWild
+ plugins/Morpheus/icons/dist/os/AND.png
+ MLD
+ 8.0
+ WebKit
+ WebKit (Safari)
+ Android Browser
+ Android Browser
+ plugins/Morpheus/icons/dist/browsers/AN.png
+ AN
+
0
North America
amn
@@ -5075,10 +5075,10 @@
1
- 33
- 103.29.196.229
+ 3
+ 1.2.4.1
- e61a3357f12d99f5
+ f482ecaa17f17080
action
@@ -5087,7 +5087,7 @@
2
- 90
+ 7
17.4
MyName
Custom SKU
@@ -5124,7 +5124,7 @@
1
5
- 90
+ 7
http://piwik.net/grue/lair
direct
@@ -5184,28 +5184,28 @@
plugins/Morpheus/icons/dist/devices/desktop.png
Unknown
Generic Desktop
- Ubuntu 9.04
- Ubuntu
- plugins/Morpheus/icons/dist/os/UBT.png
- UBT
- 9.04
+ Windows XP
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ XP
Gecko
Gecko (Firefox)
- Firefox 3.0
+ Firefox 3.6
Firefox
plugins/Morpheus/icons/dist/browsers/FF.png
FF
- 3.0
+ 3.6
0
- Asia
- asi
- Indonesia
- id
- plugins/Morpheus/icons/dist/flags/id.png
-
-
-
- Indonesia
+ Europe
+ eur
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ Warwickshire
+ WAR
+ Nuneaton and Bedworth
+ Nuneaton and Bedworth, Warwickshire, United Kingdom
12:34:06
@@ -5241,10 +5241,10 @@
1
- 2
- 1.2.4.0
+ 32
+ 151.100.101.92
- 0fc8a7b5c1071e7d
+ 05f59d2b325126c8
action
@@ -5253,7 +5253,7 @@
4
- 2
+ 85
1623
27 min 3s
@@ -5271,7 +5271,7 @@
1
5
- 2
+ 85
http://piwik.net/space/quest/iv
direct
@@ -5289,7 +5289,7 @@
- 3
+ 86
Bring on the party
CAT
@@ -5327,7 +5327,7 @@
6
- 4
+ 87
2
plugins/Morpheus/images/download.png
@@ -5344,7 +5344,7 @@
7
- 5
+ 88
2
plugins/Morpheus/images/link.png
@@ -5356,7 +5356,7 @@
ecommerceOrder
- 1001
+ 4001
111.11
100
11
@@ -5379,7 +5379,7 @@
plugins/Morpheus/images/ecommerceOrder.png
plugins/Morpheus/images/ecommerceOrder.svg
- Ordered (1001)
+ Ordered (4001)
$111.11 revenue - 1 items: My Product)
@@ -5389,7 +5389,7 @@
8
- 6
+ 89
Cat0
Action0
@@ -5447,39 +5447,39 @@
fr
French
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows XP
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- XP
- Gecko
- Gecko (Firefox)
- Firefox 3.6
- Firefox
- plugins/Morpheus/icons/dist/browsers/FF.png
- FF
- 3.6
+ Phablet
+ plugins/Morpheus/icons/dist/devices/phablet.png
+ Samsung
+ Galaxy Note 3
+ Android 4.3
+ Android
+ plugins/Morpheus/icons/dist/os/AND.png
+ AND
+ 4.3
+ WebKit
+ WebKit (Safari)
+ QQ Browser 5.0
+ QQ Browser
+ plugins/Morpheus/icons/dist/browsers/QQ.png
+ QQ
+ 5.0
1
Europe
eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- Warwickshire
- WAR
- Stratford-upon-Avon
- Stratford-upon-Avon, Warwickshire, United Kingdom
- 123.456000
- 21.321000
- 12:34:06
- 12
- 0
- 3600
- 1024x768
+ Italy
+ it
+ plugins/Morpheus/icons/dist/flags/it.png
+
+
+
+ Italy
+
+
+ 12:34:06
+ 12
+ 0
+ 3600
+ 1024x768
cookie, flash, java
@@ -5508,10 +5508,10 @@
1
- 20
- 194.57.91.215
+ 24
+ 137.82.130.0
- cc20676f98f5d568
+ 6e61d30774ae8214
action
@@ -5520,7 +5520,7 @@
4
- 52
+ 63
1623
27 min 3s
@@ -5538,7 +5538,7 @@
1
5
- 52
+ 63
http://piwik.net/space/quest/iv
direct
@@ -5556,7 +5556,7 @@
- 53
+ 64
Bring on the party
CAT
@@ -5594,7 +5594,7 @@
6
- 54
+ 65
2
plugins/Morpheus/images/download.png
@@ -5611,7 +5611,7 @@
7
- 55
+ 66
2
plugins/Morpheus/images/link.png
@@ -5623,7 +5623,7 @@
ecommerceOrder
- 2001
+ 3001
111.11
100
11
@@ -5646,7 +5646,7 @@
plugins/Morpheus/images/ecommerceOrder.png
plugins/Morpheus/images/ecommerceOrder.svg
- Ordered (2001)
+ Ordered (3001)
$111.11 revenue - 1 items: My Product)
@@ -5656,7 +5656,7 @@
8
- 56
+ 67
Cat0
Action0
@@ -5712,36 +5712,36 @@
- fr
- French
- Smartphone
- plugins/Morpheus/icons/dist/devices/smartphone.png
- Google
- Nexus 4
- Android 4.4
- Android
- plugins/Morpheus/icons/dist/os/AND.png
- AND
- 4.4
+
+ Unknown
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows 8.1
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ 8.1
Blink
Blink (Chrome, Opera)
- Chrome Mobile 33.0
- Chrome Mobile
- plugins/Morpheus/icons/dist/browsers/CM.png
- CM
- 33.0
+ Chrome 32.0
+ Chrome
+ plugins/Morpheus/icons/dist/browsers/CH.png
+ CH
+ 32.0
1
- Europe
- eur
- France
- fr
- plugins/Morpheus/icons/dist/flags/fr.png
- Bourgogne-Franche-Comté
- BFC
- Besançon
- Besançon, Bourgogne-Franche-Comté, France
- 47.249000
- 6.018000
+ North America
+ amn
+ Canada
+ ca
+ plugins/Morpheus/icons/dist/flags/ca.png
+ British Columbia
+ BC
+ Vancouver
+ Vancouver, British Columbia, Canada
+ 49.250000
+ -123.133000
12:34:06
12
0
@@ -5763,22 +5763,14 @@
-
- Cvar 1 name
- Cvar1 value is 0
-
-
- Cvar 5 name
- Cvar5 value is 0
-
1
- 24
- 137.82.130.0
+ 20
+ 194.57.91.215
- 6e61d30774ae8214
+ cc20676f98f5d568
action
@@ -5787,7 +5779,7 @@
4
- 63
+ 52
1623
27 min 3s
@@ -5805,7 +5797,7 @@
1
5
- 63
+ 52
http://piwik.net/space/quest/iv
direct
@@ -5823,7 +5815,7 @@
- 64
+ 53
Bring on the party
CAT
@@ -5861,7 +5853,7 @@
6
- 65
+ 54
2
plugins/Morpheus/images/download.png
@@ -5878,7 +5870,7 @@
7
- 66
+ 55
2
plugins/Morpheus/images/link.png
@@ -5890,7 +5882,7 @@
ecommerceOrder
- 3001
+ 2001
111.11
100
11
@@ -5913,7 +5905,7 @@
plugins/Morpheus/images/ecommerceOrder.png
plugins/Morpheus/images/ecommerceOrder.svg
- Ordered (3001)
+ Ordered (2001)
$111.11 revenue - 1 items: My Product)
@@ -5923,7 +5915,7 @@
8
- 67
+ 56
Cat0
Action0
@@ -5979,36 +5971,36 @@
-
- Unknown
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows 8.1
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- 8.1
+ fr
+ French
+ Smartphone
+ plugins/Morpheus/icons/dist/devices/smartphone.png
+ Google
+ Nexus 4
+ Android 4.4
+ Android
+ plugins/Morpheus/icons/dist/os/AND.png
+ AND
+ 4.4
Blink
Blink (Chrome, Opera)
- Chrome 32.0
- Chrome
- plugins/Morpheus/icons/dist/browsers/CH.png
- CH
- 32.0
+ Chrome Mobile 33.0
+ Chrome Mobile
+ plugins/Morpheus/icons/dist/browsers/CM.png
+ CM
+ 33.0
1
- North America
- amn
- Canada
- ca
- plugins/Morpheus/icons/dist/flags/ca.png
- British Columbia
- BC
- Vancouver
- Vancouver, British Columbia, Canada
- 49.250000
- -123.133000
+ Europe
+ eur
+ France
+ fr
+ plugins/Morpheus/icons/dist/flags/fr.png
+ Bourgogne-Franche-Comté
+ BFC
+ Besançon
+ Besançon, Bourgogne-Franche-Comté, France
+ 47.249000
+ 6.018000
12:34:06
12
0
@@ -6030,14 +6022,22 @@
+
+ Cvar 1 name
+ Cvar1 value is 0
+
+
+ Cvar 5 name
+ Cvar5 value is 0
+
1
- 32
- 151.100.101.92
+ 2
+ 1.2.4.0
- 05f59d2b325126c8
+ 0fc8a7b5c1071e7d
action
@@ -6046,7 +6046,7 @@
4
- 85
+ 2
1623
27 min 3s
@@ -6064,7 +6064,7 @@
1
5
- 85
+ 2
http://piwik.net/space/quest/iv
direct
@@ -6082,7 +6082,7 @@
- 86
+ 3
Bring on the party
CAT
@@ -6120,7 +6120,7 @@
6
- 87
+ 4
2
plugins/Morpheus/images/download.png
@@ -6137,7 +6137,7 @@
7
- 88
+ 5
2
plugins/Morpheus/images/link.png
@@ -6149,7 +6149,7 @@
ecommerceOrder
- 4001
+ 1001
111.11
100
11
@@ -6172,7 +6172,7 @@
plugins/Morpheus/images/ecommerceOrder.png
plugins/Morpheus/images/ecommerceOrder.svg
- Ordered (4001)
+ Ordered (1001)
$111.11 revenue - 1 items: My Product)
@@ -6182,7 +6182,7 @@
8
- 89
+ 6
Cat0
Action0
@@ -6240,34 +6240,34 @@
fr
French
- Phablet
- plugins/Morpheus/icons/dist/devices/phablet.png
- Samsung
- Galaxy Note 3
- Android 4.3
- Android
- plugins/Morpheus/icons/dist/os/AND.png
- AND
- 4.3
- WebKit
- WebKit (Safari)
- QQ Browser 5.0
- QQ Browser
- plugins/Morpheus/icons/dist/browsers/QQ.png
- QQ
- 5.0
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows XP
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ XP
+ Gecko
+ Gecko (Firefox)
+ Firefox 3.6
+ Firefox
+ plugins/Morpheus/icons/dist/browsers/FF.png
+ FF
+ 3.6
1
Europe
eur
- Italy
- it
- plugins/Morpheus/icons/dist/flags/it.png
-
-
-
- Italy
-
-
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ Warwickshire
+ WAR
+ Stratford-upon-Avon
+ Stratford-upon-Avon, Warwickshire, United Kingdom
+ 123.456000
+ 21.321000
12:34:06
12
0
@@ -6301,10 +6301,10 @@
1
- 1
- 1.2.4.0
+ 31
+ 151.100.101.92
- 0fc8a7b5c1071e7d
+ 05f59d2b325126c8
action
@@ -6313,7 +6313,7 @@
2
- 1
+ 84
0
0s
@@ -6341,7 +6341,7 @@
1
5
- 1
+ 84
http://piwik.net/grue/lair
direct
@@ -6397,34 +6397,34 @@
fr
French
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows XP
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- XP
- Gecko
- Gecko (Firefox)
- Firefox 3.6
- Firefox
- plugins/Morpheus/icons/dist/browsers/FF.png
- FF
- 3.6
+ Phablet
+ plugins/Morpheus/icons/dist/devices/phablet.png
+ Samsung
+ Galaxy Note 3
+ Android 4.3
+ Android
+ plugins/Morpheus/icons/dist/os/AND.png
+ AND
+ 4.3
+ WebKit
+ WebKit (Safari)
+ QQ Browser 5.0
+ QQ Browser
+ plugins/Morpheus/icons/dist/browsers/QQ.png
+ QQ
+ 5.0
0
Europe
eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- Warwickshire
- WAR
- Stratford-upon-Avon
- Stratford-upon-Avon, Warwickshire, United Kingdom
- 123.456000
- 21.321000
+ Italy
+ it
+ plugins/Morpheus/icons/dist/flags/it.png
+
+
+
+ Italy
+
+
12:34:06
12
0
@@ -6458,10 +6458,10 @@
1
- 19
- 194.57.91.215
+ 23
+ 137.82.130.0
- cc20676f98f5d568
+ dd5a3c85624c2d3b
action
@@ -6470,7 +6470,7 @@
2
- 51
+ 62
0
0s
@@ -6498,7 +6498,7 @@
1
5
- 51
+ 62
http://piwik.net/grue/lair
direct
@@ -6554,34 +6554,34 @@
fr
French
- Smartphone
- plugins/Morpheus/icons/dist/devices/smartphone.png
- Google
- Nexus 4
- Android 4.4
- Android
- plugins/Morpheus/icons/dist/os/AND.png
- AND
- 4.4
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows 8.1
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ 8.1
Blink
Blink (Chrome, Opera)
- Chrome Mobile 33.0
- Chrome Mobile
- plugins/Morpheus/icons/dist/browsers/CM.png
- CM
- 33.0
+ Chrome 32.0
+ Chrome
+ plugins/Morpheus/icons/dist/browsers/CH.png
+ CH
+ 32.0
0
- Europe
- eur
- France
- fr
- plugins/Morpheus/icons/dist/flags/fr.png
- Bourgogne-Franche-Comté
- BFC
- Besançon
- Besançon, Bourgogne-Franche-Comté, France
- 47.249000
- 6.018000
+ North America
+ amn
+ Canada
+ ca
+ plugins/Morpheus/icons/dist/flags/ca.png
+ British Columbia
+ BC
+ Vancouver
+ Vancouver, British Columbia, Canada
+ 49.250000
+ -123.133000
12:34:06
12
0
@@ -6615,10 +6615,10 @@
1
- 23
- 137.82.130.0
+ 19
+ 194.57.91.215
- dd5a3c85624c2d3b
+ cc20676f98f5d568
action
@@ -6627,7 +6627,7 @@
2
- 62
+ 51
0
0s
@@ -6655,7 +6655,7 @@
1
5
- 62
+ 51
http://piwik.net/grue/lair
direct
@@ -6711,34 +6711,34 @@
fr
French
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows 8.1
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- 8.1
+ Smartphone
+ plugins/Morpheus/icons/dist/devices/smartphone.png
+ Google
+ Nexus 4
+ Android 4.4
+ Android
+ plugins/Morpheus/icons/dist/os/AND.png
+ AND
+ 4.4
Blink
Blink (Chrome, Opera)
- Chrome 32.0
- Chrome
- plugins/Morpheus/icons/dist/browsers/CH.png
- CH
- 32.0
+ Chrome Mobile 33.0
+ Chrome Mobile
+ plugins/Morpheus/icons/dist/browsers/CM.png
+ CM
+ 33.0
0
- North America
- amn
- Canada
- ca
- plugins/Morpheus/icons/dist/flags/ca.png
- British Columbia
- BC
- Vancouver
- Vancouver, British Columbia, Canada
- 49.250000
- -123.133000
+ Europe
+ eur
+ France
+ fr
+ plugins/Morpheus/icons/dist/flags/fr.png
+ Bourgogne-Franche-Comté
+ BFC
+ Besançon
+ Besançon, Bourgogne-Franche-Comté, France
+ 47.249000
+ 6.018000
12:34:06
12
0
@@ -6772,10 +6772,10 @@
1
- 31
- 151.100.101.92
+ 1
+ 1.2.4.0
- 05f59d2b325126c8
+ 0fc8a7b5c1071e7d
action
@@ -6784,7 +6784,7 @@
2
- 84
+ 1
0
0s
@@ -6812,7 +6812,7 @@
1
5
- 84
+ 1
http://piwik.net/grue/lair
direct
@@ -6868,34 +6868,34 @@
fr
French
- Phablet
- plugins/Morpheus/icons/dist/devices/phablet.png
- Samsung
- Galaxy Note 3
- Android 4.3
- Android
- plugins/Morpheus/icons/dist/os/AND.png
- AND
- 4.3
- WebKit
- WebKit (Safari)
- QQ Browser 5.0
- QQ Browser
- plugins/Morpheus/icons/dist/browsers/QQ.png
- QQ
- 5.0
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows XP
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ XP
+ Gecko
+ Gecko (Firefox)
+ Firefox 3.6
+ Firefox
+ plugins/Morpheus/icons/dist/browsers/FF.png
+ FF
+ 3.6
0
Europe
eur
- Italy
- it
- plugins/Morpheus/icons/dist/flags/it.png
-
-
-
- Italy
-
-
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ Warwickshire
+ WAR
+ Stratford-upon-Avon
+ Stratford-upon-Avon, Warwickshire, United Kingdom
+ 123.456000
+ 21.321000
12:34:06
12
0
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml
index e0d7aff01a41..dfa3a2062361 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
- 35
- 95
- 35
- 18
- 27579
- 5
- 51%
- 2.7
- 788
+ 1
+ 1
+ 1
+ 1
+ 0
+ 1
+ 100%
+ 1
+ 0
\ No newline at end of file
diff --git a/plugins/UsersManager/tests/Integration/ModelTest.php b/plugins/UsersManager/tests/Integration/ModelTest.php
index 34b632f7f9c4..a4ef2b34743f 100644
--- a/plugins/UsersManager/tests/Integration/ModelTest.php
+++ b/plugins/UsersManager/tests/Integration/ModelTest.php
@@ -77,11 +77,16 @@ public function testGetSitesAccessFromUserMultipleSites()
$this->model->addUserAccess($this->login, Write::ID, array(3));
$this->model->addUserAccess($this->login, Write::ID, array(2));
$this->model->addUserAccess($this->login, View::ID, array(1));
+ $access = $this->model->getSitesAccessFromUser($this->login);
+ // The order might differ depending on the database, so sort by 'idaction'
+ usort($access, function ($a, $b) {
+ return $a['site'] - $b['site'];
+ });
$this->assertEquals(array(
- array('site' => '3', 'access' => Write::ID),
- array('site' => '2', 'access' => Write::ID),
- array('site' => '1', 'access' => View::ID),
- ), $this->model->getSitesAccessFromUser($this->login));
+ array('site' => '1', 'access' => View::ID),
+ array('site' => '2', 'access' => Write::ID),
+ array('site' => '3', 'access' => Write::ID),
+ ), $access);
}
public function testGetSitesAccessFromUserMultipleSitesSomeNoLongerExist()
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index 6f6ee108810d..92e36e52c62e 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -158,7 +158,7 @@ protected function trackVisit(\MatomoTracker $t, $fixtureCounter, $visitorCounte
}
// first visit
- $date = Date::factory($this->dateTime)->addDay($visitorCounter);
+ $date = Date::factory($this->dateTime)->addDay($visitorCounter)->addPeriod($fixtureCounter, 'SECOND');
$t->setForceVisitDateTime($date->getDatetime());
$t->setUrl("http://piwik.net/grue/lair");
$t->setCustomVariable(1, 'Cvar 1 name', 'Cvar1 value is ' . $visitorCounter, 'visit');
diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
index 1779fad5cee9..01851fb24195 100644
--- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
@@ -170,6 +170,11 @@ public static function isMysqli()
return getenv('MYSQL_ADAPTER') == 'MYSQLI';
}
+ public static function isMariaDb()
+ {
+ return getenv('MYSQL_SCHEMA') === 'Mariadb' || Config::getInstance()->database['schema'] === 'Mariadb';
+ }
+
/**
* Return 4 Api Urls for testing scheduled reports :
* - one in HTML format with all available reports
diff --git a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
index 4dda669a3469..52d86a0867f1 100644
--- a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
@@ -325,7 +325,7 @@ public function testGenerateQueryWithSegmentVisitLogJoinRightJoinOnOtherTableSho
public function testSetMaxExecutionTimeOfArchivingQueries()
{
- if (SystemTestCase::isMysqli()) {
+ if (!SystemTestCase::isMariaDb() && SystemTestCase::isMysqli()) {
// See https://github.com/matomo-org/matomo/issues/17871
$this->markTestSkipped('Max execution query hint does not work for Mysqli.');
}
diff --git a/tests/PHPUnit/Integration/Tracker/ModelTest.php b/tests/PHPUnit/Integration/Tracker/ModelTest.php
index 55032b0090df..a257b31cdb4f 100644
--- a/tests/PHPUnit/Integration/Tracker/ModelTest.php
+++ b/tests/PHPUnit/Integration/Tracker/ModelTest.php
@@ -91,6 +91,11 @@ public function testGetIdsActionCorrectlyReturnsRequestedActionIds()
array('name' => 'action2', 'type' => 2)
));
+ // The order might differ depending on the database, so sort by 'idaction'
+ usort($result, function ($a, $b) {
+ return $a['idaction'] - $b['idaction'];
+ });
+
$expectedResult = array(
array(
'idaction' => '2',
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml
index 14a1cff88450..6d79be531d33 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml
@@ -926,10 +926,10 @@
1
- 7
- 1.2.4.3
+ 29
+ 113.62.1.1
- 9b641f2d195745f4
+ d5a95c7fe2a8286d
action
@@ -938,7 +938,7 @@
2
- 18
+ 79
0
0s
@@ -966,7 +966,7 @@
1
5
- 18
+ 79
http://piwik.net/grue/lair
direct
@@ -1020,36 +1020,36 @@
- fr
- French
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows XP
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- XP
- Gecko
- Gecko (Firefox)
- Firefox 3.6
- Firefox
- plugins/Morpheus/icons/dist/browsers/FF.png
- FF
- 3.6
+
+ Unknown
+ Tablet
+ plugins/Morpheus/icons/dist/devices/tablet.png
+ Sony
+ Xperia Tablet S
+ Android 4.1
+ Android
+ plugins/Morpheus/icons/dist/os/AND.png
+ AND
+ 4.1
+ Blink
+ Blink (Chrome, Opera)
+ Chrome 34.0
+ Chrome
+ plugins/Morpheus/icons/dist/browsers/CH.png
+ CH
+ 34.0
0
- Europe
- eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- London, City of
- LND
- London
- London, London, City of, United Kingdom
-
-
+ Asia
+ asi
+ China
+ cn
+ plugins/Morpheus/icons/dist/flags/cn.png
+ Xizang Zizhiqu
+ XZ
+ Lhasa
+ Lhasa, Xizang Zizhiqu, China
+ 29.650000
+ 91.100000
12:34:06
12
0
@@ -1083,10 +1083,10 @@
1
- 29
- 113.62.1.1
+ 7
+ 1.2.4.3
- d5a95c7fe2a8286d
+ 9b641f2d195745f4
action
@@ -1095,7 +1095,7 @@
2
- 79
+ 18
0
0s
@@ -1123,7 +1123,7 @@
1
5
- 79
+ 18
http://piwik.net/grue/lair
direct
@@ -1177,36 +1177,36 @@
-
- Unknown
- Tablet
- plugins/Morpheus/icons/dist/devices/tablet.png
- Sony
- Xperia Tablet S
- Android 4.1
- Android
- plugins/Morpheus/icons/dist/os/AND.png
- AND
- 4.1
- Blink
- Blink (Chrome, Opera)
- Chrome 34.0
- Chrome
- plugins/Morpheus/icons/dist/browsers/CH.png
- CH
- 34.0
+ fr
+ French
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows XP
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ XP
+ Gecko
+ Gecko (Firefox)
+ Firefox 3.6
+ Firefox
+ plugins/Morpheus/icons/dist/browsers/FF.png
+ FF
+ 3.6
0
- Asia
- asi
- China
- cn
- plugins/Morpheus/icons/dist/flags/cn.png
- Xizang Zizhiqu
- XZ
- Lhasa
- Lhasa, Xizang Zizhiqu, China
- 29.650000
- 91.100000
+ Europe
+ eur
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ London, City of
+ LND
+ London
+ London, London, City of, United Kingdom
+
+
12:34:06
12
0
@@ -1240,10 +1240,10 @@
1
- 5
- 1.2.4.2
+ 27
+ 2003:f6:93bf:26f:9ec7:a6ff:fe29:27df
- 85aaa85a2071daf5
+ 47b25ed9972126db
action
@@ -1252,7 +1252,7 @@
2
- 12
+ 73
0
0s
@@ -1280,7 +1280,7 @@
1
5
- 12
+ 73
http://piwik.net/grue/lair
direct
@@ -1334,36 +1334,36 @@
- fr
- French
+
+ Unknown
Desktop
plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
+ Dell
Generic Desktop
- Windows XP
+ Windows 7
Windows
plugins/Morpheus/icons/dist/os/WIN.png
WIN
- XP
- Gecko
- Gecko (Firefox)
- Firefox 3.6
- Firefox
- plugins/Morpheus/icons/dist/browsers/FF.png
- FF
- 3.6
+ 7
+ Trident
+ Trident (IE)
+ Internet Explorer 11.0
+ Internet Explorer
+ plugins/Morpheus/icons/dist/browsers/IE.png
+ IE
+ 11.0
0
- Europe
- eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- Warwickshire
- WAR
- Stratford-upon-Avon
- Stratford-upon-Avon, Warwickshire, United Kingdom
- 124.456000
- 22.231000
+ North America
+ amn
+ United States
+ us
+ plugins/Morpheus/icons/dist/flags/us.png
+
+
+
+ United States
+ 38
+ -97
12:34:06
12
0
@@ -1397,10 +1397,10 @@
1
- 27
- 2003:f6:93bf:26f:9ec7:a6ff:fe29:27df
+ 5
+ 1.2.4.2
- 47b25ed9972126db
+ 85aaa85a2071daf5
action
@@ -1409,7 +1409,7 @@
2
- 73
+ 12
0
0s
@@ -1437,7 +1437,7 @@
1
5
- 73
+ 12
http://piwik.net/grue/lair
direct
@@ -1491,36 +1491,36 @@
-
- Unknown
+ fr
+ French
Desktop
plugins/Morpheus/icons/dist/devices/desktop.png
- Dell
+ Unknown
Generic Desktop
- Windows 7
+ Windows XP
Windows
plugins/Morpheus/icons/dist/os/WIN.png
WIN
- 7
- Trident
- Trident (IE)
- Internet Explorer 11.0
- Internet Explorer
- plugins/Morpheus/icons/dist/browsers/IE.png
- IE
- 11.0
+ XP
+ Gecko
+ Gecko (Firefox)
+ Firefox 3.6
+ Firefox
+ plugins/Morpheus/icons/dist/browsers/FF.png
+ FF
+ 3.6
0
- North America
- amn
- United States
- us
- plugins/Morpheus/icons/dist/flags/us.png
-
-
-
- United States
- 38
- -97
+ Europe
+ eur
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ Warwickshire
+ WAR
+ Stratford-upon-Avon
+ Stratford-upon-Avon, Warwickshire, United Kingdom
+ 124.456000
+ 22.231000
12:34:06
12
0
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml
index 60da53629274..c127500f8752 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml
@@ -1364,10 +1364,10 @@
1
- 8
- 1.2.4.3
+ 30
+ 113.62.1.1
- 9b641f2d195745f4
+ d5a95c7fe2a8286d
action
@@ -1376,7 +1376,7 @@
4
- 19
+ 80
1621
27 min 1s
@@ -1394,7 +1394,7 @@
1
5
- 19
+ 80
http://piwik.net/space/quest/iv
direct
@@ -1431,7 +1431,7 @@
22
- 20
+ 81
1
plugins/Morpheus/images/download.png
@@ -1448,7 +1448,7 @@
23
- 21
+ 82
1
plugins/Morpheus/images/link.png
@@ -1464,7 +1464,7 @@
8
- 22
+ 83
Cat3
Action3
@@ -1520,36 +1520,36 @@
- fr
- French
- Desktop
- plugins/Morpheus/icons/dist/devices/desktop.png
- Unknown
- Generic Desktop
- Windows XP
- Windows
- plugins/Morpheus/icons/dist/os/WIN.png
- WIN
- XP
- Gecko
- Gecko (Firefox)
- Firefox 3.6
- Firefox
- plugins/Morpheus/icons/dist/browsers/FF.png
- FF
- 3.6
+
+ Unknown
+ Tablet
+ plugins/Morpheus/icons/dist/devices/tablet.png
+ Sony
+ Xperia Tablet S
+ Android 4.1
+ Android
+ plugins/Morpheus/icons/dist/os/AND.png
+ AND
+ 4.1
+ Blink
+ Blink (Chrome, Opera)
+ Chrome 34.0
+ Chrome
+ plugins/Morpheus/icons/dist/browsers/CH.png
+ CH
+ 34.0
1
- Europe
- eur
- United Kingdom
- gb
- plugins/Morpheus/icons/dist/flags/gb.png
- London, City of
- LND
- London
- London, London, City of, United Kingdom
-
-
+ Asia
+ asi
+ China
+ cn
+ plugins/Morpheus/icons/dist/flags/cn.png
+ Xizang Zizhiqu
+ XZ
+ Lhasa
+ Lhasa, Xizang Zizhiqu, China
+ 29.650000
+ 91.100000
12:34:06
12
0
@@ -1571,22 +1571,14 @@
-
- Cvar 1 name
- Cvar1 value is 3
-
-
- Cvar 5 name
- Cvar5 value is 3
-
1
- 30
- 113.62.1.1
+ 8
+ 1.2.4.3
- d5a95c7fe2a8286d
+ 9b641f2d195745f4
action
@@ -1595,7 +1587,7 @@
4
- 80
+ 19
1621
27 min 1s
@@ -1613,7 +1605,7 @@
1
5
- 80
+ 19
http://piwik.net/space/quest/iv
direct
@@ -1650,7 +1642,7 @@
22
- 81
+ 20
1
plugins/Morpheus/images/download.png
@@ -1667,7 +1659,7 @@
23
- 82
+ 21
1
plugins/Morpheus/images/link.png
@@ -1683,7 +1675,7 @@
8
- 83
+ 22
Cat3
Action3
@@ -1739,36 +1731,36 @@
-
- Unknown
- Tablet
- plugins/Morpheus/icons/dist/devices/tablet.png
- Sony
- Xperia Tablet S
- Android 4.1
- Android
- plugins/Morpheus/icons/dist/os/AND.png
- AND
- 4.1
- Blink
- Blink (Chrome, Opera)
- Chrome 34.0
- Chrome
- plugins/Morpheus/icons/dist/browsers/CH.png
- CH
- 34.0
+ fr
+ French
+ Desktop
+ plugins/Morpheus/icons/dist/devices/desktop.png
+ Unknown
+ Generic Desktop
+ Windows XP
+ Windows
+ plugins/Morpheus/icons/dist/os/WIN.png
+ WIN
+ XP
+ Gecko
+ Gecko (Firefox)
+ Firefox 3.6
+ Firefox
+ plugins/Morpheus/icons/dist/browsers/FF.png
+ FF
+ 3.6
1
- Asia
- asi
- China
- cn
- plugins/Morpheus/icons/dist/flags/cn.png
- Xizang Zizhiqu
- XZ
- Lhasa
- Lhasa, Xizang Zizhiqu, China
- 29.650000
- 91.100000
+ Europe
+ eur
+ United Kingdom
+ gb
+ plugins/Morpheus/icons/dist/flags/gb.png
+ London, City of
+ LND
+ London
+ London, London, City of, United Kingdom
+
+
12:34:06
12
0
@@ -1790,6 +1782,14 @@
+
+ Cvar 1 name
+ Cvar1 value is 3
+
+
+ Cvar 5 name
+ Cvar5 value is 3
+
\ No newline at end of file