Merge pull request #571 from seleniumbase/more-translations

Update the Universal Translator API

Author: mdmintz

help_docs/method_summary.md

@@ -180,6 +180,7 @@ self.wait_for_ready_state_complete(timeout=None)
 self.wait_for_angularjs(timeout=None)
 
 self.sleep(seconds)
+# Duplicates: self.wait(seconds)
 
 self.activate_jquery()
 
@@ -435,8 +436,10 @@ self.assert_partial_link_text(partial_link_text, timeout=None)
 ############
 
 self.wait_for_element_absent(selector, by=By.CSS_SELECTOR, timeout=None)
+# Duplicates: self.wait_for_element_not_present(selector, by=By.CSS_SELECTOR)
 
 self.assert_element_absent(selector, by=By.CSS_SELECTOR, timeout=None)
+# Duplicates: self.assert_element_not_present(selector, by=By.CSS_SELECTOR)
 
 ############
 

requirements.txt

@@ -1,6 +1,6 @@
 pip>=20.1
 setuptools>=44.1.0;python_version<"3.5"
-setuptools>=46.2.0;python_version>="3.5"
+setuptools>=46.3.0;python_version>="3.5"
 setuptools-scm>=3.5.0
 wheel>=0.34.2
 six==1.14.0
@@ -13,7 +13,7 @@ requests==2.23.0
 selenium==3.141.0
 pluggy==0.13.1
 attrs>=19.3.0
-pytest==4.6.9;python_version<"3.5"
+pytest==4.6.10;python_version<"3.5"
 pytest==5.4.2;python_version>="3.5"
 pytest-cov==2.8.1
 pytest-forked==1.1.3
@@ -41,8 +41,10 @@ coverage==5.1
 pyotp==2.3.0
 boto==2.49.0
 cffi==1.14.0
-flake8==3.7.9
-pyflakes==2.1.1
+flake8==3.7.9;python_version<"3.5"
+flake8==3.8.1;python_version>="3.5"
+pyflakes==2.1.1;python_version<"3.5"
+pyflakes==2.2.0;python_version>="3.5"
 certifi>=2020.4.5.1
 pdfminer.six==20191110;python_version<"3.5"
 pdfminer.six==20200402;python_version>="3.5"

seleniumbase/common/encryption.py

@@ -71,8 +71,8 @@ def blend_strings(string1, string2):
     return new_string
 
 
-def rotate(l, n):
-    return l[n:] + l[:n]
+def rotate(string, n):
+    return string[n:] + string[:n]
 
 
 def ord_string_sum(string):

seleniumbase/fixtures/base_case.py

@@ -200,8 +200,7 @@ def double_click(self, selector, by=By.CSS_SELECTOR, timeout=None):
             timeout = settings.SMALL_TIMEOUT
         if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         element = page_actions.wait_for_element_visible(
             self.driver, selector, by, timeout=timeout)
         self.__demo_mode_highlight_if_active(selector, by)
@@ -265,8 +264,7 @@ def update_text(self, selector, new_value, by=By.CSS_SELECTOR,
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         element = self.wait_for_element_visible(
             selector, by=by, timeout=timeout)
         self.__demo_mode_highlight_if_active(selector, by)
@@ -336,8 +334,7 @@ def add_text(self, selector, text, by=By.CSS_SELECTOR, timeout=None):
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         element = self.wait_for_element_visible(
             selector, by=by, timeout=timeout)
         self.__demo_mode_highlight_if_active(selector, by)
@@ -379,8 +376,7 @@ def add_text(self, selector, text, by=By.CSS_SELECTOR, timeout=None):
 
     def submit(self, selector, by=By.CSS_SELECTOR):
         """ Alternative to self.driver.find_element_by_*(SELECTOR).submit() """
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         element = self.wait_for_element_visible(
             selector, by=by, timeout=settings.SMALL_TIMEOUT)
         element.submit()
@@ -733,8 +729,7 @@ def get_text(self, selector, by=By.CSS_SELECTOR, timeout=None):
             timeout = settings.SMALL_TIMEOUT
         if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         self.wait_for_ready_state_complete()
         time.sleep(0.01)
         element = page_actions.wait_for_element_visible(
@@ -1857,8 +1852,7 @@ def bring_to_front(self, selector, by=By.CSS_SELECTOR):
             Useful when getting a WebDriverException, such as the one below:
                 { Element is not clickable at point (#, #).
                   Other element would receive the click: ... } """
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         self.wait_for_element_visible(
             selector, by=by, timeout=settings.SMALL_TIMEOUT)
         try:
@@ -2444,8 +2438,7 @@ def choose_file(self, selector, file_path, by=By.CSS_SELECTOR,
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         abs_path = os.path.abspath(file_path)
         self.add_text(selector, abs_path, by=by, timeout=timeout)
 
@@ -2724,8 +2717,7 @@ def set_value(self, selector, new_value, by=By.CSS_SELECTOR, timeout=None):
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         orginal_selector = selector
         css_selector = self.convert_to_css_selector(selector, by=by)
         self.__demo_mode_highlight_if_active(orginal_selector, by)
@@ -2766,8 +2758,7 @@ def jquery_update_text(self, selector, new_value, by=By.CSS_SELECTOR,
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         element = self.wait_for_element_visible(
             selector, by=by, timeout=timeout)
         self.__demo_mode_highlight_if_active(selector, by)
@@ -2899,8 +2890,7 @@ def type(self, selector, text, by=By.CSS_SELECTOR,
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         self.update_text(selector, text, by=by, timeout=timeout, retry=retry)
 
     def input(self, selector, text, by=By.CSS_SELECTOR,
@@ -2910,8 +2900,7 @@ def input(self, selector, text, by=By.CSS_SELECTOR,
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         self.update_text(selector, text, by=by, timeout=timeout, retry=retry)
 
     def write(self, selector, text, by=By.CSS_SELECTOR,
@@ -2921,8 +2910,7 @@ def write(self, selector, text, by=By.CSS_SELECTOR,
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        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=By.CSS_SELECTOR, timeout=None):
@@ -2931,8 +2919,7 @@ def send_keys(self, selector, text, by=By.CSS_SELECTOR, timeout=None):
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         self.add_text(selector, text, by=by, timeout=timeout)
 
     def click_link(self, link_text, timeout=None):
@@ -2954,6 +2941,37 @@ def wait_for_element_visible(self, selector, by=By.CSS_SELECTOR,
         return page_actions.wait_for_element_visible(
             self.driver, selector, by, timeout)
 
+    def wait_for_element_not_present(self, selector, by=By.CSS_SELECTOR,
+                                     timeout=None):
+        """ Same as self.wait_for_element_absent()
+            Waits for an element to no longer appear in the HTML of a page.
+            A hidden element still counts as appearing in the page HTML.
+            If an element with "hidden" status is acceptable,
+            use wait_for_element_not_visible() instead. """
+        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)
+        return page_actions.wait_for_element_absent(
+            self.driver, selector, by, timeout)
+
+    def assert_element_not_present(self, selector, by=By.CSS_SELECTOR,
+                                   timeout=None):
+        """ Same as self.assert_element_absent()
+            Will raise an exception if the element stays present.
+            Returns True if successful. Default timeout = SMALL_TIMEOUT. """
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+            timeout = self.__get_new_timeout(timeout)
+        self.wait_for_element_absent(selector, by=by, timeout=timeout)
+        return True
+
+    def wait(self, seconds):
+        """ Same as sleep() - Some JS frameworks use this method name. """
+        self.sleep(seconds)
+
     def _print(self, msg):
         print(msg)
 
@@ -3161,6 +3179,9 @@ def add_tour_step(self, message, selector=None, name=None,
         """
         if not selector:
             selector = "html"
+        if page_utils.is_name_selector(selector):
+            name = page_utils.get_name_from_selector(selector)
+            selector = '[name="%s"]' % name
         if page_utils.is_xpath_selector(selector):
             selector = self.convert_to_css_selector(selector, By.XPATH)
         selector = self.__escape_quotes_if_needed(selector)
@@ -3860,8 +3881,7 @@ def wait_for_element_absent(self, selector, by=By.CSS_SELECTOR,
             timeout = settings.LARGE_TIMEOUT
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        if page_utils.is_xpath_selector(selector):
-            by = By.XPATH
+        selector, by = self.__recalculate_selector(selector, by)
         return page_actions.wait_for_element_absent(
             self.driver, selector, by, timeout)
 

seleniumbase/translate/chinese.py

@@ -53,6 +53,22 @@ def 断言元素(self, *args, **kwargs):
         # assert_element(selector)
         return self.assert_element(*args, **kwargs)
 
+    def 断言元素可见(self, *args, **kwargs):
+        # assert_element_visible(selector)  # Same as self.assert_element()
+        return self.assert_element_visible(*args, **kwargs)
+
+    def 断言元素不可见(self, *args, **kwargs):
+        # assert_element_not_visible(selector)
+        return self.assert_element_not_visible(*args, **kwargs)
+
+    def 断言元素存在(self, *args, **kwargs):
+        # assert_element_present(selector)
+        return self.assert_element_present(*args, **kwargs)
+
+    def 断言元素不存在(self, *args, **kwargs):
+        # assert_element_absent(selector)
+        return self.assert_element_absent(*args, **kwargs)
+
     def 断言标题(self, *args, **kwargs):
         # assert_title(title)
         return self.assert_title(*args, **kwargs)
@@ -113,14 +129,30 @@ def 等待元素(self, *args, **kwargs):
         # wait_for_element(selector)
         return self.wait_for_element(*args, **kwargs)
 
+    def 等待元素可见(self, *args, **kwargs):
+        # wait_for_element_visible(selector)  # Same as wait_for_element()
+        return self.wait_for_element_visible(*args, **kwargs)
+
+    def 等待元素不可见(self, *args, **kwargs):
+        # wait_for_element_not_visible(selector)
+        return self.wait_for_element_not_visible(*args, **kwargs)
+
     def 等待元素存在(self, *args, **kwargs):
         # wait_for_element_present(selector)
         return self.wait_for_element_present(*args, **kwargs)
 
+    def 等待元素不存在(self, *args, **kwargs):
+        # wait_for_element_absent(selector)
+        return self.wait_for_element_absent(*args, **kwargs)
+
     def 睡(self, *args, **kwargs):
         # sleep(seconds)
         return self.sleep(*args, **kwargs)
 
+    def 等待(self, *args, **kwargs):
+        # wait(seconds)  # Same as sleep(seconds)
+        return self.wait(*args, **kwargs)
+
     def 提交(self, *args, **kwargs):
         # submit(selector)
         return self.submit(*args, **kwargs)

seleniumbase/translate/dutch.py

@@ -53,6 +53,22 @@ def controleren_element(self, *args, **kwargs):
         # assert_element(selector)
         return self.assert_element(*args, **kwargs)
 
+    def controleren_element_zichtbaar(self, *args, **kwargs):
+        # assert_element_visible(selector)  # Same as self.assert_element()
+        return self.assert_element_visible(*args, **kwargs)
+
+    def controleren_element_niet_zichtbaar(self, *args, **kwargs):
+        # assert_element_not_visible(selector)
+        return self.assert_element_not_visible(*args, **kwargs)
+
+    def controleren_element_aanwezig(self, *args, **kwargs):
+        # assert_element_present(selector)
+        return self.assert_element_present(*args, **kwargs)
+
+    def controleren_element_afwezig(self, *args, **kwargs):
+        # assert_element_absent(selector)
+        return self.assert_element_absent(*args, **kwargs)
+
     def controleren_titel(self, *args, **kwargs):
         # assert_title(title)
         return self.assert_title(*args, **kwargs)
@@ -105,22 +121,38 @@ def element_aanwezig(self, *args, **kwargs):
         # is_element_present(selector)
         return self.is_element_present(*args, **kwargs)
 
-    def wacht_op_tekst(self, *args, **kwargs):
+    def wachten_op_tekst(self, *args, **kwargs):
         # wait_for_text(text, selector)
         return self.wait_for_text(*args, **kwargs)
 
-    def wacht_op_element(self, *args, **kwargs):
+    def wachten_op_element(self, *args, **kwargs):
         # wait_for_element(selector)
         return self.wait_for_element(*args, **kwargs)
 
-    def wacht_op_element_aanwezig(self, *args, **kwargs):
+    def wachten_op_element_zichtbaar(self, *args, **kwargs):
+        # wait_for_element_visible(selector)  # Same as wait_for_element()
+        return self.wait_for_element_visible(*args, **kwargs)
+
+    def wachten_op_element_niet_zichtbaar(self, *args, **kwargs):
+        # wait_for_element_not_visible(selector)
+        return self.wait_for_element_not_visible(*args, **kwargs)
+
+    def wachten_op_element_aanwezig(self, *args, **kwargs):
         # wait_for_element_present(selector)
         return self.wait_for_element_present(*args, **kwargs)
 
+    def wachten_op_element_afwezig(self, *args, **kwargs):
+        # wait_for_element_absent(selector)
+        return self.wait_for_element_absent(*args, **kwargs)
+
     def slapen(self, *args, **kwargs):
         # sleep(seconds)
         return self.sleep(*args, **kwargs)
 
+    def wachten(self, *args, **kwargs):
+        # wait(seconds)  # Same as sleep(seconds)
+        return self.wait(*args, **kwargs)
+
     def verzenden(self, *args, **kwargs):
         # submit(selector)
         return self.submit(*args, **kwargs)
@@ -229,15 +261,15 @@ def klik_zichtbare_elementen(self, *args, **kwargs):
         # click_visible_elements(selector)
         return self.click_visible_elements(*args, **kwargs)
 
-    def optie_selecteren_per_tekst(self, *args, **kwargs):
+    def optie_selecteren_op_tekst(self, *args, **kwargs):
         # select_option_by_text(dropdown_selector, option)
         return self.select_option_by_text(*args, **kwargs)
 
-    def optie_selecteren_per_index(self, *args, **kwargs):
+    def optie_selecteren_op_index(self, *args, **kwargs):
         # select_option_by_index(dropdown_selector, option)
         return self.select_option_by_index(*args, **kwargs)
 
-    def optie_selecteren_per_waarde(self, *args, **kwargs):
+    def optie_selecteren_op_waarde(self, *args, **kwargs):
         # select_option_by_value(dropdown_selector, option)
         return self.select_option_by_value(*args, **kwargs)