Merge branch 'main' into sl/firefox-never-rmb-history

Author: ben-c-at-moz

modules/browser_object_context_menu.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 from selenium.webdriver.remote.webelement import WebElement
 
 from modules.page_base import BasePage
@@ -17,9 +19,20 @@ def get_context_item(self, item: str) -> WebElement:
         with self.driver.context(self.driver.CONTEXT_CHROME):
             return self.get_element(item)
 
-    def click_context_item(self, context_element: WebElement) -> BasePage:
+    def click_context_item(
+        self, reference: Union[str, tuple, WebElement], labels=[]
+    ) -> BasePage:
         """
         Clicks the context item.
         """
         with self.driver.context(self.driver.CONTEXT_CHROME):
-            context_element.click()
+            self.fetch(reference, labels=labels).click()
+            return self
+
+    def click_and_hide(
+        self, reference: Union[str, tuple, WebElement], labels=[]
+    ) -> BasePage:
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.fetch(reference, labels=labels).click()
+            self.hide_popup_by_child_node(reference, labels=labels)
+            return self

modules/data/context_menu.components.json

@@ -7,6 +7,12 @@
         "groups": []
     },
 
+    "context-menu-open-link-in-new-private-window": {
+        "selectorData": "context-openlinkprivate",
+        "strategy": "id",
+        "groups": []
+    },
+
     "context-menu-inspect": {
         "selectorData": "context-inspect",
         "strategy": "id",

modules/page_base.py

@@ -558,7 +558,7 @@ def switch_to_new_window(self) -> Page:
         with self.driver.context(self.driver.CONTEXT_CONTENT):
             return self.switch_to_new_tab()
 
-    def hide_popup(self, context_menu: str, chrome=False) -> Page:
+    def hide_popup(self, context_menu: str, chrome=True) -> Page:
         """
         Given the ID of the context menu, it will dismiss the menu.
 
@@ -586,15 +586,15 @@ def hide_popup_by_class(self, class_name: str) -> None:
                 """
         self.driver.execute_script(script)
 
-    def hide_popup_by_child_node(self, node: WebElement, chrome=False) -> Page:
+    def hide_popup_by_child_node(
+        self, reference: Union[str, tuple, WebElement], labels=[]
+    ) -> Page:
+        node = self.fetch(reference, labels=labels)
         script = """var element = arguments[0].parentNode;
                  if (element && element.hidePopup) {
                     element.hidePopup();
                  }"""
-        if chrome:
-            with self.driver.context(self.driver.CONTEXT_CHROME):
-                self.driver.execute_script(script, node)
-        else:
+        with self.driver.context(self.context_id):
             self.driver.execute_script(script, node)
 
     @property

modules/page_object_example_page.py

@@ -7,3 +7,6 @@ class ExamplePage(BasePage):
     """
 
     URL_TEMPLATE = "https://example.com/"
+    TITLE = "Example Domain"
+    MORE_INFO_URL = "https://www.iana.org/help/example-domains"
+    MORE_INFO_TITLE = "Example Domains"

tests/menus/test_frequently_used_context_menu.py

@@ -32,7 +32,7 @@ def test_save_page_as(driver: Firefox):
 
     save_page_as = context_menu.get_context_item("context-menu-save-page-as")
     context_menu.click_context_item(save_page_as)
-    context_menu.hide_popup_by_child_node(save_page_as, chrome=True)
+    context_menu.hide_popup_by_child_node(save_page_as)
 
     downloads_button = nav.get_download_button()
 
@@ -87,7 +87,7 @@ def test_take_screenshot(driver: Firefox):
     # context click the screenshot option and verify its not hidden
     take_screenshot = context_menu.get_context_item("context-menu-take-screenshot")
     context_menu.click_context_item(take_screenshot)
-    context_menu.hide_popup_by_child_node(take_screenshot, chrome=True)
+    context_menu.hide_popup_by_child_node(take_screenshot)
 
     with driver.context(driver.CONTEXT_CHROME):
         screenshot_box = example_page.get_element("take-screenshot-box")
@@ -110,5 +110,5 @@ def test_inspect(driver: Firefox):
 
     inspect_option = context_menu.get_context_item("context-menu-inspect")
     context_menu.click_context_item(inspect_option)
-    context_menu.hide_popup_by_child_node(inspect_option, chrome=True)
+    context_menu.hide_popup_by_child_node(inspect_option)
     devtools.check_opened()

tests/menus/test_image_context_menu_actions.py

@@ -36,7 +36,7 @@ def test_open_image_in_new_tab(driver: Firefox):
         "context-menu-open-image-in-new-tab"
     )
     image_context_menu.click_context_item(open_in_new_tab)
-    wiki_image_page.hide_popup_by_child_node(open_in_new_tab, chrome=True)
+    image_context_menu.hide_popup_by_child_node(open_in_new_tab)
 
     # switch to the second tab and verify the URL
     tabs.wait_for_num_tabs(2)
@@ -71,7 +71,7 @@ def test_save_image_as(driver: Firefox):
     # save it
     save_image_as = image_context_menu.get_context_item("context-menu-save-image-as")
     image_context_menu.click_context_item(save_image_as)
-    wiki_image_page.hide_popup_by_child_node(save_image_as, chrome=True)
+    image_context_menu.hide_popup_by_child_node(save_image_as)
 
     # create the pynput controller
     downloads_button = nav.get_download_button()
@@ -130,7 +130,7 @@ def test_copy_image_link(driver: Firefox):
         "context-menu-copy-image-link"
     )
     image_context_menu.click_context_item(copy_image_link)
-    wiki_image_page.hide_popup_by_child_node(copy_image_link, chrome=True)
+    image_context_menu.hide_popup_by_child_node(copy_image_link)
 
     # open a new tab
     tabs.new_tab_by_button()

tests/security_and_privacy/test_open_link_in_private_window.py

@@ -0,0 +1,24 @@
+import logging
+
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object import ContextMenu, Navigation
+from modules.page_object import ExamplePage, GenericPage
+
+
+def test_open_link_in_private_window(driver: Firefox):
+    """C101662 - Links can be successfully opened in a Private Browsing session"""
+    example = ExamplePage(driver)
+    example.open()
+    context_menu = ContextMenu(driver)
+    nav = Navigation(driver)
+
+    example.context_click("more-information")
+    context_menu.click_and_hide("context-menu-open-link-in-new-private-window")
+    nav.wait_for_num_windows(2)
+    nav.switch_to_new_window()
+    with driver.context(driver.CONTEXT_CHROME):
+        nav.title_contains("Private Browsing")
+    example.title_contains(example.MORE_INFO_TITLE)
+    example.url_contains(example.MORE_INFO_URL)

tests/sync_and_fxa/test_new_fxa.py

@@ -15,6 +15,9 @@ def acct_password():
     return "Test123???"
 
 
+@pytest.mark.skip(
+    "Stop spamming stage with fake accounts; remove when we implement acct delete"
+)
 def test_sync_new_fxa(driver: Firefox, fxa_url: str, new_fxa_prep: dict, get_otp_code):
     """C131094: The user is able to create a new Firefox Account"""