For 11468 - Show tab tray after opening links from history and bookmarks

app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt

@@ -340,7 +340,7 @@ class BookmarksTest {
         }
 
         multipleSelectionToolbar {
-        }.clickOpenNewTab { }.openTabDrawer {
+        }.clickOpenNewTab {
             verifyNormalModeSelected()
             verifyExistingTabList()
         }
@@ -363,7 +363,7 @@ class BookmarksTest {
         }
 
         multipleSelectionToolbar {
-        }.clickOpenPrivateTab { }.openTabDrawer {
+        }.clickOpenPrivateTab {
             verifyPrivateModeSelected()
             verifyExistingTabList()
         }

app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt

@@ -216,7 +216,7 @@ class HistoryTest {
         }
 
         multipleSelectionToolbar {
-        }.clickOpenNewTab { }.openTabDrawer {
+        }.clickOpenNewTab {
             verifyExistingTabList()
             verifyNormalModeSelected()
         }
@@ -236,7 +236,7 @@ class HistoryTest {
         }
 
         multipleSelectionToolbar {
-        }.clickOpenPrivateTab { }.openTabDrawer {
+        }.clickOpenPrivateTab {
             verifyPrivateModeSelected()
             verifyExistingTabList()
         }

app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt

@@ -85,23 +85,26 @@ class LibrarySubMenusMultipleSelectionToolbarRobot {
             return BookmarksRobot.Transition()
         }
 
-        fun clickOpenNewTab(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
+        fun clickOpenNewTab(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
             openInNewTabButton().click()
-            mDevice.waitNotNull(Until.findObject(By.text("Collections")), waitingTime)
-
-            HomeScreenRobot().interact()
-            return HomeScreenRobot.Transition()
-        }
-
-        fun clickOpenPrivateTab(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
-            openInPrivateTabButton().click()
             mDevice.waitNotNull(
-                Until.findObject(By.text(PRIVATE_SESSION_MESSAGE)),
+                Until.findObject(By.res("org.mozilla.fenix.debug:id/tab_layout")),
                 waitingTime
             )
 
-            HomeScreenRobot().interact()
+            TabDrawerRobot().interact()
-            return HomeScreenRobot.Transition()
+            return TabDrawerRobot.Transition()
+        }
+
+        fun clickOpenPrivateTab(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
+            openInPrivateTabButton().click()
+            mDevice.waitNotNull(
+                Until.findObject(By.res("org.mozilla.fenix.debug:id/tab_layout")),
+                waitingTime
+            )
+
+            TabDrawerRobot().interact()
+            return TabDrawerRobot.Transition()
         }
     }
 }

app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt

@@ -26,6 +26,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.By.text
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.Until
 import androidx.test.uiautomator.Until.findObject
 import org.hamcrest.CoreMatchers.allOf
 import org.mozilla.fenix.R
@@ -104,6 +105,20 @@ class TabDrawerRobot {
             return ThreeDotMenuMainRobot.Transition()
         }
 
+        fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
+            org.mozilla.fenix.ui.robots.mDevice.waitForIdle()
+
+            tabsCounter().click()
+
+            org.mozilla.fenix.ui.robots.mDevice.waitNotNull(
+                Until.findObject(By.res("org.mozilla.fenix.debug:id/tab_layout")),
+                waitingTime
+            )
+
+            TabDrawerRobot().interact()
+            return TabDrawerRobot.Transition()
+        }
+
         fun openHomeScreen(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
             mDevice.waitForIdle()
 
@@ -196,3 +211,5 @@ private fun tab(title: String) =
             withText(title)
         )
     )
+
+private fun tabsCounter() = onView(withId(R.id.tab_button))

app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt

@@ -204,14 +204,14 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
             R.id.open_bookmarks_in_new_tabs_multi_select -> {
                 openItemsInNewTab { node -> node.url }
 
-                navigate(BookmarkFragmentDirections.actionGlobalHome())
+                navigate(BookmarkFragmentDirections.actionGlobalTabTrayDialogFragment())
                 metrics?.track(Event.OpenedBookmarksInNewTabs)
                 true
             }
             R.id.open_bookmarks_in_private_tabs_multi_select -> {
                 openItemsInNewTab(private = true) { node -> node.url }
 
-                navigate(BookmarkFragmentDirections.actionGlobalHome())
+                navigate(BookmarkFragmentDirections.actionGlobalTabTrayDialogFragment())
                 metrics?.track(Event.OpenedBookmarksInPrivateTabs)
                 true
             }

app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt

@@ -183,7 +183,7 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
 
             nav(
                 R.id.historyFragment,
-                HistoryFragmentDirections.actionGlobalHome()
+                HistoryFragmentDirections.actionGlobalTabTrayDialogFragment()
             )
             true
         }
@@ -199,7 +199,7 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
             }
             nav(
                 R.id.historyFragment,
-                HistoryFragmentDirections.actionGlobalHome()
+                HistoryFragmentDirections.actionGlobalTabTrayDialogFragment()
             )
             true
         }