From 8d7ef744acca82964de4fff28c214579adc304b0 Mon Sep 17 00:00:00 2001 From: Denis Demchenko Date: Tue, 17 Jul 2018 21:21:56 +0300 Subject: [PATCH] Fix detection of Nexus devices fixes #233 --- src/parser-platforms.js | 4 ++-- test/acceptance/useragentstrings.yml | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/parser-platforms.js b/src/parser-platforms.js index 9a203eb..3280e26 100644 --- a/src/parser-platforms.js +++ b/src/parser-platforms.js @@ -14,7 +14,7 @@ const TYPES_LABELS = { export default [ /* Nexus Tablet */ { - test: [/nexus\s*[0-9]+/i], + test: [/nexus\s*(?:7|8|9|10).*/i], describe() { return { type: TYPES_LABELS.tablet, @@ -87,7 +87,7 @@ export default [ /* Nexus Mobile */ { - test: [/nexus\s*[0-6]\s*/i, /galaxy nexus/i], + test: [/nexus\s*[0-6].*/i, /galaxy nexus/i], describe() { return { type: TYPES_LABELS.mobile, diff --git a/test/acceptance/useragentstrings.yml b/test/acceptance/useragentstrings.yml index bd58f3f..56976aa 100644 --- a/test/acceptance/useragentstrings.yml +++ b/test/acceptance/useragentstrings.yml @@ -254,7 +254,21 @@ type: "tablet" engine: name: "Blink" - Amazon Silk: + - + ua: "Mozilla/5.0 (Linux; Android 7.0; Nexus 6P Build/NRD90T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36" + spec: + browser: + name: "Chrome" + version: "63.0.3239.111" + os: + name: "Android" + version: "7.0" + platform: + type: "mobile" + vendor: "Nexus" + engine: + name: "Blink" + Amazon Silk: - ua: "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFTT Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.4 Mobile Safari/535.19 Silk-Accelerated=true" spec: @@ -607,7 +621,7 @@ name: "Android" version: "5.1.1" platform: - type: "tablet" + type: "mobile" vendor: "Nexus" engine: name: "Blink"