Merge pull request #1009 from seleniumbase/specify-executable-path-as-needed

Specify the driver executable_path as needed (and more)

Author: mdmintz

docs/requirements.txt

@@ -1,4 +1,4 @@
-regex>=2021.9.30
+regex>=2021.10.8
 tqdm>=4.62.3
 livereload==2.6.3;python_version>="3.6"
 joblib==1.1.0;python_version>="3.6"
@@ -10,7 +10,7 @@ python-dateutil==2.8.2
 keyring==23.2.1;python_version>="3.6"
 pkginfo==1.7.1;python_version>="3.6"
 Jinja2==3.0.2;python_version>="3.6"
-click==8.0.1;python_version>="3.6"
+click==8.0.2;python_version>="3.6"
 zipp==3.6.0;python_version>="3.6"
 readme-renderer==30.0
 pymdown-extensions==9.0;python_version>="3.6"

examples/test_demo_site.py

@@ -22,9 +22,10 @@ def test_demo_site(self):
         # Verify that a hover dropdown link changes page text
         self.assert_text("Automation Practice", "h3")
         try:
-            self.hover_and_click("#myDropdown", "#dropOption2")
+            self.hover_and_click(
+                "#myDropdown", "#dropOption2", timeout=2)
         except Exception:
-            # If the user moves the mouse while the test runs
+            # If a human moves the mouse while the test runs
             self.js_click("#dropOption2")
         self.assert_text("Link Two Selected", "h3")
 
@@ -107,6 +108,11 @@ def test_demo_site(self):
         # Highlight a page element (Also asserts visibility)
         self.highlight("h2")
 
+        # Actions with Demo Mode enabled
+        self.demo_mode = True
+        self.type("input", "Have a Nice Day!")
+        self.assert_text("SeleniumBase", "h2")
+
         # Assert no broken links (Can be slow if many links)
         # self.assert_no_404_errors()
 

help_docs/install_python_pip_git.md

@@ -24,33 +24,40 @@ pip install -U setuptools
 If that didn't work, here are some more commands you can try:
 
 On macOS / Windows / Linux, run the following command:
+
 ```bash
 python -m ensurepip --default-pip
 ```
 
 If your existing version of pip is old, upgrade to the latest version:
+
 ```bash
 python -m pip install --upgrade pip setuptools
 ```
 
 On CentOS 7 and some versions of Linux, you may need to install pip with ``yum``:
+
 ```bash
 yum -y update
 yum -y install python-pip
 ```
 
-If you're having any trouble getting pip, you can [GET PIP HERE](https://pip.pypa.io/en/latest/installing/).
+If you're having any trouble getting pip, you can [GET PIP HERE](https://pip.pypa.io/en/latest/installation/).
 
 When done, make sure the location of pip is on your path, which is ``$PATH`` for macOS/Linux. (On Windows, it's the System Variables ``Path`` within System Environment Variables.)
 
 You can also get pip (or fix pip) by using:
+
 ```bash
 curl https://bootstrap.pypa.io/get-pip.py | python
 ```
+
 * (If you get SSL errors while trying to install packages with pip, see [this Stackoverflow post](https://stackoverflow.com/questions/49768770/not-able-to-install-python-packages-ssl-tlsv1-alert-protocol-version), which tells you to run the above command.)
 
 **Keep Pip and Setuptools up-to-date:**
-```
+
+```bash
 python -m pip install -U pip setuptools
 ```
+
 * (Depending on your user permissions, you may need to add ``--user`` to the command if you're not inside a [Python virtual environment](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/virtualenv_instructions.md), or use "[sudo](https://en.wikipedia.org/wiki/Sudo)" on a UNIX-based OS if you're getting errors during installation.)

requirements.txt

@@ -13,7 +13,7 @@ wheel>=0.37.0
 attrs>=21.2.0
 PyYAML>=5.4.1;python_version>="3.6"
 sortedcontainers==2.4.0
-certifi>=2021.5.30
+certifi>=2021.10.8
 six==1.16.0
 nose==1.3.7
 ipdb==0.13.4;python_version<"3.5"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "1.66.10"
+__version__ = "1.66.11"

seleniumbase/console_scripts/ReadMe.md

@@ -86,7 +86,6 @@ test frameworks.
 
 ```bash
 ui_tests/
-│
 ├── __init__.py
 ├── my_first_test.py
 ├── parameterized_test.py
@@ -95,15 +94,13 @@ ui_tests/
 ├── setup.cfg
 ├── test_demo_site.py
 └── boilerplates/
-    │
     ├── __init__.py
     ├── base_test_case.py
     ├── boilerplate_test.py
     ├── classic_obj_test.py
     ├── page_objects.py
     ├── sb_fixture_test.py
     └── samples/
-        │
         ├── __init__.py
         ├── google_objects.py
         ├── google_test.py
@@ -115,7 +112,6 @@ If running with the ``-b`` or ``--basic`` option:
 
 ```bash
 ui_tests/
-│
 ├── __init__.py
 ├── pytest.ini
 ├── requirements.txt

seleniumbase/console_scripts/sb_mkchart.py

@@ -263,6 +263,7 @@ def main():
     file = codecs.open(file_path, "w+", "utf-8")
     file.writelines("\r\n".join(data))
     file.close()
+    os.system("sbase print %s -n" % file_name)
     success = (
         "\n" + c1 + '* Chart Presentation: "' + file_name + '" was created! *'
         "" + cr + "\n"

seleniumbase/console_scripts/sb_mkdir.py

@@ -291,6 +291,18 @@ def main():
     file.close()
 
     if basic:
+        data = []
+        data.append("  %s/" % dir_name)
+        data.append("  ├── __init__.py")
+        data.append("  ├── pytest.ini")
+        data.append("  ├── requirements.txt")
+        data.append("  └── setup.cfg")
+        file_path = "%s/%s" % (dir_name, "outline.txt")
+        file = codecs.open(file_path, "w+", "utf-8")
+        file.writelines("\r\n".join(data))
+        file.close()
+        os.system("sbase print %s -n" % file_path)
+        os.remove(file_path)
         success = (
             "\n" + c1 + '* Directory "' + dir_name + '" was created '
             "with config files! *" + cr + "\n"
@@ -337,7 +349,12 @@ def main():
     data.append('        self.type("textarea.area1", "Testing Time!\\n")')
     data.append('        self.type(\'[name="preText2"]\', "Typing Text!")')
     data.append('        self.assert_text("Automation Practice", "h3")')
-    data.append('        self.hover_and_click("#myDropdown", "#dropOption2")')
+    data.append("        try:")
+    data.append("            self.hover_and_click(")
+    data.append('                "#myDropdown", "#dropOption2", timeout=2)')
+    data.append("        except Exception:")
+    data.append("            # If a human moves the mouse while the test runs")
+    data.append('            self.js_click("#dropOption2")')
     data.append('        self.assert_text("Link Two Selected", "h3")')
     data.append('        self.assert_text("This Text is Green", "#pText")')
     data.append('        self.click("#myButton")')
@@ -393,6 +410,9 @@ def main():
     data.append('        self.click_link("SeleniumBase Demo Page")')
     data.append('        self.assert_exact_text("Demo Page", "h1")')
     data.append('        self.highlight("h2")')
+    data.append("        self.demo_mode = True")
+    data.append('        self.type("input", "Have a Nice Day!")')
+    data.append('        self.assert_text("SeleniumBase", "h2")')
     data.append("")
     file_path = "%s/%s" % (dir_name, "test_demo_site.py")
     file = codecs.open(file_path, "w+", "utf-8")
@@ -649,6 +669,35 @@ def main():
     file.writelines("\r\n".join(data))
     file.close()
 
+    data = []
+    data.append("  %s/" % dir_name)
+    data.append("  ├── __init__.py")
+    data.append("  ├── my_first_test.py")
+    data.append("  ├── parameterized_test.py")
+    data.append("  ├── pytest.ini")
+    data.append("  ├── requirements.txt")
+    data.append("  ├── setup.cfg")
+    data.append("  ├── test_demo_site.py")
+    data.append("  └── boilerplates/")
+    data.append("      ├── __init__.py")
+    data.append("      ├── base_test_case.py")
+    data.append("      ├── boilerplate_test.py")
+    data.append("      ├── classic_obj_test.py")
+    data.append("      ├── page_objects.py")
+    data.append("      ├── sb_fixture_test.py")
+    data.append("      └── samples/")
+    data.append("          ├── __init__.py")
+    data.append("          ├── google_objects.py")
+    data.append("          ├── google_test.py")
+    data.append("          ├── sb_swag_test.py")
+    data.append("          └── swag_labs_test.py")
+    file_path = "%s/%s" % (dir_name, "outline.txt")
+    file = codecs.open(file_path, "w+", "utf-8")
+    file.writelines("\r\n".join(data))
+    file.close()
+    os.system("sbase print %s -n" % file_path)
+    os.remove(file_path)
+
     success = (
         "\n" + c1 + '* Directory "' + dir_name + '" was created '
         "with config files and sample tests! *" + cr + "\n"

seleniumbase/console_scripts/sb_mkpres.py

@@ -282,6 +282,7 @@ def main():
     file = codecs.open(file_path, "w+", "utf-8")
     file.writelines("\r\n".join(data))
     file.close()
+    os.system("sbase print %s -n" % file_name)
     success = (
         "\n" + c1 + '* Presentation: "' + file_name + '" was created! *'
         "" + cr + "\n"

seleniumbase/core/browser_launcher.py

@@ -1129,7 +1129,13 @@ def get_local_driver(
                 capabilities=firefox_capabilities, options=firefox_options
             )
         else:
-            return webdriver.Firefox(options=firefox_options)
+            if os.path.exists(LOCAL_GECKODRIVER):
+                return webdriver.Firefox(
+                    executable_path=LOCAL_GECKODRIVER,
+                    options=firefox_options,
+                )
+            else:
+                return webdriver.Firefox(options=firefox_options)
     elif browser_name == constants.Browser.INTERNET_EXPLORER:
         if not IS_WINDOWS:
             raise Exception(
@@ -1534,7 +1540,13 @@ def get_local_driver(
                             sys.argv = sys_args  # Put back original sys args
             if not headless or "linux" not in PLATFORM:
                 try:
-                    driver = webdriver.Chrome(options=chrome_options)
+                    if os.path.exists(LOCAL_CHROMEDRIVER):
+                        driver = webdriver.Chrome(
+                            executable_path=LOCAL_CHROMEDRIVER,
+                            options=chrome_options,
+                        )
+                    else:
+                        driver = webdriver.Chrome(options=chrome_options)
                 except Exception as e:
                     auto_upgrade_chromedriver = False
                     if "This version of ChromeDriver only supports" in e.msg:
@@ -1599,7 +1611,13 @@ def get_local_driver(
                                 chrome_options, headless_options
                             )
                         _mark_chromedriver_repaired()
-                    driver = webdriver.Chrome(options=chrome_options)
+                    if os.path.exists(LOCAL_CHROMEDRIVER):
+                        driver = webdriver.Chrome(
+                            executable_path=LOCAL_CHROMEDRIVER,
+                            options=chrome_options,
+                        )
+                    else:
+                        driver = webdriver.Chrome(options=chrome_options)
                 return driver
             else:  # Running headless on Linux
                 try: