Merge branch 'release/5.41.0'

Author: subsymbolic

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.1)
+    CFPropertyList (3.0.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
@@ -18,16 +18,16 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
     emoji_regex (1.0.1)
-    excon (0.67.0)
-    faraday (0.17.0)
+    excon (0.71.1)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.7)
-    fastlane (2.134.0)
+    fastlane (2.139.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -36,13 +36,13 @@ GEM
       commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 2.0)
-      excon (>= 0.45.0, < 1.0.0)
+      excon (>= 0.71.0, < 1.0.0)
       faraday (~> 0.17)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 0.13.1)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.24.0)
+      google-api-client (>= 0.29.2, < 0.37.0)
       google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
@@ -61,46 +61,46 @@ GEM
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.8.1, < 2.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-property_file_read (1.0.1)
     gh_inspector (1.1.3)
-    google-api-client (0.23.9)
+    google-api-client (0.36.4)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
+      googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
+      mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-      signet (~> 0.9)
-    google-cloud-core (1.3.2)
+      signet (~> 0.12)
+    google-cloud-core (1.4.1)
       google-cloud-env (~> 1.0)
-    google-cloud-env (1.2.1)
+    google-cloud-env (1.3.0)
       faraday (~> 0.11)
-    google-cloud-storage (1.16.0)
+    google-cloud-storage (1.25.0)
+      addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.23)
+      google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
-      googleauth (>= 0.6.2, < 0.10.0)
-    googleauth (0.6.7)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.10.0)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
+      signet (~> 0.12)
     highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    json (2.2.0)
+    json (2.3.0)
     jwt (2.1.0)
-    memoist (0.16.0)
-    mime-types (3.3)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_magick (4.9.5)
+    memoist (0.16.2)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -122,7 +122,7 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.6)
+    simctl (1.6.7)
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
@@ -131,15 +131,15 @@ GEM
       unicode-display_width (~> 1.1, >= 1.1.1)
     tty-cursor (0.7.0)
     tty-screen (0.7.0)
-    tty-spinner (0.9.1)
+    tty-spinner (0.9.2)
       tty-cursor (~> 0.7)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.13.0)
+    xcodeproj (1.14.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

app/src/androidTest/java/com/duckduckgo/app/ValueCaptorObserver.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app
+
+import androidx.lifecycle.Observer
+
+/**
+ * Concrete class of Observer<T> to validate if any value has been received when observing a LiveData
+ *
+ * @param skipFirst: skip first value emitted by LiveData stream.
+ * SkipFirst is usually:
+ * Set to False to observe a SingleLiveEvent or any LiveData that starts emitting after subscription.
+ * Set to True when observing any LiveData that emits its lastValue on subscription.
+ */
+class ValueCaptorObserver<T>(private var skipFirst: Boolean = true) : Observer<T> {
+    var hasReceivedValue = false
+        private set
+
+    var lastValueReceived: T? = null
+        private set
+
+    override fun onChanged(t: T) {
+        if (skipFirst) {
+            skipFirst = false
+            return
+        }
+        lastValueReceived = t
+        hasReceivedValue = true
+    }
+}

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserChromeClientTest.kt

@@ -19,16 +19,14 @@
 package com.duckduckgo.app.browser
 
 import android.content.Context
+import android.os.Message
 import android.view.View
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.test.annotation.UiThreadTest
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import com.duckduckgo.app.global.exception.UncaughtExceptionRepository
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.*
 import org.junit.Before
 import org.junit.Test
 
@@ -93,5 +91,25 @@ class BrowserChromeClientTest {
         verify(mockWebViewClientListener).navigationStateChanged(any())
     }
 
+    @UiThreadTest
+    @Test
+    fun whenOnCreateWindowWithUserGestureThenMessageOpenedInNewTab() {
+        testee.onCreateWindow(webView, isDialog = false, isUserGesture = true, resultMsg = mockMsg)
+        verify(mockWebViewClientListener).openMessageInNewTab(eq(mockMsg))
+        verifyNoMoreInteractions(mockWebViewClientListener)
+    }
+
+    @UiThreadTest
+    @Test
+    fun whenOnCreateWindowWithoutUserGestureThenNewTabNotOpened() {
+        testee.onCreateWindow(webView, isDialog = false, isUserGesture = false, resultMsg = mockMsg)
+        verifyZeroInteractions(mockWebViewClientListener)
+    }
+
+    private val mockMsg = Message().apply {
+        target = mock()
+        obj = mock<WebView.WebViewTransport>()
+    }
+
     private class TestWebView(context: Context) : WebView(context)
 }