Updating other Xpath error messages within Salesforce.py and PasePageObjects.py

Author: arvindbhamidipati

cumulusci/robotframework/Salesforce.py

@@ -16,6 +16,7 @@
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.keys import Keys
 from SeleniumLibrary.errors import ElementNotFound, NoOpenBrowser
+from selenium.webdriver.common.by import By
 from urllib3.exceptions import ProtocolError
 
 from cumulusci.robotframework import locator_manager
@@ -608,7 +609,7 @@ def select_app_launcher_app(self, app_name, timeout=30):
         self.selenium.wait_until_page_contains_element(locator, timeout)
         self.selenium.set_focus_to_element(locator)
         elem = self.selenium.get_webelement(locator)
-        link = elem.find_element_by_xpath("../../..")
+        link = elem.find_element(By.XPATH, "../../..")
         self.selenium.set_focus_to_element(link)
         link.click()
         self.wait_until_modal_is_closed()
@@ -908,9 +909,7 @@ def _locate_element_by_label(self, browser, locator, tag, constraints):
                 # probably never be. Famous last words, right?
                 orig_wait = self.selenium.set_selenium_implicit_wait(0)
                 component = None
-                component = label_element.find_element_by_xpath(
-                    "./ancestor::*[starts-with(local-name(), 'lightning-')][1]"
-                )
+                component = label_element.find_element(By.XPATH, "./ancestor::*[starts-with(local-name(), 'lightning-')][1]")
             except NoSuchElementException:
                 component_id = label_element.get_attribute("for")
                 if component_id:

cumulusci/robotframework/pageobjects/BasePageObjects.py

@@ -263,7 +263,6 @@ def _get_form_element_for_label(self, label):
 
             # also, we use find_elements (plural) here because it will
             # return an empty list rather than throwing an error
-            # modals = root.find_elements_by_xpath("//div[contains(@class, 'uiModal')]")
             modals = root.find_element(By.XPATH, "//div[contains(@class, 'uiModal')]")
             # There should only ever be zero or one, but the Salesforce
             # UI never ceases to surprise me.
@@ -275,7 +274,7 @@ def _get_form_element_for_label(self, label):
             # where "for" points to the associated input field. w00t! If we can,
             # use that. If not, fall back to an older strategy
             try:
-                label_element = root.find_element_by_xpath(f'//label[text()="{label}"]')
+                label_element = root.find_element(By.XPATH, f'//label[text()="{label}"]')
                 input_id = label_element.get_attribute("for")
                 element = root.find_element_by_id(input_id)
                 return element
@@ -288,7 +287,7 @@ def _get_form_element_for_label(self, label):
             # has a child element with the class 'form-element__label' and
             # text that matches the given label.
             locator = f".//*[contains(@class, 'slds-form-element') and .//*[contains(@class, 'form-element__label')]/descendant-or-self::text()='{label}']"
-            element = root.find_element_by_xpath(locator)
+            element = root.find_element(By.XPATH, locator)
             return element
 
         except NoSuchElementException:

cumulusci/robotframework/tests/salesforce/forms.robot

@@ -119,7 +119,7 @@ Lightning based form - radiobutton
     # Using the label: locator returns a lightning-input element. We need to find
     # the actual html input element to verify that it is checked. Ugly, but efficient.
     ${element}=  Get webelement  label:All users can see this list view
-    Should be true  ${element.find_element_by_xpath(".//input").is_selected()}
+    Should be true  ${element.find_element(By.XPATH, ".//input").is_selected()}
 
 Non-lightning based form - radiobutton
     [Documentation]  Verify we can set a plain non-lightning radiobutton