Merge pull request #261 from seleniumbase/update-selenium-ide-conversion-tool

Update the selenium ide conversion tool

Author: mdmintz

seleniumbase/config/proxy_list.py

@@ -21,7 +21,6 @@
 
 PROXY_LIST = {
     "example1": "54.39.97.250:3128",  # (Example) - set your own proxy here
-    "example2": "18.191.175.174:8080",  # (Example) - set your own proxy here
     "proxy1": None,
     "proxy2": None,
     "proxy3": None,

seleniumbase/console_scripts/run.py

@@ -27,24 +27,25 @@ def show_usage():
     show_basic_usage()
     print('Type "seleniumbase --help" for details on all commands.')
     print('Type "seleniumbase help [COMMAND]" for specific command info.')
-    print('Use "pytest" for running tests.\n')
+    print('* Use "pytest" for running tests. *\n')
 
 
 def show_basic_usage():
     seleniumbase_logo = logo_helper.get_seleniumbase_logo()
     print(seleniumbase_logo)
     print("")
     print('Usage: "seleniumbase [COMMAND] [PARAMETERS]"')
-    print(' * (Example: "seleniumbase install chromedriver")')
     print("")
     print("Commands:")
-    print("   seleniumbase")
-    print("      install [DRIVER_NAME]")
-    print("      mkdir [NEW_TEST_DIRECTORY_NAME]")
-    print("      convert [PYTHON_WEBDRIVER_UNITTEST_FILE]")
-    print("      download server")
-    print("      grid-hub {start|stop|restart} [OPTIONS]")
-    print("      grid-node {start|stop|restart} --hub=[HUB_IP] [OPTIONS]")
+    print('   "seleniumbase" +')
+    print("       install [DRIVER_NAME]")
+    print("       mkdir [NEW_TEST_DIRECTORY_NAME]")
+    print("       convert [PYTHON_WEBDRIVER_UNITTEST_FILE]")
+    print("       download server")
+    print("       grid-hub {start|stop|restart} [OPTIONS]")
+    print("       grid-node {start|stop|restart} --hub=[HUB_IP] [OPTIONS]")
+    print("")
+    print('  * (Example: "seleniumbase install chromedriver") *')
     print("")
 
 

seleniumbase/fixtures/base_case.py

@@ -2549,6 +2549,12 @@ def __click_dropdown_link_text(self, link_text, link_css):
         source = self.get_page_source()
         soup = BeautifulSoup(source, "html.parser")
         drop_down_list = soup.select('[class*=dropdown]')
+        for item in soup.select('[class*=HeaderMenu]'):
+            drop_down_list.append(item)
+        for item in soup.select('[class*=menu-item]'):
+            drop_down_list.append(item)
+        for item in soup.select('[class*=chevron]'):
+            drop_down_list.append(item)
         csstype = link_css.split('[')[1].split('=')[0]
         for item in drop_down_list:
             if link_text in item.text.split('\n') and csstype in item.decode():
@@ -2563,7 +2569,7 @@ def __click_dropdown_link_text(self, link_text, link_css):
                     try:
                         page_actions.hover_element_and_click(
                             self.driver, dropdown, link_text,
-                            click_by=By.LINK_TEXT, timeout=0.1)
+                            click_by=By.LINK_TEXT, timeout=0.2)
                         return True
                     except Exception:
                         pass

seleniumbase/fixtures/page_actions.py

@@ -36,8 +36,7 @@
 
 def is_element_present(driver, selector, by=By.CSS_SELECTOR):
     """
-    Searches for the specified element by the given selector.  Returns whether
-    the element object if the element is present on the page.
+    Returns whether the specified element selector is present on the page.
     @Params
     driver - the webdriver object (required)
     selector - the locator that is used (required)
@@ -54,8 +53,7 @@ def is_element_present(driver, selector, by=By.CSS_SELECTOR):
 
 def is_element_visible(driver, selector, by=By.CSS_SELECTOR):
     """
-    Searches for the specified element by the given selector.  Returns whether
-    the element object if the element is present and visible on the page.
+    Returns whether the specified element selector is visible on the page.
     @Params
     driver - the webdriver object (required)
     selector - the locator that is used (required)
@@ -72,9 +70,7 @@ def is_element_visible(driver, selector, by=By.CSS_SELECTOR):
 
 def is_text_visible(driver, text, selector, by=By.CSS_SELECTOR):
     """
-    Searches for the specified element by the given selector. Returns whether
-    the element object if the element is present and visible on the page and
-    contains the given text.
+    Returns whether the specified text is visible in the specified selector.
     @Params
     driver - the webdriver object (required)
     text - the text string to search for

seleniumbase/utilities/selenium_ide/convert_ide.py

@@ -154,7 +154,10 @@ def main():
             selector = '#%s' % data.group(2).replace('#', '\\#')
             selector = selector.replace('[', '\\[').replace(']', '\\]')
             selector = selector.replace('.', '\\.')
-            command = '''%sself.click('%s')''' % (whitespace, selector)
+            raw = ""
+            if "\\[" in selector or "\\]" in selector or "\\." in selector:
+                raw = "r"
+            command = '''%sself.click(%s'%s')''' % (whitespace, raw, selector)
             seleniumbase_lines.append(command)
             continue
 
@@ -167,7 +170,10 @@ def main():
             selector = '#%s' % data.group(2).replace('#', '\\#')
             selector = selector.replace('[', '\\[').replace(']', '\\]')
             selector = selector.replace('.', '\\.')
-            command = '''%sself.submit('%s')''' % (whitespace, selector)
+            raw = ""
+            if "\\[" in selector or "\\]" in selector or "\\." in selector:
+                raw = "r"
+            command = '''%sself.submit(%s'%s')''' % (whitespace, raw, selector)
             seleniumbase_lines.append(command)
             continue
 
@@ -180,9 +186,12 @@ def main():
             selector = '#%s' % data.group(2).replace('#', '\\#')
             selector = selector.replace('[', '\\[').replace(']', '\\]')
             selector = selector.replace('.', '\\.')
+            raw = ""
+            if "\\[" in selector or "\\]" in selector or "\\." in selector:
+                raw = "r"
             text = data.group(3)
-            command = '''%sself.update_text('%s', '%s')''' % (
-                whitespace, selector, text)
+            command = '''%sself.update_text(%s'%s', '%s')''' % (
+                whitespace, raw, selector, text)
             seleniumbase_lines.append(command)
             continue
 
@@ -196,9 +205,12 @@ def main():
             selector = '#%s' % data.group(2).replace('#', '\\#')
             selector = selector.replace('[', '\\[').replace(']', '\\]')
             selector = selector.replace('.', '\\.')
+            raw = ""
+            if "\\[" in selector or "\\]" in selector or "\\." in selector:
+                raw = "r"
             key = 'Keys.%s' % data.group(3)
-            command = '''%sself.send_keys('%s', %s)''' % (
-                whitespace, selector, key)
+            command = '''%sself.send_keys(%s'%s', %s)''' % (
+                whitespace, raw, selector, key)
             seleniumbase_lines.append(command)
             continue
 
@@ -365,9 +377,12 @@ def main():
             selector = '#%s' % data.group(2).replace('#', '\\#')
             selector = selector.replace('[', '\\[').replace(']', '\\]')
             selector = selector.replace('.', '\\.')
+            raw = ""
+            if "\\[" in selector or "\\]" in selector or "\\." in selector:
+                raw = "r"
             visible_text = '%s' % data.group(3)
-            command = '''%sself.select_option_by_text('%s', '%s')''' % (
-                whitespace, selector, visible_text)
+            command = '''%sself.select_option_by_text(%s'%s', '%s')''' % (
+                whitespace, raw, selector, visible_text)
             if command.count('\\"') == command.count('"'):
                 command = command.replace('\\"', '"')
             seleniumbase_lines.append(command)

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.17.17',
+    version='1.17.18',
     description='Reliable Browser Automation & Testing Framework',
     long_description=long_description,
     long_description_content_type='text/markdown',