From 4c70ada09c72a05e2a536785bc11465569d7087b Mon Sep 17 00:00:00 2001
From: Thiago Valle <thiagoqvalle@pm.me>
Date: Wed, 6 Jan 2021 22:04:24 -0400
Subject: [PATCH] Fix tab being redirected to first tab #879

---
 .../com/duckduckgo/app/browser/BrowserTabViewModelTest.kt | 8 ++++----
 .../com/duckduckgo/app/browser/BrowserTabViewModel.kt     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
index bc68dc91372b..60bd38757c88 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -541,7 +541,7 @@ class BrowserTabViewModelTest {
         testee.onUserSubmittedQuery("foo")
 
         coroutineRule.runBlocking {
-            verify(mockTabsRepository).delete(selectedTabLiveData.value!!)
+            verify(mockTabsRepository).deleteCurrentTabAndSelectSource()
         }
     }
 
@@ -1196,7 +1196,7 @@ class BrowserTabViewModelTest {
         testee.onRefreshRequested()
 
         coroutineRule.runBlocking {
-            verify(mockTabsRepository).delete(selectedTabLiveData.value!!)
+            verify(mockTabsRepository).deleteCurrentTabAndSelectSource()
         }
     }
 
@@ -1446,7 +1446,7 @@ class BrowserTabViewModelTest {
         showErrorWithAction.action()
 
         coroutineRule.runBlocking {
-            verify(mockTabsRepository).delete(selectedTabLiveData.value!!)
+            verify(mockTabsRepository).deleteCurrentTabAndSelectSource()
         }
     }
 
@@ -1618,7 +1618,7 @@ class BrowserTabViewModelTest {
     fun whenCloseCurrentTabSelectedThenTabDeletedFromRepository() = runBlocking {
         givenOneActiveTabSelected()
         testee.closeCurrentTab()
-        verify(mockTabsRepository).delete(selectedTabLiveData.value!!)
+        verify(mockTabsRepository).deleteCurrentTabAndSelectSource()
     }
 
     @Test
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
index 29c11bcd7a84..6c04e125007a 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -559,7 +559,7 @@ class BrowserTabViewModel(
     private suspend fun removeCurrentTabFromRepository() {
         val currentTab = tabRepository.liveSelectedTab.value
         currentTab?.let {
-            tabRepository.delete(currentTab)
+            tabRepository.deleteCurrentTabAndSelectSource()
         }
     }