Merge pull request #249 from seleniumbase/converter-tool-upgrade

Update the Selenium IDE script converter tool

Author: mdmintz

README.md

@@ -1,6 +1,6 @@
 [<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_2h2.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
 
-[<img src="https://img.shields.io/pypi/v/seleniumbase.svg" alt="Version" />](https://pypi.python.org/pypi/seleniumbase) [<img src="https://img.shields.io/badge/python-2.7,_3.*-22AADD.svg" alt="Python versions" />](https://pypi.python.org/pypi/seleniumbase) [<img src="https://travis-ci.org/seleniumbase/SeleniumBase.svg?branch=master" alt="Build Status" />](https://travis-ci.org/seleniumbase/SeleniumBase) [<img src="https://badges.gitter.im/seleniumbase/SeleniumBase.svg" alt="Join the Gitter Chat" />](https://gitter.im/seleniumbase/SeleniumBase) [<img src="http://img.shields.io/badge/license-MIT-22BBCC.svg" alt="MIT License" />](https://github.com/seleniumbase/SeleniumBase/blob/master/LICENSE) [<img src="https://img.shields.io/github/stars/seleniumbase/seleniumbase.svg" alt="GitHub Stars" />](https://github.com/seleniumbase/SeleniumBase/stargazers)<br />
+[<img src="https://img.shields.io/pypi/v/seleniumbase.svg" alt="Version" />](https://pypi.python.org/pypi/seleniumbase) [<img src="https://img.shields.io/badge/python-2.7,_3.x-22AADD.svg" alt="Python versions" />](https://pypi.python.org/pypi/seleniumbase) [<img src="https://travis-ci.org/seleniumbase/SeleniumBase.svg?branch=master" alt="Build Status" />](https://travis-ci.org/seleniumbase/SeleniumBase) [<img src="https://badges.gitter.im/seleniumbase/SeleniumBase.svg" alt="Join the Gitter Chat" />](https://gitter.im/seleniumbase/SeleniumBase) [<img src="http://img.shields.io/badge/license-MIT-22BBCC.svg" alt="MIT License" />](https://github.com/seleniumbase/SeleniumBase/blob/master/LICENSE) [<img src="https://img.shields.io/github/stars/seleniumbase/seleniumbase.svg" alt="GitHub Stars" />](https://github.com/seleniumbase/SeleniumBase/stargazers)<br />
 
 A complete framework for web automation, end-to-end testing, and [user-onboarding](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/tour_examples/ReadMe.md). SeleniumBase uses [Pytest](https://github.com/pytest-dev/pytest) for running Python scripts, while using [WebDriver](https://www.seleniumhq.org/) for controlling web browsers.
 
@@ -382,7 +382,7 @@ pytest [YOUR_TEST_FILE].py --browser=chrome --with-db_reporting --with-s3_loggin
 
 When the testing_base plugin is used, if there's a test failure, the basic_test_info plugin records test logs, the page_source plugin records the page source of the last web page seen by the test, and the screen_shots plugin records the image of the last page seen by the test where the failure occurred. Make sure you always include testing_base whenever you include a plugin that logs test data. The db_reporting plugin records the status of all tests run into your MySQL DB. The s3_logging plugin uploads basic test info, screenshots, and page source into your S3 storage folder.
 
-To simplify that long run command, you can create a *.cfg file, such as the one provided in the example, and enter your plugins there so that you can run everything by typing:
+To simplify that long run command, you can create a ``*.cfg`` file, such as the one provided in the example, and enter your plugins there so that you can run everything by typing:
 
 ```
 nosetests [YOUR_TEST_FILE].py --config=[MY_CONFIG_FILE].cfg

examples/capabilities/ReadMe.md

@@ -40,4 +40,4 @@ A regex parser was built into SeleniumBase to capture all lines from the specifi
 ``caps['KEY'] = "VALUE"``
 (Each pair must be on a separate line. You can interchange single and double quotes.)
 
-You can also swap ``--browser=remote`` with an actual browser, eg ``--browser=chrome``, which will combine the default SeleniumBase desired capabilities with those that were specified in the capabilities file when using ``--cap_file=FILE.py``. Capabilities will override other parameters, so if you set the browser to one thing and the capabilities browser to another, SeleniumBase will use the capabilities browser as the browser. You'll need default SeleniumBase desired capabilities when using a proxy server (not the same as a Selenium Grid server), when downloading files to a desired folder, for disabling some warnings on Chrome, for overriding a website's Content Security Policy on Firefox, and for other reasons.
+You can also swap ``--browser=remote`` with an actual browser, eg ``--browser=chrome``, which will combine the default SeleniumBase desired capabilities with those that were specified in the capabilities file when using ``--cap_file=FILE.py``. Capabilities will override other parameters, so if you set the browser to one thing and the capabilities browser to another, SeleniumBase will use the capabilities browser as the browser. You'll need default SeleniumBase desired capabilities when using a proxy server (not the same as a Selenium Grid server), when downloading files to a desired folder, for disabling some warnings on Chrome, for overriding a website's Content Security Policy on Firefox, and for other reasons.

help_docs/install_python_pip_git.md

@@ -1,6 +1,6 @@
 ## Installation instructions for Python, pip, brew, git, virtualenv, and virtualenvwrapper
 
-### [Python 2.7 or 3.*](https://www.python.org/downloads/)
+### [Python 2.7 or 3.x](https://www.python.org/downloads/)
 
 If you're a MAC user, Python should already come preinstalled on your machine. You can use both Python 2.7 or Python 3.6+ with SeleniumBase. If you're on a MAC and have [Homebrew](https://brew.sh/) installed, you can use: ``brew install python3`` to install Python 3. Or you can just get everything from [https://www.python.org/downloads/](https://www.python.org/downloads/).
 

help_docs/mysql_installation.md

@@ -57,4 +57,4 @@ If you're having trouble with Windows mysql-python installation using pip, you c
 
 * Run the command ``pip install FILENAME.whl``
 
-* If pip.exe is not recognized, you may find it in the "Scripts" directory from where python has been installed.
+* If pip.exe is not recognized, you may find it in the "Scripts" directory from where python has been installed.

requirements.txt

@@ -1,6 +1,5 @@
 pip
 setuptools
-ipython
 six
 nose
 ipdb
@@ -9,7 +8,7 @@ unittest2
 selenium==3.141.0
 requests==2.20.1
 urllib3==1.24.1
-pytest>=4.0.0
+pytest>=4.0.1
 pytest-cov>=2.6.0
 pytest-html>=1.19.0
 pytest-rerunfailures>=5.0

seleniumbase/console_scripts/ReadMe.md

@@ -43,8 +43,8 @@ test frameworks.
 ``seleniumbase convert [PYTHON_WEBDRIVER_UNITTEST_FILE]``
 
 * Output:
-Converts a Selenium IDE exported WebDriver unittest
-file into a SeleniumBase file. Adds _SB to the new
+Converts a Selenium IDE exported WebDriver unittest file
+into a SeleniumBase file. Adds ``_SB`` to the new
 file name while keeping the original file intact.
 Works with Katalon Recorder scripts.
 See: http://www.katalon.com/automation-recorder

seleniumbase/utilities/selenium_ide/convert_ide.py

@@ -151,8 +151,9 @@ def main():
             r'''\.click\(\)\s*$''', line)
         if data:
             whitespace = data.group(1)
-            selector = '#%s' % data.group(2)
+            selector = '#%s' % data.group(2).replace('#', '\\#')
             selector = selector.replace('[', '\\[').replace(']', '\\]')
+            selector = selector.replace('.', '\\.')
             command = '''%sself.click('%s')''' % (whitespace, selector)
             seleniumbase_lines.append(command)
             continue
@@ -163,8 +164,9 @@ def main():
             r'''\.send_keys\(\"([\S\s]+)\"\)\s*$''', line)
         if data:
             whitespace = data.group(1)
-            selector = '#%s' % data.group(2)
+            selector = '#%s' % data.group(2).replace('#', '\\#')
             selector = selector.replace('[', '\\[').replace(']', '\\]')
+            selector = selector.replace('.', '\\.')
             text = data.group(3)
             command = '''%sself.update_text('%s', '%s')''' % (
                 whitespace, selector, text)
@@ -178,8 +180,9 @@ def main():
         if data:
             uses_keys = True
             whitespace = data.group(1)
-            selector = '#%s' % data.group(2)
+            selector = '#%s' % data.group(2).replace('#', '\\#')
             selector = selector.replace('[', '\\[').replace(']', '\\]')
+            selector = selector.replace('.', '\\.')
             key = 'Keys.%s' % data.group(3)
             command = '''%sself.send_keys('%s', %s)''' % (
                 whitespace, selector, key)
@@ -308,7 +311,7 @@ def main():
             whitespace = data.group(1)
             selector = '%s' % data.group(2)
             visible_text = '%s' % data.group(3)
-            command = '''%sself.pick_select_option_by_text('%s', '%s')''' % (
+            command = '''%sself.select_option_by_text('%s', '%s')''' % (
                 whitespace, selector, visible_text)
             if command.count('\\"') == command.count('"'):
                 command = command.replace('\\"', '"')
@@ -322,9 +325,11 @@ def main():
             r'''\"([\S\s]+)\"\)\s*$''', line)
         if data:
             whitespace = data.group(1)
-            selector = '#%s' % data.group(2)
+            selector = '#%s' % data.group(2).replace('#', '\\#')
+            selector = selector.replace('[', '\\[').replace(']', '\\]')
+            selector = selector.replace('.', '\\.')
             visible_text = '%s' % data.group(3)
-            command = '''%sself.pick_select_option_by_text('%s', '%s')''' % (
+            command = '''%sself.select_option_by_text('%s', '%s')''' % (
                 whitespace, selector, visible_text)
             if command.count('\\"') == command.count('"'):
                 command = command.replace('\\"', '"')
@@ -340,7 +345,7 @@ def main():
             whitespace = data.group(1)
             selector = '%s' % data.group(2)
             visible_text = '%s' % data.group(3)
-            command = '''%sself.pick_select_option_by_text("%s", '%s')''' % (
+            command = '''%sself.select_option_by_text("%s", '%s')''' % (
                 whitespace, selector, visible_text)
             if command.count('\\"') == command.count('"'):
                 command = command.replace('\\"', '"')
@@ -356,7 +361,7 @@ def main():
             whitespace = data.group(1)
             selector = '[name="%s"]' % data.group(2)
             visible_text = '%s' % data.group(3)
-            command = '''%sself.pick_select_option_by_text('%s', '%s')''' % (
+            command = '''%sself.select_option_by_text('%s', '%s')''' % (
                 whitespace, selector, visible_text)
             if command.count('\\"') == command.count('"'):
                 command = command.replace('\\"', '"')

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.17.6',
+    version='1.17.7',
     description='All-in-One Test Automation Framework',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -53,7 +53,6 @@
     install_requires=[
         'pip',
         'setuptools',
-        'ipython',
         'six',
         'nose',
         'ipdb',
@@ -62,7 +61,7 @@
         'selenium==3.141.0',
         'requests==2.20.1',  # Changing this may effect "urllib3"
         'urllib3==1.24.1',  # Keep this lib in sync with "requests"
-        'pytest>=4.0.0',
+        'pytest>=4.0.1',
         'pytest-cov>=2.6.0',
         'pytest-html>=1.19.0',
         'pytest-rerunfailures>=5.0',