Resolve conflicts

Author: Hani Yacoub

.gitignore

@@ -7,6 +7,7 @@ html_dump/
 /Test Results - .html
 /geckodriver.log
 env
+*.png
 *.dmg
 *.tar
 *.zip
@@ -175,3 +176,4 @@ cython_debug/
 # irrelevant files
 drivers/
 temp.py
+tests/test_scratch.py

Pipfile

@@ -14,11 +14,12 @@ pytest-xdist = "*"
 pytest-html = "*"
 pypom = "*"
 jsonpath-ng = "*"
+pillow = "*"
 
 [dev-packages]
 werkzeug = "*"
 selenium-wire = "*"
 pdoc = "*"
-ruff = "*"
+ruff = "0.4.3"
 pytest-variables = "*"
 taskcluster-taskgraph = "*"

ci_pyproject.toml

@@ -15,7 +15,7 @@ markers = [
 testpaths = [
     "tests"
 ]
-addopts = "-vs -m 'ci' --ci --html=/builds/worker/artifacts/report.html"
+addopts = "-vs --ci -m 'not incident and not unstable' --html=artifacts/report.html"
 
 [tool.ruff]
 target-version = "py310"

collect_executables.sh

@@ -85,6 +85,7 @@ curl -O "$FX_LOC"
 
 mv geckodriver*.tar.gz geckodriver.tar.gz
 tar -xvzf geckodriver.tar.gz
+chmod +x geckodriver
 
 if [[ $SYSTEM_NAME == "linux" ]]
 then

conftest.py

@@ -1,7 +1,7 @@
 import logging
 import os
 import platform
-from typing import List, Tuple
+from typing import Callable, List, Tuple
 
 import pytest
 from selenium import webdriver
@@ -185,23 +185,30 @@ def driver(
 
 
 @pytest.fixture()
-def screenshot(driver: webdriver.Firefox, opt_ci: bool):
-    def _screenshot(filename):
+def screenshot(driver: webdriver.Firefox, opt_ci: bool) -> Callable:
+    """
+    Factory fixture that returns a screenshot function.
+    """
+
+    def _screenshot(filename: str) -> str:
+        """
+        Given a short filename, save a screenshot and return the image's full path.
+        """
         if not filename.endswith(".png"):
             filename = filename + ".png"
         artifacts_loc = ""
         if opt_ci:
-            artifacts_loc = os.path.join("/builds", "worker", "artifacts")
-        driver.save_screenshot(os.path.join(artifacts_loc, filename))
+            artifacts_loc = "artifacts"
+        fullpath = os.path.join(artifacts_loc, filename)
+        driver.save_screenshot(fullpath)
+        return fullpath
 
     return _screenshot
 
 
 @pytest.fixture()
 def version(driver: webdriver.Firefox):
-    driver.get("about:support")
-    version = driver.find_element("version-box").get_attribute("innerText")
-    return version
+    return driver.capabilities["browserVersion"]
 
 
 @pytest.fixture(scope="session", autouse=True)

modules/browser_object.py

@@ -1,7 +1,10 @@
 from modules.browser_object_about_prefs_cc_popup import *
 from modules.browser_object_autofill_popup import *
 from modules.browser_object_credit_card_popup import *
+from modules.browser_object_find_toolbar import *
+from modules.browser_object_image_context_menu import *
 from modules.browser_object_navigation import *
 from modules.browser_object_panel_ui import *
+from modules.browser_object_search_bar_context_menu import *
 from modules.browser_object_tab_context_menu import *
 from modules.browser_object_tabbar import *

modules/browser_object_autofill_popup.py

@@ -1,5 +1,3 @@
-import json
-
 from selenium.webdriver.remote.webelement import WebElement
 from selenium.webdriver.support import expected_conditions as EC
 

modules/browser_object_find_toolbar.py

@@ -0,0 +1,26 @@
+from selenium.webdriver.common.keys import Keys
+
+from modules.browser_object_panel_ui import PanelUi
+from modules.page_base import BasePage
+
+
+class FindToolbar(BasePage):
+    URL_TEMPLATE = ""
+
+    def open(self) -> BasePage:
+        """Use PanelUi to open the Find Toolbar, wait for element to load"""
+        panel_ui = PanelUi(self.driver)
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            panel_ui.open_panel_menu()
+            panel_ui.select_panel_setting("find-in-page")
+            self.wait_for_page_to_load()
+        return self
+
+    def find(self, term: str) -> BasePage:
+        """Use the Find Toolbar to search"""
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            findbar = self.get_element("find-toolbar-input")
+            findbar.click()
+            findbar.clear()
+            findbar.send_keys(term + Keys.ENTER)
+        return self

modules/browser_object_hyperlink_context_menu.py

@@ -0,0 +1,7 @@
+from modules.browser_object_context_menu import ContextMenu
+
+
+class HyperlinkContextMenu(ContextMenu):
+    """
+    Browser object model for the context menu for right clicking a hyperlink
+    """

modules/browser_object_image_context_menu.py

@@ -0,0 +1,9 @@
+from modules.browser_object_context_menu import ContextMenu
+
+
+class ImageContextMenu(ContextMenu):
+    """
+    Browser object model for the context menu (after right clicking) a tab
+    """
+
+    URL_TEMPLATE = ""