Merge pull request #445 from mozilla/philimon/suite_refactor

Philimon/suite refactor

Author: philimon-reset

SELECTOR_INFO.md

@@ -12,7 +12,7 @@ Path to .json: (ie, modules/data/google_search.components.json
 ```
 Selector Name: sidebar-options
 Selector Data: "button.category[name='{name}']"
-Description: Selects an option in about:addons (sidebar)
+Description: Selects an option in about:addons(sidebar)
 Location: Left side of about:addons page
 Path to .json: modules/data/about_addons.components.json
 ```
@@ -977,6 +977,20 @@ Location: about:preferences#privacy in Exceptions - Saved Passwords modal
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: actions-menu
+Selector Data: "richlistitem[type='{.*}'] menulist.actionsMenu"
+Description: Select Application list that handles how downloads are handled
+Location: about:preferences#general Applications subsection
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: actions-menu-option
+Selector Data: "richlistitem[type='{.*}'] menuitem[label='{.*}']"
+Description: Select download option from Application List
+Location: about:preferences#general Applications subsection
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: use-primary-password
 Selector Data: "useMasterPassword"
 Description: Checkbox for using primary password
@@ -2156,6 +2170,13 @@ Location: any element that supports the attribute (usually text)
 Path to .json: modules/data/generic_pdf.components.json
 ```
 ```
+Selector Name: pdf-text-layer
+Selector Data: "textLayer"
+Description: first instance of a text span.
+Location: any element that supports the attribute (usually text)
+Path to .json: modules/data/generic_pdf.components.json
+```
+```
 Selector Name: html-body
 Selector Data: "html"
 Description: The html tag of the pdf

modules/browser_object_find_toolbar.py

@@ -1,6 +1,7 @@
 import json
 import logging
 
+from selenium.webdriver import Firefox
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 
@@ -11,79 +12,93 @@
 class FindToolbar(BasePage):
     URL_TEMPLATE = ""
 
+    def __init__(self, driver: Firefox, **kwargs):
+        super().__init__(driver, **kwargs)
+        self.panel_ui = PanelUi(self.driver)
+        self.match_dict = {}
+
+    @BasePage.context_chrome
     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()
+        self.panel_ui.open_panel_menu()
+        self.panel_ui.select_panel_setting("find-in-page")
+        self.wait_for_page_to_load()
         return self
 
+    @BasePage.context_chrome
     def open_with_key_combo(self) -> BasePage:
         """Use Cmd/Ctrl + F to open the Find Toolbar, wait for load"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            if self.sys_platform() == "Darwin":
-                mod_key = Keys.COMMAND
-            else:
-                mod_key = Keys.CONTROL
-            self.perform_key_combo(mod_key, "f")
-            self.wait_for_page_to_load()
+        if self.sys_platform() == "Darwin":
+            mod_key = Keys.COMMAND
+        else:
+            mod_key = Keys.CONTROL
+        self.perform_key_combo(mod_key, "f")
+        self.wait_for_page_to_load()
         return self
 
+    @BasePage.context_chrome
     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)
+        find_bar = self.get_element("find-toolbar-input")
+        find_bar.click()
+        find_bar.clear()
+        find_bar.send_keys(term + Keys.ENTER)
+        if find_bar.get_property("status") != "notfound":
+            self.match_dict = self.get_match_args()
         return self
 
+    @BasePage.context_chrome
     def get_match_args(self) -> dict:
         """Return the status of the find session"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            matches = self.get_element("matches-label")
-            self.expect(
-                EC.text_to_be_present_in_element_attribute(
-                    self.get_selector("matches-label"), "data-l10n-args", ":"
-                )
+        self.expect(
+            EC.text_to_be_present_in_element_attribute(
+                self.get_selector("matches-label"), "data-l10n-args", ":"
             )
-            logging.info(matches.get_attribute("outerHTML"))
-            match_status_str = matches.get_attribute("data-l10n-args")
-            return json.loads(match_status_str)
+        )
+        matches = self.get_element("matches-label")
+        logging.info(matches.get_attribute("outerHTML"))
+        match_status_str = matches.get_attribute("data-l10n-args")
+        self.match_dict = json.loads(match_status_str)
+        return self.match_dict
 
+    @BasePage.context_chrome
     def next_match(self) -> BasePage:
         """Click the Next Match button"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("next-match-button").click()
+        self.get_element("next-match-button").click()
+        if self.match_dict["current"] < self.match_dict["total"]:
+            self.match_dict["current"] += 1
+        else:
+            self.match_dict["current"] = 1
         return self
 
+    @BasePage.context_chrome
     def previous_match(self) -> BasePage:
         """Click the Previous Match button"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("previous-match-button").click()
+        self.get_element("previous-match-button").click()
+        if self.match_dict["current"] > 1:
+            self.match_dict["current"] -= 1
+        else:
+            self.match_dict["current"] = self.match_dict["total"]
         return self
 
+    @BasePage.context_chrome
     def rewind_to_first_match(self) -> BasePage:
         """Go back to match 1 of n"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            position = self.get_match_args()["current"]
-            total = self.get_match_args()["total"]
-            while position != 1:
-                if position < total // 2:
-                    self.previous_match()
-                else:
-                    self.next_match()
-                position = self.get_match_args()["current"]
+        while self.match_dict["current"] != 1:
+            self.previous_match()
         return self
 
+    @BasePage.context_chrome
     def navigate_matches_by_keys(self, backwards=False) -> BasePage:
         """Use F3 and Shift+F3 to navigate matches"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            if backwards:
-                self.perform_key_combo(Keys.SHIFT, Keys.F3)
-            else:
-                logging.info(f"sending {Keys.F3.encode()}")
-                self.actions.send_keys(Keys.F3).perform()
-            return self
+        if backwards:
+            self.perform_key_combo(Keys.SHIFT, Keys.F3)
+        else:
+            logging.info(f"sending {Keys.F3.encode()}")
+            self.actions.send_keys(Keys.F3).perform()
+        return self
+
+    @BasePage.context_chrome
+    def navigate_matches_n_times(self, n: int):
+        for _ in range(n):
+            self.next_match()