From 9edfabf98af8ab91b1f4813d7d16e0e290ad1624 Mon Sep 17 00:00:00 2001
From: Denis Demchenko <lancedikson@gmail.com>
Date: Tue, 2 Jun 2020 00:32:03 +0300
Subject: [PATCH] chore(tests): fix tests for Firefox iOS

relevant to #401
---
 src/parser-browsers.js               | 19 +++++++++--
 test/acceptance/useragentstrings.yml | 49 ++++++++++++++--------------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/parser-browsers.js b/src/parser-browsers.js
index 41eef0a..b5e5164 100644
--- a/src/parser-browsers.js
+++ b/src/parser-browsers.js
@@ -532,12 +532,27 @@ const browsersList = [
     },
   },
   {
-    test: [/firefox|iceweasel|fxios/i],
+    test: [/fxios/i],
+    describe(ua) {
+      const browser = {
+        name: 'Firefox iOS',
+      };
+      const version = Utils.getFirstMatch(/(?:fxios)[\s/](\d+(\.?_?\d+)+)/i, ua);
+
+      if (version) {
+        browser.version = version;
+      }
+
+      return browser;
+    },
+  },
+  {
+    test: [/firefox|iceweasel/i],
     describe(ua) {
       const browser = {
         name: 'Firefox',
       };
-      const version = Utils.getFirstMatch(/(?:firefox|iceweasel|fxios)[\s/](\d+(\.?_?\d+)+)/i, ua);
+      const version = Utils.getFirstMatch(/(?:firefox|iceweasel)[\s/](\d+(\.?_?\d+)+)/i, ua);
 
       if (version) {
         browser.version = version;
diff --git a/test/acceptance/useragentstrings.yml b/test/acceptance/useragentstrings.yml
index 48359d1..fd253f3 100644
--- a/test/acceptance/useragentstrings.yml
+++ b/test/acceptance/useragentstrings.yml
@@ -700,6 +700,7 @@
         os:
           name: "Android"
           version: "7.0"
+          versionName: "Nougat"
         platform:
           type: "mobile"
         engine:
@@ -1805,22 +1806,6 @@
         engine:
           name: "Gecko"
           version: "20061014"
-    -
-      ua: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) FxiOS/3.0 Mobile/13E238 Safari/601.1.46"
-      spec:
-        browser:
-          name: "Firefox"
-          version: "3.0"
-        os:
-          name: "iOS"
-          version: "9.3.1"
-        platform:
-          type: "mobile"
-          vendor: "Apple"
-          model: "iPhone"
-        engine:
-          name: "WebKit"
-          version: "601.1.46"
     -
       ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:68.0) Gecko/20100101 Firefox/68.0"
       spec:
@@ -1837,15 +1822,14 @@
         engine:
           name: "Gecko"
           version: "20100101"
-    -
-      ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/21.0 Version/13.0.3 Safari/605.1.15"
+  "Firefox iOS":
+    - ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/24.1 Safari/605.1.15"
       spec:
         browser:
-          name: "Firefox"
-          version: "21.0"
+          name: "Firefox iOS"
+          version: "24.1"
         os:
           name: "iOS"
-          version: "13.0.3"
         platform:
           type: "tablet"
           vendor: "Apple"
@@ -1853,14 +1837,29 @@
         engine:
           name: "WebKit"
           version: "605.1.15"
-    -
-      ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/24.1 Safari/605.1.15"
+    - ua: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) FxiOS/3.0 Mobile/13E238 Safari/601.1.46"
       spec:
         browser:
-          name: "Firefox"
-          version: "24.1"
+          name: "Firefox iOS"
+          version: "3.0"
         os:
           name: "iOS"
+          version: "9.3.1"
+        platform:
+          type: "mobile"
+          vendor: "Apple"
+          model: "iPhone"
+        engine:
+          name: "WebKit"
+          version: "601.1.46"
+    - ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/21.0 Version/13.0.3 Safari/605.1.15"
+      spec:
+        browser:
+          name: "Firefox iOS"
+          version: "21.0"
+        os:
+          name: "iOS"
+          version: "13.0.3"
         platform:
           type: "tablet"
           vendor: "Apple"