diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml index 94de0f5a79..c079af48a7 100644 --- a/Tests/fixtures/tablet-1.yml +++ b/Tests/fixtures/tablet-1.yml @@ -1,4 +1,64 @@ --- +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; es-es; IdeaTabA2109A Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 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: tablet + brand: LE + model: IdeaTab A2109A + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 4.1.1; IdeaTabA2109A Build/JRO03R) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Safari/537.36 + os: + name: Android + short_name: AND + version: "4.1.1" + platform: + client: + type: browser + name: Chrome + short_name: CH + version: "31.0.1650.59" + engine: Blink + engine_version: + device: + type: tablet + brand: LE + model: IdeaTab A2109A + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.2.2; Lenovo A3000-H Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.98 Safari/537.36 + os: + name: Android + short_name: AND + version: "4.2.2" + platform: + client: + type: browser + name: Chrome + short_name: CH + version: "52.0.2743.98" + engine: Blink + engine_version: + device: + type: tablet + brand: LE + model: IdeaTab A3000 + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 4.2.2; Lenovo A3500-FL Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Safari/537.36 os: @@ -9930,63 +9990,3 @@ model: "eZee'Tab903" os_family: Android browser_family: Android Browser -- - user_agent: "Mozilla/5.0 (Linux; U; Android 4.2.2; fr-fr; eZee'Tab904 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 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: tablet - brand: ST - model: "eZee'Tab904" - os_family: Android - browser_family: Android Browser -- - user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; fr-fr; eZee’Tab 971 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 - os: - name: Android - short_name: AND - version: "4.1.1" - platform: - client: - type: browser - name: Android Browser - short_name: AN - version: - engine: WebKit - engine_version: "534.30" - device: - type: tablet - brand: ST - model: "eZee'Tab971" - os_family: Android - browser_family: Android Browser -- - user_agent: Mozilla/5.0 (Linux; Android 4.1.1; eZee Tab973 Build/JRO03H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Safari/537.36 - os: - name: Android - short_name: AND - version: "4.1.1" - platform: - client: - type: browser - name: Chrome - short_name: CH - version: "34.0.1847.114" - engine: Blink - engine_version: - device: - type: tablet - brand: ST - model: "eZee'Tab973" - os_family: Android - browser_family: Chrome diff --git a/Tests/fixtures/tablet-2.yml b/Tests/fixtures/tablet-2.yml index aee2a8482e..4a6e942610 100644 --- a/Tests/fixtures/tablet-2.yml +++ b/Tests/fixtures/tablet-2.yml @@ -1,4 +1,64 @@ --- +- + user_agent: "Mozilla/5.0 (Linux; U; Android 4.2.2; fr-fr; eZee'Tab904 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 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: tablet + brand: ST + model: "eZee'Tab904" + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; fr-fr; eZee’Tab 971 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: "4.1.1" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + engine_version: "534.30" + device: + type: tablet + brand: ST + model: "eZee'Tab971" + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 4.1.1; eZee Tab973 Build/JRO03H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Safari/537.36 + os: + name: Android + short_name: AND + version: "4.1.1" + platform: + client: + type: browser + name: Chrome + short_name: CH + version: "34.0.1847.114" + engine: Blink + engine_version: + device: + type: tablet + brand: ST + model: "eZee'Tab973" + os_family: Android + browser_family: Chrome - user_agent: "Mozilla/5.0 (Linux; U; Android 4.2.2; fr-fr; eZee'TAB973 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30" os: diff --git a/Tests/fixtures/tablet.yml b/Tests/fixtures/tablet.yml index 2752664019..93ccdebfeb 100644 --- a/Tests/fixtures/tablet.yml +++ b/Tests/fixtures/tablet.yml @@ -9144,6 +9144,66 @@ model: CoreX4 3G os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; Cavion Base 10 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome + short_name: CH + version: "30.0.0.0" + engine: Blink + engine_version: + device: + type: tablet + brand: K1 + model: Cavion Base 10 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; CAVION_10_3GRQ Build/LMY48Y) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1.1" + platform: + client: + type: browser + name: Chrome + short_name: CH + version: "39.0.0.0" + engine: Blink + engine_version: + device: + type: tablet + brand: K1 + model: Cavion Base 10 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; Cavion Base 7 Dual Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome + short_name: CH + version: "30.0.0.0" + engine: Blink + engine_version: + device: + type: tablet + brand: K1 + model: Cavion Base 7 + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; pl-pl; CORE 10.1 DUAL 3G Build/JRO03H) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 os: @@ -9918,63 +9978,3 @@ model: IdeaTab A2107A os_family: Android browser_family: Unknown -- - user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; es-es; IdeaTabA2109A Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 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: tablet - brand: LE - model: IdeaTab A2109A - os_family: Android - browser_family: Android Browser -- - user_agent: Mozilla/5.0 (Linux; Android 4.1.1; IdeaTabA2109A Build/JRO03R) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Safari/537.36 - os: - name: Android - short_name: AND - version: "4.1.1" - platform: - client: - type: browser - name: Chrome - short_name: CH - version: "31.0.1650.59" - engine: Blink - engine_version: - device: - type: tablet - brand: LE - model: IdeaTab A2109A - os_family: Android - browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 4.2.2; Lenovo A3000-H Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.98 Safari/537.36 - os: - name: Android - short_name: AND - version: "4.2.2" - platform: - client: - type: browser - name: Chrome - short_name: CH - version: "52.0.2743.98" - engine: Blink - engine_version: - device: - type: tablet - brand: LE - model: IdeaTab A3000 - os_family: Android - browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index aaca531162..ca93d95da5 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -2180,12 +2180,15 @@ Kazam: # Kiano Kiano: - regex: 'Kiano|Elegance_5_0|CORE 10.1 DUAL 3G|Intelect ?(7|8|10)|Slim ?Tab ?\d+(?:[_ ]3GR?)?[);/ ]' + regex: 'Kiano|Elegance_5_0|CORE 10.1 DUAL 3G|Intelect ?(7|8|10)|Slim ?Tab ?\d+(?:[_ ]3GR?)?[);/ ]|Cavion[_ ]' device: 'smartphone' models: - regex: 'Slim ?Tab ?(\d+)(?:[_ ]3GR?)?' model: 'Slim Tab $1' device: 'tablet' + - regex: 'Cavion[_ ](?:Base[_ ])?(\d+)' + model: 'Cavion Base $1' + device: 'tablet' - regex: 'CORE 10.1 DUAL 3G' model: 'CORE 10.1 DUAL 3G' device: 'tablet'