Bc/deflake tabs (#118)

* attempt to force tab scroll

* fix list-all-tabs

* remove unstable mark

* upgrade ruff; move to main deps

* cleanup

* move the robot tab 1 to the right

Author: ben-c-at-moz

Pipfile

@@ -16,12 +16,12 @@ pypom = "*"
 jsonpath-ng = "*"
 pillow = "*"
 pyfxa = "*"
+ruff = "0.5.2"
 pytest-rerunfailures = "*"
 
 [dev-packages]
 werkzeug = "*"
 selenium-wire = "*"
 pdoc = "*"
-ruff = "0.4.3"
 pytest-variables = "*"
 taskcluster-taskgraph = "*"

modules/browser_object_tabbar.py

@@ -236,22 +236,13 @@ def scroll_on_all_tabs_menu(self, down=True, pixels=200) -> BasePage:
             logging.info(f"menu location: {menu.location}")
             logging.info(f"menu size: {menu.size}")
 
-            def get_bar_y():
-                return min(
-                    [
-                        menu.size["height"] // 2,
-                        self.driver.get_window_size()["height"] // 2,
-                    ]
-                )
-
             # HACK: Can't figure out what the scrollbox selector is, but it's ~4 pixels
             #  off the edge of the menu.
-            x_start = menu.location["x"] + menu.size["width"] - 4
-            # Grab the middle of the scrollbox area, most likely to hold the bar
-            y_start = menu.location["y"] + get_bar_y()
+            x_start = (menu.size["width"] / 2.0) - 4.0
             # +Y is down, -Y is up
             sign = 1 if down else -1
-            self.actions.move_by_offset(x_start, y_start)
+
+            self.actions.move_to_element_with_offset(menu, x_start, 0)
             self.actions.click_and_hold()
             self.actions.move_by_offset(0, (sign * pixels))
             self.actions.release()

modules/data/tab_bar.components.json

@@ -69,6 +69,14 @@
         ]
     },
 
+    "all-tabs-menu-scrollbar": {
+        "selectorData": "#alltabs-popup scrollbox",
+        "strategy": "css",
+        "groups": [
+            "allTabsMenu"
+        ]
+    },
+
     "all-tabs-entry": {
         "selectorData": "all-tabs-item",
         "strategy": "class",

tests/tabs/test_list_all_tabs.py

@@ -1,13 +1,15 @@
 import logging
+from time import sleep
 
 import pytest
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.keys import Keys
 
 from modules.browser_object import TabBar
 
+ROBOT_TAB = 16
+
 
-@pytest.mark.unstable
 def test_list_all_tabs(driver: Firefox, screenshot):
     """
     C134655, check that the List All Tabs button and menu act as expected.
@@ -16,8 +18,8 @@ def test_list_all_tabs(driver: Firefox, screenshot):
     driver.get("about:blank")
     for _ in range(17):
         tabs.new_tab_by_button()
-    driver.switch_to.window(driver.window_handles[14])
-    target_tab = tabs.get_tab(15)
+    driver.switch_to.window(driver.window_handles[ROBOT_TAB - 1])
+    target_tab = tabs.get_tab(ROBOT_TAB)
     driver.get("about:robots")
     with driver.context(driver.CONTEXT_CHROME):
         assert tabs.get_tab_title(target_tab).startswith("Gort")
@@ -32,7 +34,7 @@ def test_list_all_tabs(driver: Firefox, screenshot):
     for _ in range(40):
         tabs.scroll_tabs(tabs.SCROLL_DIRECTION.LEFT)
         with driver.context(driver.CONTEXT_CHROME):
-            if target_tab.location["x"] > driver.get_window_size()["width"]:
+            if target_tab.location["x"] > (driver.get_window_size()["width"]):
                 logging.info(
                     f"Tab location {target_tab.location['x']} should be greater..."
                 )
@@ -64,7 +66,8 @@ def test_list_all_tabs(driver: Firefox, screenshot):
     entry_out_of_view = False
     with driver.context(driver.CONTEXT_CHROME):
         tabs.open_all_tabs_list()
-        for _ in range(10):
+        for _ in range(3):
+            all_tabs_menu = tabs.get_element("all-tabs-menu")
             tabs.scroll_on_all_tabs_menu(down=False)
             about_about_location = tabs.get_location_of_all_tabs_entry(selected=True)
             all_tabs_menu = tabs.get_element("all-tabs-menu")

tests/tabs/test_navigation_multiple_tabs.py

@@ -6,7 +6,6 @@
 from modules.browser_object import TabBar
 
 
-@pytest.mark.unstable
 def test_navigation_multiple_tabs(driver: Firefox):
     # open 20 tabs
     tabs = TabBar(driver).open()