Merge pull request #216 from seleniumbase/accept-xpath-in-tours

Accept xpath selectors in website tours

Author: mdmintz

examples/tour_examples/hopscotch_google_tour.py

@@ -19,7 +19,8 @@ def test_google_tour(self):
 
         self.create_hopscotch_tour()
         self.add_tour_step(
-            "Then click here to search.", 'input[value="Google Search"]')
+            "Then click here to search.", 'input[value="Google Search"]',
+            alignment="top")
         self.add_tour_step(
             "Or press [ENTER] after typing a query here.", '[title="Search"]')
         self.play_tour()

seleniumbase/fixtures/base_case.py

@@ -1175,6 +1175,8 @@ def add_tour_step(self, message, selector=None, name=None,
         """
         if not selector:
             selector = "html"
+        if page_utils.is_xpath_selector(selector):
+            selector = self.convert_to_css_selector(selector, By.XPATH)
         selector = self.__escape_quotes_if_needed(selector)
 
         if not name:

seleniumbase/fixtures/page_actions.py

@@ -125,8 +125,8 @@ def hover_and_click(driver, hover_selector, click_selector,
     hover.perform()
     for x in range(int(timeout * 10)):
         try:
-            element = driver.find_element(by=click_by,
-                                          value="%s" % click_selector).click()
+            element = driver.find_element(by=click_by, value=click_selector)
+            element.click()
             return element
         except Exception:
             now_ms = time.time() * 1000.0
@@ -150,8 +150,8 @@ def hover_element_and_click(driver, element, click_selector,
     hover.perform()
     for x in range(int(timeout * 10)):
         try:
-            element = driver.find_element(by=click_by,
-                                          value="%s" % click_selector).click()
+            element = driver.find_element(by=click_by, value=click_selector)
+            element.click()
             return element
         except Exception:
             now_ms = time.time() * 1000.0

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.16.2',
+    version='1.16.3',
     description='All-In-One Test Automation Framework',
     long_description=long_description,
     long_description_content_type='text/markdown',