improves and updates some detections

matomo-org · Dec 22, 2019 · c352144 · c352144
1 parent 2315ff4
commit c352144
Show file tree

Hide file tree

Showing 19 changed files with 1,763 additions and 1,611 deletions.
diff --git a/Tests/fixtures/phablet.yml b/Tests/fixtures/phablet.yml
@@ -984,26 +984,6 @@
     model: Lumia 640 XL
   os_family: Windows
   browser_family: Internet Explorer
-- 
-  user_agent: Mozilla/5.0 (Windows Phone 10.0; Android 6.0.1; Microsoft; RM-1096) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Mobile Safari/537.36 Edge/15.15063
-  os:
-    name: Windows Phone
-    short_name: WPH
-    version: "10.0"
-    platform: ""
-  client:
-    type: browser
-    name: Microsoft Edge
-    short_name: PS
-    version: "15.15063"
-    engine: Edge
-    engine_version: "15.15063"
-  device:
-    type: phablet
-    brand: MS
-    model: Lumia 640 XL
-  os_family: Windows Mobile
-  browser_family: Internet Explorer
 - 
   user_agent: Windows Phone Ad Client/6.2.960.0 (Silverlight; MS_ORMMA_1_0; Windows Phone OS 10.0.13384.0; Microsoft; RM-1067_1005)
   os:
@@ -1038,6 +1018,26 @@
     model: Lumia 640 XL
   os_family: Windows Mobile
   browser_family: Internet Explorer
+- 
+  user_agent: Mozilla/5.0 (Windows Phone 10.0; Android 6.0.1; Microsoft; RM-1096) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Mobile Safari/537.36 Edge/15.15063
+  os:
+    name: Windows Phone
+    short_name: WPH
+    version: "10.0"
+    platform: ""
+  client:
+    type: browser
+    name: Microsoft Edge
+    short_name: PS
+    version: "15.15063"
+    engine: Edge
+    engine_version: "15.15063"
+  device:
+    type: phablet
+    brand: MS
+    model: Lumia 640 XL
+  os_family: Windows Mobile
+  browser_family: Internet Explorer
 - 
   user_agent: UCWEB/2.0 (Windows; U; wds 10.0; en-IN; Microsoft; RM-1065_1008) U2/1.0.0 UCBrowser/4.2.1.541 U2/1.0.0 Mobile
   os:
@@ -1355,6 +1355,26 @@
     model: GALAXY Grand Prime
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 5.0.2; SM-G530F Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/57.0.2987.108 Mobile Safari/537.36 UCBrowser/12.10.0.1163 UCTurbo/1.4.2.893
+  os:
+    name: Android
+    short_name: AND
+    version: "5.0.2"
+    platform: ""
+  client:
+    type: browser
+    name: UC Browser Turbo
+    short_name: UT
+    version: "1.4.2.893"
+    engine: WebKit
+    engine_version: "537.36"
+  device:
+    type: phablet
+    brand: SA
+    model: GALAXY Grand Prime
+  os_family: Android
+  browser_family: Unknown
 - 
   user_agent: Mozilla/5.0 (Linux; Android 5.1.1; SAMSUNG SM-G531F Build/LMY48B) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/3.3 Chrome/38.0.2125.102 Mobile Safari/537.36
   os:

diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml
@@ -1,4 +1,24 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; 4028A Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.2"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "40.0.2214.109"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: AL
+    model: One Touch Pixi 3 4.5"
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 4.4.2; 4028J Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36
   os:
@@ -7291,6 +7311,26 @@
     model: BV6000
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 7.0; BV6000 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/57.0.2987.108 UCBrowser/12.10.0.1163 UCTurbo/1.7.9.900 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "7.0"
+    platform: ""
+  client:
+    type: browser
+    name: UC Browser Turbo
+    short_name: UT
+    version: "1.7.9.900"
+    engine: WebKit
+    engine_version: "537.36"
+  device:
+    type: smartphone
+    brand: B2
+    model: BV6000
+  os_family: Android
+  browser_family: Unknown
 - 
   user_agent: Mozilla/5.0 (Linux; Android 7.0; BV6000 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.95 YaBrowser/17.1.1.359.00 Mobile Safari/537.36
   os:
@@ -7671,6 +7711,46 @@
     model: FRSP4
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.0.4; BO-LFSP4 Build/IMM76I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.117 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.0.4"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "37.0.2062.117"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: B4
+    model: LifeStyle 4DC
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.2.2; BO-LFSPSL4 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.117 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.2.2"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "37.0.2062.117"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: B4
+    model: LifeStyle 4SL
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 4.2.2; BO-LFSPBS5 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36
   os:
@@ -7688,7 +7768,27 @@
   device:
     type: smartphone
     brand: B4
-    model: LFSPBS5
+    model: LifeStyle 5BS
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.2.2; BO-LFSPSL6QCI Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.132 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.2.2"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "57.0.2987.132"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: B4
+    model: LifeStyle 6QC
   os_family: Android
   browser_family: Chrome
 - 
@@ -9811,103 +9911,3 @@
     model: SL 04
   os_family: Android
   browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 7.0; Blaupunkt SM 01 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "7.0"
-    platform: ""
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "64.0.3282.137"
-    engine: Blink
-    engine_version: ""
-  device:
-    type: smartphone
-    brand: BP
-    model: SM 01
-  os_family: Android
-  browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; fr-fr; CENTURION Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.2.2"
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: BR
-    model: CENTURION
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; CENTURION 3 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.96 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "4.4.2"
-    platform: ""
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "41.0.2272.96"
-    engine: Blink
-    engine_version: ""
-  device:
-    type: smartphone
-    brand: BR
-    model: CENTURION 3
-  os_family: Android
-  browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; GLADIATOR Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.0.4"
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: BR
-    model: GLADIATOR
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 4.2.1; GLADIATOR-2 Build/JOP40D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "4.2.1"
-    platform: ""
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "34.0.1847.114"
-    engine: Blink
-    engine_version: ""
-  device:
-    type: smartphone
-    brand: BR
-    model: GLADIATOR 2
-  os_family: Android
-  browser_family: Chrome