Merge pull request #1859 from seleniumbase/update-tours-and-mobile-mode

Update tours and mobile mode

Author: mdmintz

examples/presenter/edge_presentation.py

@@ -30,4 +30,3 @@ def test_skype_mobile_site(self):
         self.highlight_click('[data-bi-name="arrow-dropdown-mobile"]')
         self.highlight("#get-skype-0_android-download")
         self.highlight('[data-bi-id*="ios"]')
-        self.highlight('[data-bi-id*="windows10"]')

examples/test_skype_site.py

@@ -19,7 +19,7 @@ certifi>=2022.12.7
 filelock>=3.4.1;python_version<"3.7"
 filelock>=3.12.0;python_version>="3.7"
 platformdirs>=2.4.0;python_version<"3.7"
-platformdirs>=3.4.0;python_version>="3.7"
+platformdirs>=3.5.0;python_version>="3.7"
 pyparsing>=3.0.7;python_version<"3.7"
 pyparsing>=3.0.9;python_version>="3.7"
 zipp==3.6.0;python_version<"3.7"
@@ -99,13 +99,13 @@ commonmark==0.9.1;python_version<"3.7"
 markdown-it-py==2.2.0;python_version>="3.7"
 mdurl==0.1.2;python_version>="3.7"
 rich==12.6.0;python_version<"3.7"
-rich==13.3.4;python_version>="3.7"
+rich==13.3.5;python_version>="3.7"
 
 # --- Testing Requirements --- #
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)
 
 coverage==6.2;python_version<"3.7"
-coverage==7.2.3;python_version>="3.7"
+coverage==7.2.4;python_version>="3.7"
 pytest-cov==4.0.0
 flake8==5.0.4;python_version<"3.9"
 flake8==6.0.0;python_version>="3.9"

requirements.txt

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.14.3"
+__version__ = "4.14.4"

seleniumbase/__version__.py

@@ -263,7 +263,7 @@ def play_shepherd_tour(driver, tour_steps, msg_dur, name=None, interval=0):
         // Start the tour
         tour.start();
         $tour = tour;"""
-    instructions += """
+    extra = """
         document.body.addEventListener('keyup', function (event) {
         if (event.key === 'PageUp' || event.key === 'ArrowLeft') {
             Shepherd.activeTour.back(); }
@@ -278,6 +278,7 @@ def play_shepherd_tour(driver, tour_steps, msg_dur, name=None, interval=0):
             interval = 0.5
 
     if not is_shepherd_activated(driver):
+        instructions += extra
         activate_shepherd(driver)
 
     if len(tour_steps[name]) > 1:
@@ -509,7 +510,7 @@ def play_driverjs_tour(
         // Start the tour!
         tour.start();
         $tour = tour;"""
-    instructions += """
+    extra = """
         document.body.addEventListener('keyup', function (event) {
         if (event.key === 'PageUp') { $tour.movePrevious(); }
         if (event.key === 'PageDown') { $tour.moveNext(); }
@@ -522,6 +523,7 @@ def play_driverjs_tour(
             interval = 0.5
 
     if not is_driverjs_activated(driver):
+        instructions += extra
         activate_driverjs(driver)
 
     if len(tour_steps[name]) > 1:
@@ -641,7 +643,7 @@ def play_hopscotch_tour(
         // Start the tour!
         hopscotch.startTour(tour);
         $tour = hopscotch;"""
-    instructions += """
+    extra = """
         document.body.addEventListener('keyup', function (event) {
         if (event.key === 'PageUp' || event.key === 'ArrowLeft') {
             $tour.prevStep(); }
@@ -656,6 +658,7 @@ def play_hopscotch_tour(
             interval = 0.5
 
     if not is_hopscotch_activated(driver):
+        instructions += extra
         activate_hopscotch(driver)
 
     if len(tour_steps[name]) > 1:
@@ -790,7 +793,7 @@ def play_introjs_tour(
         // Start the tour
         startIntro();
         """
-    instructions += """
+    extra = """
         document.body.addEventListener('keyup', function (event) {
         if (event.key === 'PageUp') { $tour.previousStep(); }
         if (event.key === 'PageDown') { $tour.nextStep(); }
@@ -803,6 +806,7 @@ def play_introjs_tour(
             interval = 0.5
 
     if not is_introjs_activated(driver):
+        instructions += extra
         activate_introjs(driver)
 
     if len(tour_steps[name]) > 1:

seleniumbase/core/tour_helper.py

@@ -3155,16 +3155,19 @@ def safe_execute_script(self, script, *args, **kwargs):
 
     def set_window_rect(self, x, y, width, height):
         self.__check_scope()
+        self.__check_browser()
         self.driver.set_window_rect(x, y, width, height)
         self.__demo_mode_pause_if_active()
 
     def set_window_size(self, width, height):
         self.__check_scope()
+        self.__check_browser()
         self.driver.set_window_size(width, height)
         self.__demo_mode_pause_if_active()
 
     def maximize_window(self):
         self.__check_scope()
+        self.__check_browser()
         self.driver.maximize_window()
         self.__demo_mode_pause_if_active()
 
@@ -3763,6 +3766,13 @@ def get_new_driver(
             d_height = self.__device_height
         if d_p_r is None:
             d_p_r = self.__device_pixel_ratio
+        if is_mobile and not user_agent:
+            # Use the Pixel 4 user agent by default if not specified
+            user_agent = (
+                "Mozilla/5.0 (Linux; Android 11; Pixel 4 XL) "
+                "AppleWebKit/537.36 (KHTML, like Gecko) "
+                "Chrome/89.0.4389.105 Mobile Safari/537.36"
+            )
         valid_browsers = constants.ValidBrowsers.valid_browsers
         if browser_name not in valid_browsers:
             raise Exception(
@@ -9367,6 +9377,11 @@ def quit_extra_driver(self, driver=None):
         # If the driver to quit was the active driver, switch drivers
         if driver == self.driver:
             self.switch_to_default_driver()
+        try:
+            self.__check_browser()
+        except Exception:
+            self._default_driver = self._drivers_list[-1]
+            self.switch_to_default_driver()
 
     ############
 

seleniumbase/fixtures/base_case.py

@@ -143,7 +143,7 @@
         'filelock>=3.4.1;python_version<"3.7"',
         'filelock>=3.12.0;python_version>="3.7"',
         'platformdirs>=2.4.0;python_version<"3.7"',
-        'platformdirs>=3.4.0;python_version>="3.7"',
+        'platformdirs>=3.5.0;python_version>="3.7"',
         'pyparsing>=3.0.7;python_version<"3.7"',
         'pyparsing>=3.0.9;python_version>="3.7"',
         'zipp==3.6.0;python_version<"3.7"',
@@ -223,25 +223,25 @@
         'markdown-it-py==2.2.0;python_version>="3.7"',  # For new "rich"
         'mdurl==0.1.2;python_version>="3.7"',  # For new "rich"
         'rich==12.6.0;python_version<"3.7"',
-        'rich==13.3.4;python_version>="3.7"',
+        'rich==13.3.5;python_version>="3.7"',
     ],
     extras_require={
         # pip install -e .[allure]
         # Usage: pytest --alluredir=allure_results
         # Serve: allure serve allure_results
         "allure": [
             'allure-pytest==2.9.45;python_version<"3.7"',
-            'allure-pytest==2.13.1;python_version>="3.7"',
+            'allure-pytest==2.13.2;python_version>="3.7"',
             'allure-python-commons==2.9.45;python_version<"3.7"',
-            'allure-python-commons==2.13.1;python_version>="3.7"',
+            'allure-python-commons==2.13.2;python_version>="3.7"',
             'allure-behave==2.9.45;python_version<"3.7"',
-            'allure-behave==2.13.1;python_version>="3.7"',
+            'allure-behave==2.13.2;python_version>="3.7"',
         ],
         # pip install -e .[coverage]
         # Usage: coverage run -m pytest; coverage html; coverage report
         "coverage": [
             'coverage==6.2;python_version<"3.7"',
-            'coverage==7.2.3;python_version>="3.7"',
+            'coverage==7.2.4;python_version>="3.7"',
             "pytest-cov==4.0.0",
         ],
         # pip install -e .[flake8]