Merge branch 'release/5.49.1'

Author: cmonfortep

app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt

@@ -24,14 +24,15 @@ import com.duckduckgo.app.InstantSchedulersRule
 import com.duckduckgo.app.autocomplete.api.AutoComplete
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteSearchSuggestion
-import com.duckduckgo.app.onboarding.store.AppStage
-import com.duckduckgo.app.onboarding.store.UserStageStore
+import com.duckduckgo.app.onboarding.store.*
+import com.duckduckgo.app.runBlocking
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.LaunchDuckDuckGo
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Observable
+import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.TestCoroutineScope
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
@@ -98,6 +99,17 @@ class SystemSearchViewModelTest {
         assertFalse(viewState!!.expanded)
     }
 
+    @Test
+    fun whenDatabaseIsSlowThenIntroducingTextDoesNotCrashTheApp() = coroutineRule.runBlocking {
+        (coroutineRule.testDispatcherProvider.io() as TestCoroutineDispatcher).pauseDispatcher()
+        testee =
+            SystemSearchViewModel(givenEmptyUserStageStore(), mockAutoComplete, mockDeviceAppLookup, mockPixel, coroutineRule.testDispatcherProvider)
+        testee.resetViewState()
+        testee.userUpdatedQuery("test")
+
+        //no crash
+    }
+
     @Test
     fun whenOnboardingShownThenPixelSent() = runBlockingTest {
         whenever(mockUserStageStore.getUserAppStage()).thenReturn(AppStage.NEW)
@@ -138,7 +150,7 @@ class SystemSearchViewModelTest {
     }
 
     @Test
-    fun whenUserUpdatesQueryThenViewStateUpdated() = ruleRunBlockingTest {
+    fun whenUserUpdatesQueryThenViewStateUpdated() = coroutineRule.runBlocking {
         testee.userUpdatedQuery(QUERY)
 
         val newViewState = testee.resultsViewState.value
@@ -149,7 +161,7 @@ class SystemSearchViewModelTest {
     }
 
     @Test
-    fun whenUserAddsSpaceToQueryThenViewStateMatchesAndSpaceTrimmedFromAutocomplete() = ruleRunBlockingTest {
+    fun whenUserAddsSpaceToQueryThenViewStateMatchesAndSpaceTrimmedFromAutocomplete() = coroutineRule.runBlocking {
         testee.userUpdatedQuery(QUERY)
         testee.userUpdatedQuery("$QUERY ")
 
@@ -161,7 +173,7 @@ class SystemSearchViewModelTest {
     }
 
     @Test
-    fun whenUserClearsQueryThenViewStateReset() = ruleRunBlockingTest {
+    fun whenUserClearsQueryThenViewStateReset() = coroutineRule.runBlocking {
         testee.userUpdatedQuery(QUERY)
         testee.userClearedQuery()
 
@@ -173,7 +185,7 @@ class SystemSearchViewModelTest {
     }
 
     @Test
-    fun whenUsersUpdatesWithBlankQueryThenViewStateReset() = ruleRunBlockingTest {
+    fun whenUsersUpdatesWithBlankQueryThenViewStateReset() = coroutineRule.runBlocking {
         testee.userUpdatedQuery(QUERY)
         testee.userUpdatedQuery(BLANK_QUERY)
 
@@ -193,7 +205,7 @@ class SystemSearchViewModelTest {
     }
 
     @Test
-    fun whenUserSubmitsQueryThenOnboardingCompleted() = ruleRunBlockingTest {
+    fun whenUserSubmitsQueryThenOnboardingCompleted() = coroutineRule.runBlocking {
         testee.userSubmittedQuery(QUERY)
         verify(mockUserStageStore).stageCompleted(AppStage.NEW)
     }
@@ -224,18 +236,18 @@ class SystemSearchViewModelTest {
     }
 
     @Test
-    fun whenUserTapsDaxThenOnboardingCompleted() = ruleRunBlockingTest {
+    fun whenUserTapsDaxThenOnboardingCompleted() = coroutineRule.runBlocking {
         testee.userTappedDax()
         verify(mockUserStageStore).stageCompleted(AppStage.NEW)
     }
 
     @Test
-    fun whenViewModelCreatedThenAppsRefreshed() = ruleRunBlockingTest {
+    fun whenViewModelCreatedThenAppsRefreshed() = coroutineRule.runBlocking {
         verify(mockDeviceAppLookup).refreshAppList()
     }
 
     @Test
-    fun whenUserSelectsAppThatCannotBeFoundThenAppsRefreshedAndUserMessageShown() = ruleRunBlockingTest {
+    fun whenUserSelectsAppThatCannotBeFoundThenAppsRefreshedAndUserMessageShown() = coroutineRule.runBlocking {
         testee.appNotFound(deviceApp)
         verify(mockDeviceAppLookup, times(2)).refreshAppList()
         verify(commandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
@@ -247,8 +259,13 @@ class SystemSearchViewModelTest {
         testee.resetViewState()
     }
 
-    private fun ruleRunBlockingTest(block: suspend TestCoroutineScope.() -> Unit) =
-        coroutineRule.testDispatcher.runBlockingTest(block)
+    private fun givenEmptyUserStageStore(): UserStageStore {
+        val emptyUserStageDao = object : UserStageDao {
+            override suspend fun currentUserAppStage() = UserStage(appStage = AppStage.NEW)
+            override fun insert(userStage: UserStage) {}
+        }
+        return AppUserStageStore(emptyUserStageDao, coroutineRule.testDispatcherProvider)
+    }
 
     companion object {
         const val QUERY = "abc"

app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt

@@ -88,8 +88,8 @@ class SystemSearchViewModel(
     fun resetViewState() {
         viewModelScope.launch {
             resetOnboardingState()
-            resetResultsState()
         }
+        resetResultsState()
     }
 
     private suspend fun resetOnboardingState() {

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.49.0
+VERSION=5.49.1