merge changes in

Author: sarinali

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_panel_ui.py

@@ -132,3 +132,12 @@ def start_sync(self) -> BasePage:
             self.element_has_text("fxa-sync-label", "Sync now")
             self.get_element("fxa-sync-label").click()
         return self
+
+    def open_private_window(self) -> BasePage:
+        """
+        Opens a new window in private browsing mode using the panel
+        """
+        self.open_panel_menu()
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element("panel-ui-new-private-window").click()
+        return self

modules/browser_object_tabbar.py

@@ -65,12 +65,29 @@ def new_window_by_keys(self, sys_platform: str) -> BasePage:
             ).perform()
         return self
 
+    def reopen_closed_tab_by_keys(self, sys_platform: str) -> BasePage:
+        """Use keyboard shortcut to reopen a last closed tab"""
+        if sys_platform == "Darwin":
+            self.actions.key_down(Keys.COMMAND).key_down(Keys.SHIFT).send_keys(
+                "t"
+            ).key_up(Keys.SHIFT).key_up(Keys.COMMAND).perform()
+        else:
+            self.actions.key_down(Keys.CONTROL).key_down(Keys.SHIFT).send_keys(
+                "t"
+            ).key_up(Keys.SHIFT).key_up(Keys.CONTROL).perform()
+        return self
+
     def click_tab_by_title(self, title: str) -> BasePage:
         """Given a full page title, click the corresponding tab"""
         with self.driver.context(self.driver.CONTEXT_CHROME):
             self.get_element("tab-by-title", labels=[title]).click()
         return self
 
+    def get_tab_by_title(self, title: str) -> BasePage:
+        """Given a full page title, return the corresponding tab"""
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            return self.get_element("tab-by-title", labels=[title])
+
     def click_tab_by_index(self, index: int) -> BasePage:
         """Given a tab index (int), click the corresponding tab"""
         with self.driver.context(self.driver.CONTEXT_CHROME):
@@ -236,23 +253,23 @@ 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()
             self.actions.perform()
+
+    def close_tab(self, tab: WebElement) -> BasePage:
+        """
+        Given the index of the tab, it closes that tab.
+        """
+        # cur_tab = self.click_tab_by_index(index)
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element("tab-x-icon", parent_element=tab).click()
+        return self

modules/data/about_prefs.components.json

@@ -258,6 +258,18 @@
         "groups": []
     },
 
+    "notifications-allow-button": {
+        "selectorData": "button[class='popup-notification-primary-button primary footer-button']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "notifications-block-button": {
+        "selectorData": "button[class='popup-notification-secondary-button footer-button']",
+        "strategy": "css",
+        "groups": []
+    },
+
     "cookies-shadow-root": {
         "selectorData": "dialog[buttons='accept,cancel']",
         "strategy": "css",
@@ -281,6 +293,30 @@
         ]
     },
 
+    "permissions-notifications-button": {
+        "selectorData": "notificationSettingsButton",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "permissions-notifications-popup-websites": {
+        "selectorData": "permissionsBox",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "permissions-notifications-popup-websites-item": {
+        "selectorData": "richlistitem[origin='{name}']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "permissions-notifications-popup-websites-item-status": {
+        "selectorData": "website-status",
+        "strategy": "class",
+        "groups": []
+    },
+
     "language-dropdown": {
         "selectorData": "primaryBrowserLocale",
         "strategy": "id",

modules/data/about_privatebrowsing.components.json

@@ -0,0 +1,10 @@
+{
+    "main-logo": {
+        "selectorData": "about-private-browsing-logo",
+        "strategy": "id",
+        "groups": [
+            "requiredForPage"
+        ]
+    }
+
+}

modules/data/generic_page.components.json

@@ -5,6 +5,18 @@
         "groups": []
     },
 
+    "authorize-notifications-button": {
+        "selectorData": "button[onclick='notify.authorize()']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "show-notifications-button": {
+        "selectorData": "button[onclick='notify.show()']",
+        "strategy": "css",
+        "groups": []
+    },
+
     "mediawiki-image": {
         "selectorData": "mw-mmv-image",
         "strategy": "class",

modules/data/navigation.components.json

@@ -202,5 +202,23 @@
         "selectorData": "protections-popup-no-trackers-found-description",
         "strategy": "id",
         "groups": []
+    },
+
+    "lock-icon": {
+    "selectorData": "identity-icon",
+    "strategy": "id",
+    "groups": []
+    },
+
+    "connection-secure-button": {
+        "selectorData": "identity-popup-security-button",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "more-information-button": {
+        "selectorData": "identity-popup-more-info",
+        "strategy": "id",
+        "groups": []
     }
 }

modules/data/panel_ui.components.json

@@ -41,6 +41,12 @@
         ]
     },
 
+    "new-private-window-option": {
+        "selectorData": "appMenu-new-private-window-button2",
+        "strategy": "id",
+        "groups": []
+    },
+
     "more-tools": {
         "selectorData": "appMenu-more-button2",
         "strategy": "id",
@@ -115,6 +121,12 @@
         "groups": []
     },
 
+    "panel-ui-new-private-window": {
+        "selectorData": "appMenu-new-private-window-button2",
+        "strategy": "id",
+        "groups": []
+    },
+
     "panel-ui-history-recent-history-container": {
         "selectorData": "appMenu_historyMenu",
         "strategy": "id",

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",

modules/page_base.py

@@ -391,6 +391,11 @@ def url_contains(self, url_part: str) -> Page:
         self.expect(EC.url_contains(url_part))
         return self
 
+    def title_contains(self, url_part: str) -> Page:
+        """Expect helper: wait until driver URL contains given text or timeout"""
+        self.expect(EC.title_contains(url_part))
+        return self
+
     def verify_opened_image_url(self, url_substr: str, pattern: str) -> Page:
         """
         Given a part of a URL and a regex, wait for that substring to exist in
@@ -537,10 +542,21 @@ def wait_for_num_tabs(self, num_tabs: int) -> Page:
             logging.warn("Timeout waiting for the number of windows to be:", num_tabs)
         return self
 
-    def switch_to_new_tab(self):
+    def switch_to_new_tab(self) -> Page:
         """Get list of all window handles, switch to the newly opened tab"""
         handles = self.driver.window_handles
         self.driver.switch_to.window(handles[-1])
+        return self
+
+    def wait_for_num_windows(self, num: int) -> Page:
+        """Wait for the number of open tabs + windows to equal given int"""
+        with self.driver.context(self.driver.CONTEXT_CONTENT):
+            return self.wait_for_num_tabs(num)
+
+    def switch_to_new_window(self) -> Page:
+        """Switch to newest window"""
+        with self.driver.context(self.driver.CONTEXT_CONTENT):
+            return self.switch_to_new_tab()
 
     def hide_popup(self, context_menu: str, chrome=False) -> Page:
         """