Merge branch 'release/5.68.0' into main

Author: cmonfortep

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

@@ -108,7 +108,8 @@ import dagger.Lazy
 import io.reactivex.Observable
 import io.reactivex.Single
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
@@ -244,6 +245,8 @@ class BrowserTabViewModelTest {
 
     private val loginEventLiveData = MutableLiveData<LoginDetected>()
 
+    private val dismissedCtaDaoChannel = Channel<List<DismissedCta>>()
+
     @Before
     fun before() {
         MockitoAnnotations.initMocks(this)
@@ -256,7 +259,7 @@ class BrowserTabViewModelTest {
 
         mockAutoCompleteApi = AutoCompleteApi(mockAutoCompleteService, mockBookmarksDao)
 
-        whenever(mockDismissedCtaDao.dismissedCtas()).thenReturn(emptyFlow())
+        whenever(mockDismissedCtaDao.dismissedCtas()).thenReturn(dismissedCtaDaoChannel.consumeAsFlow())
 
         ctaViewModel = CtaViewModel(
             mockAppInstallStore,
@@ -327,6 +330,8 @@ class BrowserTabViewModelTest {
     @ExperimentalCoroutinesApi
     @After
     fun after() {
+        ctaViewModel.forceStopFireButtonPulseAnimation.close()
+        dismissedCtaDaoChannel.close()
         testee.onCleared()
         db.close()
         testee.command.removeObserver(mockCommandObserver)
@@ -590,6 +595,40 @@ class BrowserTabViewModelTest {
         assertEquals("", omnibarViewState().omnibarText)
     }
 
+    @Test
+    fun whenUserRedirectedBeforePreviousSiteLoadedAndNewContentDelayedThenWebContentIsBlankedOut() = coroutineRule.runBlocking {
+        loadUrl("http://duckduckgo.com")
+        testee.progressChanged(50)
+
+        overrideUrl("http://example.com")
+        advanceTimeBy(2000)
+
+        assertCommandIssued<Command.HideWebContent>()
+    }
+
+    @Test
+    fun whenUserRedirectedAfterSiteLoadedAndNewContentDelayedThenWebContentNotBlankedOut() = coroutineRule.runBlocking {
+        loadUrl("http://duckduckgo.com")
+        testee.progressChanged(100)
+
+        overrideUrl("http://example.com")
+        advanceTimeBy(2000)
+
+        assertCommandNotIssued<Command.HideWebContent>()
+    }
+
+    @Test
+    fun whenLoadingProgressReaches50ThenShowWebContent() = coroutineRule.runBlocking {
+        loadUrl("http://duckduckgo.com")
+        testee.progressChanged(50)
+        overrideUrl("http://example.com")
+        advanceTimeBy(2000)
+
+        onProgressChanged(url = "http://example.com", newProgress = 50)
+
+        assertCommandIssued<Command.ShowWebContent>()
+    }
+
     @Test
     fun whenViewModelNotifiedThatUrlGotFocusThenViewStateIsUpdated() = coroutineRule.runBlocking {
         testee.onOmnibarInputStateChanged("", true, hasQueryChanged = false)
@@ -3028,6 +3067,16 @@ class BrowserTabViewModelTest {
         testee.navigationStateChanged(buildWebNavigation(originalUrl = originalUrl, currentUrl = currentUrl))
     }
 
+    @Suppress("SameParameterValue")
+    private fun onProgressChanged(url: String?, newProgress: Int) {
+        testee.navigationStateChanged(buildWebNavigation(originalUrl = url, currentUrl = url, progress = newProgress))
+    }
+
+    private fun overrideUrl(url: String, isBrowserShowing: Boolean = true) {
+        setBrowserShowing(isBrowserShowing)
+        testee.willOverrideUrl(newUrl = url)
+    }
+
     private fun setupNavigation(
         skipHome: Boolean = false,
         isBrowsing: Boolean,
@@ -3052,7 +3101,8 @@ class BrowserTabViewModelTest {
         title: String? = null,
         canGoForward: Boolean = false,
         canGoBack: Boolean = false,
-        stepsToPreviousPage: Int = 0
+        stepsToPreviousPage: Int = 0,
+        progress: Int? = null
     ): WebNavigationState {
         val nav: WebNavigationState = mock()
         whenever(nav.originalUrl).thenReturn(originalUrl)
@@ -3061,6 +3111,7 @@ class BrowserTabViewModelTest {
         whenever(nav.canGoForward).thenReturn(canGoForward)
         whenever(nav.canGoBack).thenReturn(canGoBack)
         whenever(nav.stepsToPreviousPage).thenReturn(stepsToPreviousPage)
+        whenever(nav.progress).thenReturn(progress)
         return nav
     }
 

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

@@ -50,7 +50,8 @@ class EmptyNavigationStateTest {
             stepsToPreviousPage = 1,
             canGoBack = true,
             canGoForward = true,
-            hasNavigationHistory = true
+            hasNavigationHistory = true,
+            progress = null
         )
     }
 }

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

@@ -23,5 +23,6 @@ data class TestNavigationState(
     override val stepsToPreviousPage: Int,
     override val canGoBack: Boolean,
     override val canGoForward: Boolean,
-    override val hasNavigationHistory: Boolean
+    override val hasNavigationHistory: Boolean,
+    override val progress: Int?
 ) : WebNavigationState

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

@@ -126,15 +126,16 @@ class WebNavigationStateComparisonTest {
         assertEquals(Other, latestState.compare(previousState))
     }
 
-    private fun buildState(originalUrl: String?, currentUrl: String?, title: String? = null): WebNavigationState {
+    private fun buildState(originalUrl: String?, currentUrl: String?, title: String? = null, newProgress: Int? = null): WebNavigationState {
         return TestNavigationState(
             originalUrl = originalUrl,
             currentUrl = currentUrl,
             title = title,
             stepsToPreviousPage = 1,
             canGoBack = true,
             canGoForward = true,
-            hasNavigationHistory = true
+            hasNavigationHistory = true,
+            progress = newProgress
         )
     }
 }

app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaTest.kt

@@ -374,6 +374,19 @@ class CtaTest {
         assertTrue(testee.pixelShownParameters().isEmpty())
     }
 
+    @Test
+    fun whenTryClearDataCtaShownThenConcatenateJourneyStoredValueInPixel() {
+        val existingJourney = "s:0-t:1"
+        whenever(mockOnboardingStore.onboardingDialogJourney).thenReturn(existingJourney)
+        whenever(mockAppInstallStore.installTimestamp).thenReturn(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1))
+        val testee = DaxFireDialogCta.TryClearDataCta(mockOnboardingStore, mockAppInstallStore)
+        val expectedValue = "$existingJourney-${testee.ctaPixelParam}:1"
+
+        val value = testee.pixelShownParameters()
+
+        assertEquals(expectedValue, value[CTA_SHOWN])
+    }
+
     private fun site(
         url: String = "http://www.test.com",
         uri: Uri? = Uri.parse(url),

app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt

@@ -56,10 +56,9 @@ import com.duckduckgo.app.trackerdetection.model.TrackingEvent
 import com.duckduckgo.app.widget.ui.WidgetCapabilities
 import com.nhaarman.mockitokotlin2.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
@@ -71,6 +70,7 @@ import org.mockito.Mock
 import org.mockito.MockitoAnnotations
 import java.util.concurrent.TimeUnit
 
+@FlowPreview
 @ExperimentalCoroutinesApi
 class CtaViewModelTest {
 
@@ -583,6 +583,22 @@ class CtaViewModelTest {
         assertFalse(testee.showFireButtonPulseAnimation.first())
     }
 
+    @Test
+    fun whenUserHasAlreadySeenFireButtonPulseAnimationThenFireButtonAnimationShouldNotShow() = coroutineRule.runBlocking {
+        givenFireButtonEducationActive()
+        givenOnboardingActive()
+        whenever(mockDismissedCtaDao.exists(CtaId.DAX_FIRE_BUTTON_PULSE)).thenReturn(true)
+
+        val launch = launch {
+            testee.showFireButtonPulseAnimation.collect {
+                assertFalse(it)
+            }
+        }
+        dismissedCtaDaoChannel.send(emptyList())
+
+        launch.cancel()
+    }
+
     @Test
     fun whenTipsAndFireOnboardingActiveAndUserSeesAnyTriggerFirePulseAnimationCtaThenFireButtonAnimationShouldShow() = coroutineRule.runBlocking {
         givenFireButtonEducationActive()
@@ -601,6 +617,27 @@ class CtaViewModelTest {
         launch.cancel()
     }
 
+    @Test
+    fun whenFireButtonAnimationShowingAndCallDismissThenFireButtonAnimationShouldNotShow() = coroutineRule.runBlocking {
+        var lastValueCollected: Boolean? = null
+        givenFireButtonEducationActive()
+        givenOnboardingActive()
+        val willTriggerFirePulseAnimationCtas = listOf(CtaId.DAX_DIALOG_TRACKERS_FOUND, CtaId.DAX_DIALOG_NETWORK, CtaId.DAX_DIALOG_OTHER)
+        val launch = launch {
+            testee.showFireButtonPulseAnimation.collect {
+                lastValueCollected = it
+            }
+        }
+        willTriggerFirePulseAnimationCtas.forEach {
+            dismissedCtaDaoChannel.send(listOf(DismissedCta(it)))
+        }
+
+        testee.dismissPulseAnimation()
+
+        assertFalse(lastValueCollected!!)
+        launch.cancel()
+    }
+
     @Test
     fun whenTipsAndFireOnboardingActiveAndUserSeesAnyNonTriggerFirePulseAnimationCtaThenFireButtonAnimationShouldNotShow() = coroutineRule.runBlocking {
         givenFireButtonEducationActive()