Merge branch 'main' into Pat/edit_bookmarks

Author: whlpatricia

.gitignore

@@ -194,6 +194,7 @@ tests/test_scratch.py
 
 # Credentials
 credentials.json
+testrail_credentials.env
 
 # Do not ignore
 !data/goomy.png

modules/browser_object_panel_ui.py

@@ -39,14 +39,14 @@ def loaded(self):
             ]
             return all([EC.presence_of_element_located(el) for el in targeted])
 
+    @BasePage.context_chrome
     def open_panel_menu(self) -> BasePage:
         """
         Opens the PanelUi menu.
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            panel_root = self.get_element("panel-ui-button")
-            panel_root.click()
-            self.menu = self.Menu(self, root=panel_root)
+        panel_root = self.get_element("panel-ui-button")
+        panel_root.click()
+        self.menu = self.Menu(self, root=panel_root)
         return self
 
     def select_panel_setting(self, name: str, *labels) -> BasePage:
@@ -181,13 +181,13 @@ def get_all_history(self) -> List[WebElement]:
             history_items = self.get_elements("bookmark-item")
             return history_items
 
+    @BasePage.context_chrome
     def redirect_to_about_logins_page(self) -> BasePage:
         """
         Opens the about:logins page by clicking the Password option in Hamburger Menu"
         """
         self.open_panel_menu()
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("password-button").click()
+        self.get_element("password-button").click()
         return self
 
     # Bookmarks section

modules/page_object_about_pages.py

@@ -12,6 +12,7 @@
 
 from modules.page_base import BasePage
 from modules.util import BrowserActions
+from selenium.webdriver import Firefox
 
 
 class AboutConfig(BasePage):
@@ -133,6 +134,10 @@ class AboutLogins(BasePage):
 
     URL_TEMPLATE = "about:logins"
 
+    def __init__(self, driver: Firefox, **kwargs):
+        super().__init__(driver, **kwargs)
+        self.ba = BrowserActions(self.driver)
+
     def click_add_login_button(self) -> Page:
         """Click the Add Login button"""
         self.get_element("create-login-button").click()
@@ -144,11 +149,10 @@ def create_new_login(self, form_info: dict) -> Page:
         Given a dict with keys that match the valid item types in the
         new login dialog, create a new login with those values through UI.
         """
-        ba = BrowserActions(self.driver)
         try:
             for item_type, value in form_info.items():
                 logging.info(f"Filling {item_type} with {value}")
-                ba.clear_and_fill(
+                self.ba.clear_and_fill(
                     self.get_element("login-item-type", labels=[item_type]), value
                 )
             logging.info("Clicking submit...")

modules/testrail_script_set_null_automation_status_to_untriaged.py

@@ -0,0 +1,153 @@
+import logging
+import os
+
+from dotenv import load_dotenv
+
+from modules.testrail_integration import testrail_init
+
+# Set up logging
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
+)
+
+# Load env file from project root
+script_dir = os.path.dirname(__file__)
+project_root = os.path.abspath(os.path.join(script_dir, ".."))
+env_file_path = os.path.join(project_root, "testrail_credentials.env")
+load_dotenv(dotenv_path=env_file_path)
+
+# TestRail project ID (Fx Desktop)
+PROJECT_ID = 17
+
+
+def get_all_suites(tr, project_id):
+    """Get all suites from the project"""
+    suites = tr.client.send_get(f"get_suites/{project_id}")
+    logging.info(f"Found {len(suites)} suites in project {project_id}")
+    return suites
+
+
+# Set limit below maximum value as a precaution to avoid API errors
+def get_all_test_cases(tr, project_id, suite_id):
+    """Fetch all test cases from a suite by handling pagination."""
+    all_cases = []
+    offset = 0
+    limit = 240  # Default limit for TestRail API is 250
+
+    while True:
+        # Build endpoint with pagination parameters
+        endpoint = (
+            f"get_cases/{project_id}&suite_id={suite_id}&limit={limit}&offset={offset}"
+        )
+
+        response = tr.client.send_get(endpoint)
+        cases = response.get("cases", [])
+        if not cases:
+            break
+        all_cases.extend(cases)
+        # If the number of cases returned is less than the limit, we've reached the last page.
+        if len(cases) < limit:
+            break
+        offset += limit
+
+    logging.info(f"Total cases fetched from suite {suite_id}: {len(all_cases)}")
+    return all_cases
+
+
+def update_null_automation_status(tr, project_id, dry_run=True):
+    """Update test cases with None automation status to Untriaged"""
+    try:
+        # Get all suites in the project
+        suites = get_all_suites(tr, project_id)
+
+        # Track statistics
+        total_null_cases = 0
+        updated_count = 0
+
+        # Process each suite
+        for suite in suites:
+            suite_id = suite["id"]
+            suite_name = suite["name"]
+            logging.info(f"Processing suite {suite_name} (ID: {suite_id})...")
+
+            # Retrieve test cases for this suite
+            try:
+                cases = get_all_test_cases(tr, project_id, suite_id)
+
+                # Filter cases with null automation status
+                null_status_cases = [
+                    case
+                    for case in cases
+                    if case.get("custom_automation_status") is None
+                ]
+
+                suite_null_count = len(null_status_cases)
+                total_null_cases += suite_null_count
+
+                logging.info(
+                    f"Found {suite_null_count} cases with null automation status in suite {suite_name}"
+                )
+
+                # Update each case that meets the criteria
+                for case in null_status_cases:
+                    case_id = case["id"]
+                    try:
+                        if dry_run:
+                            logging.info(
+                                f"[DRY RUN] Would update case {case_id}: set automation status to Untriaged (1)"
+                            )
+                        else:
+                            # Perform the update
+                            tr.update_case_field(
+                                case_id, "custom_automation_status", "1"
+                            )
+                            logging.info(
+                                f"Updated case {case_id}: set automation status to Untriaged (1)"
+                            )
+                            updated_count += 1
+                    except Exception as e:
+                        logging.error(f"Error updating case {case_id}: {e}")
+            except Exception as e:
+                logging.error(f"Error processing suite {suite_id}: {e}")
+                continue
+
+        # Log summary
+        logging.info(
+            f"Summary: Found {total_null_cases} cases with null automation status across all suites"
+        )
+        if not dry_run:
+            logging.info(f"Updated {updated_count} cases to Untriaged")
+        else:
+            logging.info(
+                f"Would update {total_null_cases} cases to Untriaged (dry run)"
+            )
+
+    except Exception as e:
+        logging.error(f"Error processing cases: {e}")
+
+
+def main():
+    # Read credentials from environment
+    base_url = os.environ.get("TESTRAIL_BASE_URL")
+    username = os.environ.get("TESTRAIL_USERNAME")
+    api_key = os.environ.get("TESTRAIL_API_KEY")
+
+    if not all([base_url, username, api_key]):
+        logging.error("Missing TestRail credentials. Check your .env file.")
+        return
+
+    logging.info(f"Loaded credentials for user: {username}")
+    logging.info(f"Base URL: {base_url}")
+
+    tr = testrail_init()
+
+    # Safe approach to not accidentally update cases
+    dry_run = True
+
+    # Process all cases in the project
+    logging.info(f"Processing project ID: {PROJECT_ID}...")
+    update_null_automation_status(tr, PROJECT_ID, dry_run)
+
+
+if __name__ == "__main__":
+    main()

tests/password_manager/test_about_logins_navigation_from_context_menu.py

@@ -16,7 +16,7 @@ def test_about_logins_navigation_from_login_form_context_menu(driver: Firefox):
     C2241087 - Verify that right-clicking the Username field in a login form and then the Manage Passwords option
     from context menu opens about:logins page in a new tab
     """
-
+    # Instantiate objects
     context_menu = ContextMenu(driver)
     tabs = TabBar(driver)
     login = LoginAutofill(driver).open()

tests/password_manager/test_about_logins_navigation_from_hamburger_menu.py

@@ -13,7 +13,7 @@ def test_about_logins_navigation_from_password_hamburger_menu(driver: Firefox):
     """
     C2241082 - Verify that clicking the Password option in Hamburger Menu opens about:logins page in a new tab
     """
-
+    # Instantiate objects
     panel_ui = PanelUi(driver)
     tabs = TabBar(driver)
 

tests/password_manager/test_about_logins_search_username.py

@@ -16,10 +16,11 @@ def test_about_logins_search_username(driver_and_saved_logins):
     """
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
-    about_logins = AboutLogins(driver).open()
+    about_logins = AboutLogins(driver)
     ba = BrowserActions(driver)
 
-    # Search for a username with 2 results
+    # Open about:logins and search for a username with 2 results
+    about_logins.open()
     ba.clear_and_fill(about_logins.get_element("login-filter-input"), usernames[-1])
 
     # Check that only the correct 2 results are shown

tests/password_manager/test_about_logins_search_website.py

@@ -16,10 +16,11 @@ def test_about_logins_search_website(origins, driver_and_saved_logins):
     """
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
-    about_logins = AboutLogins(driver).open()
+    about_logins = AboutLogins(driver)
     ba = BrowserActions(driver)
 
-    # Search for a website
+    # Open about:logins and search for a website
+    about_logins.open()
     ba.clear_and_fill(about_logins.get_element("login-filter-input"), origins[1])
 
     # Check that only the correct 1 result is shown

tests/password_manager/test_add_password_non_ascii_chars.py

@@ -13,10 +13,11 @@ def test_add_password_non_ascii_chars(driver: Firefox):
     """
     C2241113 Add password - non-ascii characters
     """
-    # instantiate object
-    about_logins = AboutLogins(driver).open()
+    # Instantiate object
+    about_logins = AboutLogins(driver)
 
-    # Click on the "Add password" button
+    # Open about:logins and click on the "Add password" button
+    about_logins.open()
     about_logins.click_add_login_button()
 
     # Complete all the fields with valid data and click the "Save" button.

tests/password_manager/test_add_password_save_valid_data.py

@@ -15,9 +15,10 @@ def test_add_password_save_valid_data(driver: Firefox):
     C2241112 Verify that a password can be added and saved
     """
     # instantiate object
-    about_logins = AboutLogins(driver).open()
+    about_logins = AboutLogins(driver)
 
-    # Click on the "Add password" button
+    # Open about:logins and click on the "Add password" button
+    about_logins.open()
     about_logins.click_add_login_button()
 
     # Complete all the fields with valid data and click the "Save" button.