Merge dev

2 files changed, 9 insertions, 2 deletions

diff --git a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt
index e2a6f4ae..ca842ed9 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt
@@ -84,6 +84,13 @@ class FbUrlTest {
     }
 
     @Test
+    fun fbclidNonFacebook() {
+        val url = "https://www.google.ca?foo&fbclid=abc&bar=bbb"
+        val formattedUrl = "https://www.google.ca?foo&bar=bbb"
+        assertFbFormat(formattedUrl, url)
+    }
+
+    @Test
     fun doubleDash() {
         assertFbFormat("${FB_URL_BASE}relative", "$FB_URL_BASE/relative")
     }
diff --git a/app/src/test/kotlin/com/pitchedapps/frost/utils/BuildUtilsTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/utils/BuildUtilsTest.kt
index b3d44d69..e6b0beab 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/utils/BuildUtilsTest.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/utils/BuildUtilsTest.kt
@@ -27,8 +27,8 @@ class BuildUtilsTest {
     @Test
     fun matchingVersions() {
         assertNull(BuildUtils.match("unknown"))
-        assertEquals(BuildUtils.Data("1.0.0", ""), BuildUtils.match("1.0.0"))
-        assertEquals(BuildUtils.Data("2.0.1", "26-af40533-debug"), BuildUtils.match("2.0.1-26-af40533-debug"))
+        assertEquals(BuildUtils.Data("v1.0.0", ""), BuildUtils.match("1.0.0"))
+        assertEquals(BuildUtils.Data("v2.0.1", "26-af40533-debug"), BuildUtils.match("2.0.1-26-af40533-debug"))
     }
 
     @Test