Merge branch 'master' of git://github.com/mozilla-mobile/fenix into r…

…eplaceMotionLayout
MarcLeclair · Jan 31, 2020 · 98e24b3 · 98e24b3
2 parents 1eec35d + 89cc565
commit 98e24b3
Show file tree

Hide file tree

Showing 19 changed files with 218 additions and 177 deletions.
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -103,6 +103,7 @@ class BookmarksTest {
             verifyKeyboardVisible()
             addNewFolderName(bookmarksFolderName)
             saveNewFolder()
+            getInstrumentation().waitForIdleSync()
             verifyFolderTitle(bookmarksFolderName)
             verifyKeyboardHidden()
         }

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
@@ -110,7 +110,6 @@ class HomeScreenTest {
             verifyHomeWordmark()
             verifyAddTabButton()
             verifyShareTabsButton(visible = false)
-            verifyCloseTabsButton(visible = false)
             verifyPrivateSessionHeader()
             verifyPrivateSessionMessage(visible = true)
             verifyHomeToolbar()
@@ -130,7 +129,6 @@ class HomeScreenTest {
             verifyHomeWordmark()
             verifyAddTabButton()
             verifyShareTabsButton(visible = true)
-            verifyCloseTabsButton(visible = true)
             verifyPrivateSessionHeader()
             verifyPrivateSessionMessage(visible = false)
             verifyHomeToolbar()

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
@@ -28,8 +28,10 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
  *  - Opening a private tab
  *  - Verifying tab list
  *  - Closing all tabs
+ *  - Close tab
+ *  - Swipe to close tab
+ *  - Undo close tab
  *
- *  TODO: Tab Collections
  */
 
 class TabbedBrowsingTest {
@@ -76,7 +78,10 @@ class TabbedBrowsingTest {
 
         homeScreen {
             // Timing issue on slow devices on Firebase
-            mDevice.waitNotNull(Until.findObjects(By.res("org.mozilla.fenix.debug:id/item_tab")), TestAssetHelper.waitingTime)
+            mDevice.waitNotNull(
+                Until.findObjects(By.res("org.mozilla.fenix.debug:id/item_tab")),
+                TestAssetHelper.waitingTime
+            )
             verifyExistingTabList()
 
         }.openTabsListThreeDotMenu {
@@ -106,10 +111,13 @@ class TabbedBrowsingTest {
             verifyTabCounter("1")
         }.openHomeScreen {
             // Timing issue on slow devices on Firebase
-            mDevice.waitNotNull(Until.findObjects(By.res("org.mozilla.fenix.debug:id/item_tab")), TestAssetHelper.waitingTime)
+            mDevice.waitNotNull(
+                Until.findObjects(By.res("org.mozilla.fenix.debug:id/item_tab")),
+                TestAssetHelper.waitingTime
+            )
             verifyExistingTabList()
             verifyShareTabsButton(true)
-            verifyCloseTabsButton(true)
+            verifyCloseTabsButton("Test_Page_1")
         }.togglePrivateBrowsingMode()
 
         // Verify private tabs remain in private browsing mode
@@ -135,7 +143,10 @@ class TabbedBrowsingTest {
 
         homeScreen {
             // Timing issue on slow devices on Firebase
-            mDevice.waitNotNull(Until.findObjects(By.res("org.mozilla.fenix.debug:id/item_tab")), TestAssetHelper.waitingTime)
+            mDevice.waitNotNull(
+                Until.findObjects(By.res("org.mozilla.fenix.debug:id/item_tab")),
+                TestAssetHelper.waitingTime
+            )
             verifyExistingTabList()
         }.openTabsListThreeDotMenu {
             verifyCloseAllTabsButton()
@@ -147,5 +158,59 @@ class TabbedBrowsingTest {
             verifyNoTabsOpenedHeader()
             verifyNoTabsOpenedText()
         }
+
+        // Repeat for Private Tabs
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
+        }.openHomeScreen { }
+
+        homeScreen {
+            // Timing issue on slow devices on Firebase
+            mDevice.waitNotNull(
+                Until.findObjects(By.res("org.mozilla.fenix.debug:id/item_tab")),
+                TestAssetHelper.waitingTime
+            )
+            verifyExistingTabList()
+            verifyPrivateTabsCloseTabsButton()
+        }.closeAllPrivateTabs {
+            verifyPrivateSessionHeader()
+            verifyPrivateSessionMessage(true)
+        }
+    }
+
+    @Test
+    fun closeTabTest() {
+        var genericURLS = TestAssetHelper.getGenericAssets(mockWebServer)
+
+        genericURLS.forEachIndexed { index, element ->
+            navigationToolbar {
+            }.openNewTabAndEnterToBrowser(element.url) {
+                verifyPageContent(element.content)
+            }.openHomeScreen { }
+
+            homeScreen {
+                verifyExistingOpenTabs("Test_Page_${index + 1}")
+                verifyCloseTabsButton("Test_Page_${index + 1}")
+                closeTabViaXButton("Test_Page_${index + 1}")
+                verifySnackBarText("Tab closed")
+                snackBarButtonClick("UNDO")
+                verifyExistingOpenTabs("Test_Page_${index + 1}")
+                verifyCloseTabsButton("Test_Page_${index + 1}")
+                swipeTabRight("Test_Page_${index + 1}")
+                verifySnackBarText("Tab closed")
+                snackBarButtonClick("UNDO")
+                verifyExistingOpenTabs("Test_Page_${index + 1}")
+                verifyCloseTabsButton("Test_Page_${index + 1}")
+                swipeTabLeft("Test_Page_${index + 1}")
+                verifySnackBarText("Tab closed")
+                snackBarButtonClick("UNDO")
+                verifyExistingOpenTabs("Test_Page_${index + 1}")
+                verifyCloseTabsButton("Test_Page_${index + 1}")
+            }
+        }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TabsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TabsTest.kt