Improve Website-TourMaker reliability

Author: mdmintz

seleniumbase/core/tour_helper.py

@@ -417,13 +417,14 @@ def play_bootstrap_tour(
                     "return $tour.ended()")
             else:
                 page_actions.wait_for_element_present(
-                    driver, ".tour-tour", by=By.CSS_SELECTOR, timeout=0.4)
+                    driver, ".tour-tour", by=By.CSS_SELECTOR, timeout=0.65)
                 result = False
         except Exception:
             tour_on = False
             result = None
         if result is False:
             tour_on = True
+            time.sleep(0.05)
         else:
             try:
                 time.sleep(0.01)
@@ -432,10 +433,10 @@ def play_bootstrap_tour(
                         "return $tour.ended()")
                 else:
                     page_actions.wait_for_element_present(
-                        driver, ".tour-tour", by=By.CSS_SELECTOR, timeout=0.4)
+                        driver, ".tour-tour", by=By.CSS_SELECTOR, timeout=0.65)
                     result = False
                 if result is False:
-                    time.sleep(0.1)
+                    time.sleep(0.05)
                     continue
                 else:
                     return
@@ -502,9 +503,9 @@ def play_driverjs_tour(
                 result = not driver.execute_script(
                     "return $tour.isActivated")
             else:
-                page_actions.wait_for_element_present(
+                page_actions.wait_for_element_visible(
                     driver, "#driver-popover-item",
-                    by=By.CSS_SELECTOR, timeout=0.4)
+                    by=By.CSS_SELECTOR, timeout=1.1)
                 result = False
         except Exception:
             tour_on = False
@@ -542,9 +543,9 @@ def play_driverjs_tour(
                     result = not driver.execute_script(
                         "return $tour.isActivated")
                 else:
-                    page_actions.wait_for_element_present(
+                    page_actions.wait_for_element_visible(
                         driver, "#driver-popover-item",
-                        by=By.CSS_SELECTOR, timeout=0.4)
+                        by=By.CSS_SELECTOR, timeout=1.1)
                     result = False
                 if result is False:
                     time.sleep(0.1)

seleniumbase/fixtures/base_case.py

@@ -5214,7 +5214,7 @@ def add_tour_step(self, message, selector=None, name=None,
             name - If creating multiple tours at the same time,
                    use this to select the tour you wish to add steps to.
             title - Additional header text that appears above the message.
-            theme - (NON-Bootstrap Tours ONLY) The styling of the tour step.
+            theme - (Shepherd Tours ONLY) The styling of the tour step.
                     Choose from "light"/"arrows", "dark", "default", "square",
                     and "square-dark". ("arrows" is used if None is selected.)
             alignment - Choose from "top", "bottom", "left", and "right".
@@ -5284,7 +5284,7 @@ def __add_shepherd_tour_step(self, message, selector=None, name=None,
             name - If creating multiple tours at the same time,
                    use this to select the tour you wish to add steps to.
             title - Additional header text that appears above the message.
-            theme - (NON-Bootstrap Tours ONLY) The styling of the tour step.
+            theme - (Shepherd Tours ONLY) The styling of the tour step.
                     Choose from "light"/"arrows", "dark", "default", "square",
                     and "square-dark". ("arrows" is used if None is selected.)
             alignment - Choose from "top", "bottom", "left", and "right".
@@ -5485,6 +5485,8 @@ def play_tour(self, name=None, interval=0):
         if self.headless:
             return  # Tours should not run in headless mode.
 
+        self.wait_for_ready_state_complete()
+
         if not interval:
             interval = 0
         if interval == 0 and self.interval:

seleniumbase/fixtures/js_utils.py

@@ -122,7 +122,7 @@ def activate_jquery(driver):
         This happens because jQuery is not always defined on web sites. """
     try:
         # Let's first find out if jQuery is already defined.
-        driver.execute_script("jQuery('html')")
+        driver.execute_script("jQuery('html');")
         # Since that command worked, jQuery is defined. Let's return.
         return
     except Exception:
@@ -137,10 +137,16 @@ def activate_jquery(driver):
     for x in range(int(settings.MINI_TIMEOUT * 10.0)):
         # jQuery needs a small amount of time to activate.
         try:
-            driver.execute_script("jQuery('html')")
+            driver.execute_script("jQuery('html');")
             return
         except Exception:
             time.sleep(0.1)
+    try:
+        driver.execute_script(activate_jquery_script)
+        time.sleep(0.1)
+        driver.execute_script("jQuery('head');")
+    except Exception:
+        pass
     # Since jQuery still isn't activating, give up and raise an exception
     raise_unable_to_load_jquery_exception(driver)