Merge pull request #1391 from seleniumbase/pressing-tabs-and-active-elements

Add a shortcut for cycling through elements with the "tab" key and then clicking the active element

Author: mdmintz

.github/workflows/python-package.yml

@@ -30,6 +30,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        python -m pip install --upgrade wheel
         pip install -r requirements.txt
     - name: Install SeleniumBase
       run: |

examples/test_cycle_elements.py

@@ -0,0 +1,13 @@
+from seleniumbase import BaseCase
+
+
+class CycleTests(BaseCase):
+    def test_cycle_elements_with_tab_and_press_enter(self):
+        """ Test pressing the tab key to cycle through elements.
+            Then click on the active element and verify actions.
+            This can all be performed by using a single command.
+            The "\t" is the tab key. The "\n" is the RETURN key. """
+        self.open("seleniumbase.io/demo_page")
+        self.assert_text("This Text is Green", "#pText")
+        self.send_keys("html", "\t\t\t\t\n")
+        self.assert_text("This Text is Purple", "#pText")

help_docs/method_summary.md

@@ -30,8 +30,8 @@ self.type(selector, text, by="css selector", timeout=None)
 #             self.fill(selector, text, by="css selector", timeout=None)
 #             self.write(selector, text, by="css selector", timeout=None)
 
-self.add_text(selector, text, by="css selector", timeout=None)
-# Duplicates: self.send_keys(selector, text, by="css selector", timeout=None)
+self.send_keys(selector, text, by="css selector", timeout=None)
+# Duplicates: self.add_text(selector, text, by="css selector", timeout=None)
 
 self.submit(selector, by="css selector")
 

requirements.txt

@@ -124,7 +124,7 @@ toml==0.10.2
 Pillow==6.2.2;python_version<"3.5"
 Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"
 Pillow==8.4.0;python_version>="3.6" and python_version<"3.7"
-Pillow==9.1.1;python_version>="3.7"
+Pillow==9.2.0;python_version>="3.7"
 typing-extensions==3.10.0.2;python_version<"3.6"
 typing-extensions==4.1.1;python_version>="3.6" and python_version<"3.7"
 typing-extensions==4.2.0;python_version>="3.7" and python_version<"3.9"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "3.3.5"
+__version__ = "3.3.6"

seleniumbase/fixtures/base_case.py

@@ -649,9 +649,25 @@ def add_text(self, selector, text, by="css selector", timeout=None):
         if self.__is_shadow_selector(selector):
             self.__shadow_type(selector, text, timeout, clear_first=False)
             return
+        if selector == "html" and text in ["\n", Keys.ENTER, Keys.RETURN]:
+            # This is a shortcut for calling self.click_active_element().
+            # Use after "\t" or Keys.TAB to cycle through elements first.
+            self.click_active_element()
+            return
         element = self.wait_for_element_visible(
             selector, by=by, timeout=timeout
         )
+        if (
+            selector == "html" and text.count("\t") >= 1
+            and text.count("\n") == 1 and text.endswith("\n")
+            and text.replace("\t", "").replace("\n", "").replace(" ", "") == ""
+        ):
+            # Shortcut to send multiple tabs followed by click_active_element()
+            self.wait_for_ready_state_complete()
+            for tab in range(text.count("\t")):
+                element.send_keys("\t")
+            self.click_active_element()
+            return
         self.__demo_mode_highlight_if_active(selector, by)
         if not self.demo_mode and not self.slow_mode:
             self.__scroll_to_element(element, selector, by)
@@ -713,6 +729,17 @@ def type(
         selector, by = self.__recalculate_selector(selector, by)
         self.update_text(selector, text, by=by, timeout=timeout, retry=retry)
 
+    def send_keys(self, selector, text, by="css selector", timeout=None):
+        """Same as self.add_text()
+        Similar to update_text(), but won't clear the text field first."""
+        self.__check_scope()
+        if not timeout:
+            timeout = settings.LARGE_TIMEOUT
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
+            timeout = self.__get_new_timeout(timeout)
+        selector, by = self.__recalculate_selector(selector, by)
+        self.add_text(selector, text, by=by, timeout=timeout)
+
     def submit(self, selector, by="css selector"):
         """Alternative to self.driver.find_element_by_*(SELECTOR).submit()"""
         self.__check_scope()
@@ -7317,16 +7344,6 @@ def write(
         selector, by = self.__recalculate_selector(selector, by)
         self.update_text(selector, text, by=by, timeout=timeout, retry=retry)
 
-    def send_keys(self, selector, text, by="css selector", timeout=None):
-        """Same as self.add_text()"""
-        self.__check_scope()
-        if not timeout:
-            timeout = settings.LARGE_TIMEOUT
-        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
-            timeout = self.__get_new_timeout(timeout)
-        selector, by = self.__recalculate_selector(selector, by)
-        self.add_text(selector, text, by=by, timeout=timeout)
-
     def click_link(self, link_text, timeout=None):
         """Same as self.click_link_text()"""
         self.__check_scope()

setup.py

@@ -251,7 +251,7 @@
         'Pillow==6.2.2;python_version<"3.5"',
         'Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"',
         'Pillow==8.4.0;python_version>="3.6" and python_version<"3.7"',
-        'Pillow==9.1.1;python_version>="3.7"',
+        'Pillow==9.2.0;python_version>="3.7"',
         'typing-extensions==3.10.0.2;python_version<"3.6"',  # <3.9 for "rich"
         'typing-extensions==4.1.1;python_version>="3.6" and python_version<"3.7"',  # noqa: E501
         'typing-extensions==4.2.0;python_version>="3.7" and python_version<"3.9"',  # noqa: E501