Merge branch 'release/5.75.0' into main

Author: aitorvs

app/src/androidTest/java/com/duckduckgo/app/autocomplete/api/AutoCompleteApiTest.kt

@@ -112,7 +112,8 @@ import io.reactivex.Observable
 import io.reactivex.Single
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
@@ -124,6 +125,7 @@ import org.mockito.*
 import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
+import org.mockito.internal.util.DefaultMockingDetails
 import java.io.File
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -256,7 +258,7 @@ class BrowserTabViewModelTest {
 
     @Before
     fun before() {
-        MockitoAnnotations.initMocks(this)
+        MockitoAnnotations.openMocks(this)
         db = Room.inMemoryDatabaseBuilder(getInstrumentation().targetContext, AppDatabase::class.java)
             .allowMainThreadQueries()
             .build()
@@ -541,7 +543,7 @@ class BrowserTabViewModelTest {
         testee.onUserSubmittedQuery("foo")
 
         coroutineRule.runBlocking {
-            verify(mockTabsRepository).delete(selectedTabLiveData.value!!)
+            verify(mockTabsRepository).deleteCurrentTabAndSelectSource()
         }
     }
 
@@ -636,6 +638,16 @@ class BrowserTabViewModelTest {
         assertCommandNotIssued<Command.HideWebContent>()
     }
 
+    @Test
+    fun whenUserRedirectedThenNotifyLoginDetector() = coroutineRule.runBlocking {
+        loadUrl("http://duckduckgo.com")
+        testee.progressChanged(100)
+
+        overrideUrl("http://example.com")
+
+        verify(mockNavigationAwareLoginDetector).onEvent(NavigationEvent.Redirect("http://example.com"))
+    }
+
     @Test
     fun whenLoadingProgressReaches50ThenShowWebContent() = coroutineRule.runBlocking {
         loadUrl("http://duckduckgo.com")
@@ -953,7 +965,7 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenEnteringQueryWithAutoCompleteEnabledThenAutoCompleteSuggestionsShown() {
-        whenever(mockBookmarksDao.bookmarksByQuery("%foo%")).thenReturn(Single.just(emptyList()))
+        whenever(mockBookmarksDao.bookmarksObservable()).thenReturn(Single.just(emptyList()))
         whenever(mockAutoCompleteService.autoComplete("foo")).thenReturn(Observable.just(emptyList()))
         doReturn(true).whenever(mockSettingsStore).autoCompleteSuggestionsEnabled
         testee.onOmnibarInputStateChanged("foo", true, hasQueryChanged = true)
@@ -1196,7 +1208,7 @@ class BrowserTabViewModelTest {
         testee.onRefreshRequested()
 
         coroutineRule.runBlocking {
-            verify(mockTabsRepository).delete(selectedTabLiveData.value!!)
+            verify(mockTabsRepository).deleteCurrentTabAndSelectSource()
         }
     }
 
@@ -1446,7 +1458,7 @@ class BrowserTabViewModelTest {
         showErrorWithAction.action()
 
         coroutineRule.runBlocking {
-            verify(mockTabsRepository).delete(selectedTabLiveData.value!!)
+            verify(mockTabsRepository).deleteCurrentTabAndSelectSource()
         }
     }
 
@@ -1618,7 +1630,7 @@ class BrowserTabViewModelTest {
     fun whenCloseCurrentTabSelectedThenTabDeletedFromRepository() = runBlocking {
         givenOneActiveTabSelected()
         testee.closeCurrentTab()
-        verify(mockTabsRepository).delete(selectedTabLiveData.value!!)
+        verify(mockTabsRepository).deleteCurrentTabAndSelectSource()
     }
 
     @Test
@@ -2460,12 +2472,12 @@ class BrowserTabViewModelTest {
         givenDeviceLocationSharingIsEnabled(true)
         givenLocationPermissionIsEnabled(true)
         givenCurrentSite(domain)
-
+        givenNewPermissionRequestFromDomain(domain)
         testee.onSiteLocationPermissionSelected(domain, LocationPermissionType.ALLOW_ONCE)
 
         givenNewPermissionRequestFromDomain(domain)
 
-        assertCommandNotIssued<Command.CheckSystemLocationPermission>()
+        assertCommandIssuedTimes<Command.CheckSystemLocationPermission>(times = 1)
     }
 
     @Test
@@ -2704,11 +2716,7 @@ class BrowserTabViewModelTest {
         givenLocationPermissionIsEnabled(true)
 
         loadUrl("https://www.example.com", isBrowserShowing = true)
-
-        assertCommandIssued<Command.ShowDomainHasPermissionMessage>()
-
         loadUrl("https://www.example.com", isBrowserShowing = true)
-
         assertCommandIssuedTimes<Command.ShowDomainHasPermissionMessage>(1)
     }
 
@@ -3032,7 +3040,7 @@ class BrowserTabViewModelTest {
         loadUrl("http://duckduckgo.com")
         testee.progressChanged(100)
 
-        assertCommandNotIssued<Command.RefreshUserAgent>()
+        assertCommandIssued<Command.RefreshUserAgent>()
     }
 
     @Test
@@ -3062,6 +3070,34 @@ class BrowserTabViewModelTest {
         assertFalse(browserViewState().canChangeBrowsingMode)
     }
 
+    @Test
+    fun whenRequestFileDownloadAndUrlIsBlobThenConvertBlobToDataUriCommandSent() {
+        val blobUrl = "blob:https://example.com/283nasdho23jkasdAjd"
+        val mime = "application/plain"
+
+        testee.requestFileDownload(blobUrl, null, mime, true)
+
+        assertCommandIssued<Command.ConvertBlobToDataUri> {
+            assertEquals(blobUrl, url)
+            assertEquals(mime, mimeType)
+        }
+    }
+
+    @Test
+    fun whenRequestFileDownloadAndUrlIsNotBlobThenRquestFileDownloadCommandSent() {
+        val normalUrl = "https://example.com/283nasdho23jkasdAjd"
+        val mime = "application/plain"
+
+        testee.requestFileDownload(normalUrl, null, mime, true)
+
+        assertCommandIssued<Command.RequestFileDownload> {
+            assertEquals(normalUrl, url)
+            assertEquals(mime, mimeType)
+            assertNull(contentDisposition)
+            assertTrue(requestUserConfirmation)
+        }
+    }
+
     private suspend fun givenFireButtonPulsing() {
         whenever(mockUserStageStore.getUserAppStage()).thenReturn(AppStage.DAX_ONBOARDING)
         dismissedCtaDaoChannel.send(listOf(DismissedCta(CtaId.DAX_DIALOG_TRACKERS_FOUND)))
@@ -3097,13 +3133,22 @@ class BrowserTabViewModelTest {
     }
 
     private inline fun <reified T : Command> assertCommandNotIssued() {
-        val issuedCommand = commandCaptor.allValues.find { it is T }
-        assertNull(issuedCommand)
+        val defaultMockingDetails = DefaultMockingDetails(mockCommandObserver)
+        if (defaultMockingDetails.invocations.isNotEmpty()) {
+            verify(mockCommandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
+            val issuedCommand = commandCaptor.allValues.find { it is T }
+            assertNull(issuedCommand)
+        }
     }
 
     private inline fun <reified T : Command> assertCommandIssuedTimes(times: Int) {
-        val timesIssued = commandCaptor.allValues.count { it is T }
-        assertEquals(times, timesIssued)
+        if (times == 0) {
+            assertCommandNotIssued<T>()
+        } else {
+            verify(mockCommandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
+            val timesIssued = commandCaptor.allValues.count { it is T }
+            assertEquals(times, timesIssued)
+        }
     }
 
     private fun pixelParams(showedBookmarks: Boolean, bookmarkCapable: Boolean) = mapOf(

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2021 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.browser.downloader
+
+import android.webkit.WebView
+import androidx.test.annotation.UiThreadTest
+import androidx.test.platform.app.InstrumentationRegistry
+import com.duckduckgo.app.browser.R
+import com.nhaarman.mockitokotlin2.spy
+import com.nhaarman.mockitokotlin2.verify
+import org.junit.Before
+import org.junit.Test
+
+class BlobConverterInjectorJsTest {
+    lateinit var testee: BlobConverterInjectorJs
+    private val blobUrl = "blob:https://example.com/283nasdho23jkasdAjd"
+    private val contentType = "application/plain"
+
+    @Before
+    fun setup() {
+        testee = BlobConverterInjectorJs()
+    }
+
+    @UiThreadTest
+    @Test
+    fun whenConvertBlobIntoDataUriAndDownloadThenInjectJsCode() {
+        val jsToEvaluate = getJsToEvaluate().replace("%blobUrl%", blobUrl).replace("%contentType%", contentType)
+        val webView = spy(WebView(InstrumentationRegistry.getInstrumentation().targetContext))
+
+        testee.convertBlobIntoDataUriAndDownload(webView, blobUrl, contentType)
+
+        verify(webView).evaluateJavascript(jsToEvaluate, null)
+    }
+
+    private fun getJsToEvaluate(): String {
+        val js = InstrumentationRegistry.getInstrumentation().targetContext.resources.openRawResource(
+            R.raw.blob_converter
+        )
+            .bufferedReader()
+            .use { it.readText() }
+        return "javascript:$js"
+    }
+}

app/src/androidTest/java/com/duckduckgo/app/browser/downloader/BlobConverterInjectorJsTest.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2021 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.browser.downloader
+
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+
+class BlobConverterJavascriptInterfaceTest {
+
+    lateinit var testee: BlobConverterJavascriptInterface
+    var result: String = ""
+
+    @Before
+    fun setup() {
+        testee = BlobConverterJavascriptInterface { first, second -> result = first + second }
+    }
+
+    @Test
+    fun whenConvertToBlobDataUriThenLambdaCalled() {
+        testee.convertBlobToDataUri("first", "second")
+
+        assertEquals("firstsecond", result)
+    }
+}