merge main in

sarinali · sarinali · commit bc503954de8c · 2024-07-17T11:47:19.000-04:00
diff --git a/Pipfile b/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 = "*"
diff --git a/modules/browser_object_tabbar.py b/modules/browser_object_tabbar.py
@@ -53,6 +53,18 @@ def new_tab_by_keys(self, sys_platform: str) -> BasePage:
             ).perform()
         return self
 
+    def new_window_by_keys(self, sys_platform: str) -> BasePage:
+        """Use keyboard shortcut to open a new tab"""
+        if sys_platform == "Darwin":
+            self.actions.key_down(Keys.COMMAND).send_keys("n").key_up(
+                Keys.COMMAND
+            ).perform()
+        else:
+            self.actions.key_down(Keys.CONTROL).send_keys("n").key_up(
+                Keys.CONTROL
+            ).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":
@@ -241,22 +253,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()
diff --git a/modules/data/about_prefs.components.json b/modules/data/about_prefs.components.json
@@ -216,6 +216,12 @@
         "groups": []
     },
 
+    "home-new-window-dropdown": {
+        "selectorData": "homeMode",
+        "strategy": "id",
+        "groups": []
+    },
+
     "home-new-tabs-dropdown-option-default": {
         "selectorData": "menuitem[data-l10n-id=\"home-mode-choice-default-fx\"]",
         "strategy": "css",
@@ -252,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",
@@ -275,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",
diff --git a/modules/data/generic_page.components.json b/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",
diff --git a/modules/data/navigation.components.json b/modules/data/navigation.components.json
@@ -210,5 +210,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": []
     }
 }
diff --git a/modules/data/panel_ui.components.json b/modules/data/panel_ui.components.json
@@ -91,6 +91,12 @@
         ]
     },
 
+    "panel-ui-new-window": {
+        "selectorData": "appMenu-new-window-button2",
+        "strategy": "id",
+        "groups": []
+    },
+
     "panel-ui-history": {
         "selectorData": "appMenu-history-button",
         "strategy": "id",
diff --git a/modules/data/tab_bar.components.json b/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",
diff --git a/modules/page_object_about_prefs.py b/modules/page_object_about_prefs.py
@@ -46,7 +46,9 @@ def __init__(self, page, **kwargs):
         def loaded(self):
             return self.root if EC.element_to_be_clickable(self.root) else False
 
-        def select_option(self, option_name: str, double_click=False):
+        def select_option(
+            self, option_name: str, double_click=False, wait_for_selection=True
+        ):
             """Select an option in the dropdown. Does not return self."""
             if not self.dropmarker.get_attribute("open") == "true":
                 self.root.click()
@@ -64,6 +66,7 @@ def select_option(self, option_name: str, double_click=False):
                     )
                 else:
                     matching_menuitems[0].click()
+                if wait_for_selection:
                     self.wait.until(EC.element_to_be_selected(matching_menuitems[0]))
                 return self
             else:
@@ -313,3 +316,9 @@ def get_clear_cookie_data_value(self) -> int:
             return number
         else:
             print("No number found in the string")
+
+    def get_iframe(self) -> WebElement:
+        """
+        Gets the webelement for the iframe that commonly appears in about:preferences
+        """
+        return self.get_element("browser-popup")
diff --git a/modules/util.py b/modules/util.py
@@ -7,6 +7,7 @@
 from os import remove
 from random import shuffle
 from typing import List, Literal, Union
+from urllib.parse import urlparse, urlunparse
 
 from faker import Faker
 from faker.providers import internet, misc
@@ -370,6 +371,16 @@ def assert_json_value(self, json_data, jsonpath_expr, expected_value):
             f"Expected {expected_value}, but got {match[0].value}",
         )
 
+    def get_domain_from_url(self, url: str) -> str:
+        """
+        Given a URL, it will extract the domain of the URL.
+
+        For example, "https://www.example.com/path/to/page?query=123#fragment" will product "https://www.example.com"
+        """
+        parsed_url = urlparse(url)
+        domain_parsed_url = parsed_url._replace(path="")
+        return urlunparse(domain_parsed_url)
+
 
 class BrowserActions:
     """
diff --git a/tests/address_bar_and_search/test_google_withads_url_bar_us.py b/tests/address_bar_and_search/test_google_withads_url_bar_us.py
@@ -1,4 +1,4 @@
-import time
+from time import sleep
 
 import pytest
 from selenium.webdriver import Firefox
@@ -23,9 +23,9 @@ def test_google_withads_url_bar_us(driver: Firefox):
     util = Utilities()
 
     nav.search("iphone")
-    time.sleep(5)
+    sleep(5)
     about_telemetry = AboutTelemetry(driver).open()
-    time.sleep(5)
+    sleep(5)
 
     # Click on Raw JSON, switch tab and click on Raw Data
     about_telemetry.get_element("category-raw").click()
diff --git a/tests/address_bar_and_search/test_sap_google_adclick.py b/tests/address_bar_and_search/test_sap_google_adclick.py
@@ -1,4 +1,4 @@
-import time
+from time import sleep
 
 import pytest
 from selenium.webdriver import Firefox
@@ -25,11 +25,11 @@ def test_sap_google_adclick(driver: Firefox):
     # search and click on an ad
     nav.search("iphone")
     nav.get_element("search-result").click()
-    time.sleep(2)
+    sleep(2)
 
     # Click on Raw JSON, switch tab and click on Raw Data
     about_telemetry = AboutTelemetry(driver).open()
-    time.sleep(2)
+    sleep(2)
     about_telemetry.get_element("category-raw").click()
     about_telemetry.switch_to_new_tab()
     about_telemetry.get_element("rawdata-tab").click()
diff --git a/tests/address_bar_and_search/test_tile_menu_options.py b/tests/address_bar_and_search/test_tile_menu_options.py
@@ -38,7 +38,7 @@
 )
 
 # first value in a tuple is the index of the card, second is the status of sponsorship
-card_indices = [(3, False), (0, True)]
+card_indices = [(4, False), (0, True)]
 
 
 def test_default_tile_hover_states(driver: Firefox):
diff --git a/tests/language_packs/test_language_pack_install_addons.py b/tests/language_packs/test_language_pack_install_addons.py
@@ -57,7 +57,7 @@ def test_language_pack_install_from_addons(
     about_prefs = AboutPrefs(driver, category="general").open()
     language_dropdown = about_prefs.get_element("language-dropdown")
     dropdown = about_prefs.Dropdown(page=about_prefs, root=language_dropdown)
-    dropdown.select_option(drop_down_name, double_click=True)
+    dropdown.select_option(drop_down_name, double_click=True, wait_for_selection=False)
 
     about_prefs.custom_wait(timeout=15).until(
         lambda _: about_prefs.get_element("html-root").get_attribute("lang")
diff --git a/tests/preferences/test_firefox_home_on_launch.py b/tests/preferences/test_firefox_home_on_launch.py
@@ -0,0 +1,41 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object import PanelUi, TabBar
+from modules.page_object import AboutNewtab, AboutPrefs
+
+
+@pytest.fixture()
+def set_prefs():
+    """Set prefs"""
+    return [
+        ("browser.startup.homepage", "about:home"),
+        ("browser.startup.blankWindow", "false"),
+    ]
+
+
+def test_firefox_home_on_launch(driver: Firefox, sys_platform: str):
+    """
+    C143543: setting the default new window to be Firefox Home
+    """
+    # instantiate objs
+    tabs = TabBar(driver)
+    new_tab = AboutNewtab(driver)
+    about_prefs = AboutPrefs(driver, category="home").open()
+    panel_ui = PanelUi(driver)
+
+    # click the dropdown
+    drop_down = about_prefs.get_element("home-new-window-dropdown")
+    dropdown = about_prefs.Dropdown(page=about_prefs, root=drop_down)
+    dropdown.select_option("Firefox Home (Default)", double_click=True)
+
+    # make sure that the option was selected correctly
+    assert drop_down.get_attribute("label") == "Firefox Home (Default)"
+    panel_ui.open_panel_menu()
+    panel_ui.select_panel_setting("panel-ui-new-window")
+    # wait for the number of tabs and switch
+    tabs.wait_for_num_tabs(2)
+    driver.switch_to.window(driver.window_handles[-1])
+
+    # make sure we are on the correct new tab page
+    assert new_tab.get_element("body-logo") is not None
diff --git a/tests/security_and_privacy/test_https_enabled_private_browsing.py b/tests/security_and_privacy/test_https_enabled_private_browsing.py
@@ -0,0 +1,28 @@
+import pytest
+from selenium.webdriver import Firefox
+from selenium.webdriver.support.wait import WebDriverWait
+
+HTTP_URL = "http://example.com"
+
+
+@pytest.fixture()
+def add_prefs():
+    return [
+        ("browser.privatebrowsing.autostart", True),
+        ("dom.security.https_first_pbm", True),
+    ]
+
+
+def test_https_first_mode_in_private_browsing(driver: Firefox):
+    """
+    C1362731 Check that https First Mode is properly enabled and working in Private Browsing
+    """
+
+    # Navigate to the HTTP URL
+    driver.get(HTTP_URL)
+
+    # Wait for the URL to be redirected to HTTPS
+    assert WebDriverWait(driver, 10).until(
+        lambda d: d.current_url.startswith("https://"),
+        message=f"Final URL should use HTTPS, but was: {driver.current_url}",
+    )
diff --git a/tests/security_and_privacy/test_notifications_change_set.py b/tests/security_and_privacy/test_notifications_change_set.py
diff --git a/tests/security_and_privacy/test_tls_v1_2_protocol.py b/tests/security_and_privacy/test_tls_v1_2_protocol.py
diff --git a/tests/tabs/test_list_all_tabs.py b/tests/tabs/test_list_all_tabs.py
diff --git a/tests/tabs/test_navigation_multiple_tabs.py b/tests/tabs/test_navigation_multiple_tabs.py
