Merge pull request #1250 from seleniumbase/several-small-updates

Several small updates

Author: mdmintz

.gitignore

@@ -72,6 +72,7 @@ geckodriver
 msedgedriver
 operadriver
 MicrosoftWebDriver.exe
+headless_ie_selenium.exe
 IEDriverServer.exe
 chromedriver.exe
 geckodriver.exe

examples/test_login.py

@@ -13,4 +13,4 @@ def test_swag_labs_login(self):
         """ This test checks standard login for the Swag Labs store. """
         self.login_to_swag_labs()
         self.assert_element("#inventory_container")
-        self.assert_element('div:contains("Sauce Labs Backpack")')
+        self.assert_element('.inventory_item:contains("Sauce Labs Backpack")')

examples/test_swag_labs.py

@@ -11,7 +11,7 @@ def login_to_swag_labs(self, username="standard_user"):
         self.type("#password", "secret_sauce")
         self.click('input[type="submit"]')
         self.assert_element("#inventory_container")
-        self.assert_element('div:contains("Sauce Labs Backpack")')
+        self.assert_element('.inventory_item:contains("Sauce Labs Backpack")')
 
     def test_swag_labs_basic_flow(self):
         """ This test checks functional flow of the Swag Labs store. """

examples/xpath_test.py

@@ -4,7 +4,7 @@
 class XPathTests(BaseCase):
     def test_xpath(self):
         self.open("https://seleniumbase.io/demo_page")
-        self.assert_element("/html/body/form/table/tbody/tr[1]/td[1]/h1")
+        self.assert_element('//h1[(text()="Demo Page")]')
         self.type('//*[@id="myTextInput"]', "XPath Test!")
-        self.click("/html/body/form/table/tbody/tr[3]/td[4]/button")
+        self.click('//button[starts-with(text(),"Click Me")]')
         self.assert_text("SeleniumBase", '//table/tbody/tr[1]/td[2]/h2')

help_docs/recorder_mode.md

@@ -7,9 +7,7 @@
 
 <img src="https://seleniumbase.io/cdn/img/sb_recorder_notification.png" title="SeleniumBase" width="380">
 
-(For the latest Recorder improvements, use SeleniumBase version ``2.3.2`` or newer.)
-
-🔴 To make a new recording with Recorder Mode, you can use ``sbase mkrec`` or ``sbase codegen``):
+🔴 To make a new recording with Recorder Mode, you can use ``sbase mkrec``, ``sbase codegen``, or ``sbase record``):
 
 ```bash
 sbase mkrec TEST_NAME.py --url=URL

mkdocs_build/requirements.txt

@@ -1,29 +1,31 @@
-regex>=2022.1.18
+# mkdocs dependencies for generating the seleniumbase.io website
+# Minimum Python version: 3.7
+
+regex>=2022.3.15
 tqdm>=4.63.0
 docutils==0.18.1
 python-dateutil==2.8.2
-livereload==2.6.3;python_version>="3.6"
-joblib==1.1.0;python_version>="3.6"
-Markdown==3.2.2;python_version>="3.6" and python_version<"3.7"
-Markdown==3.3.6;python_version>="3.7"
-MarkupSafe==2.1.0;python_version>="3.6"
-pyparsing==3.0.7;python_version>="3.6"
-keyring==23.5.0;python_version>="3.7"
-pkginfo==1.8.2;python_version>="3.6"
-Jinja2==3.0.3;python_version>="3.6"
-click==8.0.4;python_version>="3.6"
-zipp==3.7.0;python_version>="3.7"
+livereload==2.6.3
+joblib==1.1.0
+Markdown==3.3.6
+MarkupSafe==2.1.1
+pyparsing==3.0.7
+keyring==23.5.0
+pkginfo==1.8.2
+Jinja2==3.0.3
+click==8.0.4
+zipp==3.7.0
 readme-renderer==34.0
-pymdown-extensions==9.2;python_version>="3.7"
-importlib-metadata==4.11.2;python_version>="3.7"
+pymdown-extensions==9.2
+importlib-metadata==4.11.3
 bleach==4.1.0
-jsmin==3.0.1;python_version>="3.6"
-lunr==0.6.2;python_version>="3.6"
-nltk==3.7;python_version>="3.6"
-watchdog==2.1.6;python_version>="3.6"
-mkdocs==1.2.3;python_version>="3.6"
-mkdocs-material==8.2.5;python_version>="3.6"
-mkdocs-exclude-search==0.6.4;python_version>="3.6"
+jsmin==3.0.1
+lunr==0.6.2
+nltk==3.7
+watchdog==2.1.6
+mkdocs==1.2.3
+mkdocs-material==8.2.5
+mkdocs-exclude-search==0.6.4
 mkdocs-simple-hooks==0.1.5
-mkdocs-material-extensions==1.0.3;python_version>="3.6"
+mkdocs-material-extensions==1.0.3
 mkdocs-minify-plugin==0.5.0

requirements.txt

@@ -63,7 +63,8 @@ py==1.8.1;python_version<"3.5"
 py==1.11.0;python_version>="3.5"
 pytest==4.6.11;python_version<"3.5"
 pytest==6.1.2;python_version>="3.5" and python_version<"3.6"
-pytest==7.0.1;python_version>="3.6"
+pytest==7.0.1;python_version>="3.6" and python_version<"3.7"
+pytest==7.1.0;python_version>="3.7"
 pytest-forked==1.3.0;python_version<"3.6"
 pytest-forked==1.4.0;python_version>="3.6"
 pytest-html==1.22.1;python_version<"3.6"
@@ -86,7 +87,7 @@ beautifulsoup4==4.9.3;python_version<"3.5"
 beautifulsoup4==4.10.0;python_version>="3.5"
 cryptography==2.9.2;python_version<"3.5"
 cryptography==3.2.1;python_version>="3.5" and python_version<"3.6"
-cryptography==36.0.1;python_version>="3.6"
+cryptography==36.0.2;python_version>="3.6"
 pygments==2.5.2;python_version<"3.5"
 pygments==2.11.2;python_version>="3.5"
 prompt-toolkit==1.0.18;python_version<"3.5"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "2.4.19"
+__version__ = "2.4.20"

seleniumbase/console_scripts/ReadMe.md

@@ -20,7 +20,8 @@ COMMANDS:
       mkdir            [DIRECTORY] [OPTIONS]
       mkfile           [FILE.py] [OPTIONS]
       mkrec / codegen  [FILE.py] [OPTIONS]
-      recorder         (Open Recorder Desktop App)
+      recorder         (Open Recorder Desktop App.)
+      record           (If args: mkrec. Else: App.)
       mkpres           [FILE.py] [LANG]
       mkchart          [FILE.py] [LANG]
       print            [FILE] [OPTIONS]
@@ -53,13 +54,13 @@ COMMANDS:
 sbase install chromedriver
 sbase install geckodriver
 sbase install edgedriver
-sbase install chromedriver 96
-sbase install chromedriver 96.0.4664.45
+sbase install chromedriver 99
+sbase install chromedriver 99.0.4844.51
 sbase install chromedriver latest
 sbase install chromedriver latest-1  # (Latest minus one)
 sbase install chromedriver -p
 sbase install chromedriver latest -p
-sbase install edgedriver 96.0.1054.62
+sbase install edgedriver 99.0.1150.39
 ```
 
 (Drivers:  ``chromedriver``, ``geckodriver``, ``edgedriver``,
@@ -223,7 +224,7 @@ methods, which are "open", "type", "click",
 basic boilerplate option, only the "open" method
 is included.
 
-<h3>mkrec / codegen</h3>
+<h3>mkrec / record / codegen</h3>
 
 * Usage:
 ``sbase mkrec [FILE.py] [OPTIONS]``
@@ -239,6 +240,7 @@ is included.
 ``--url=URL``  (Sets the initial start page URL.)
 ``--edge``  (Use Edge browser instead of Chrome.)
 ``--gui`` / ``--headed``  (Use headed mode on Linux.)
+``--overwrite``  (Overwrite file when it exists.)
 
 * Output:
 Creates a new SeleniumBase test using the Recorder.

seleniumbase/console_scripts/run.py

@@ -15,6 +15,8 @@
 sbase mkrec new_test.py --url=wikipedia.org
 sbase codegen new_test.py --url=wikipedia.org
 sbase recorder
+sbase record new_test.py
+sbase record
 sbase mkpres new_presentation.py
 sbase mkchart new_chart.py
 sbase convert webdriver_unittest_file.py
@@ -79,7 +81,8 @@ def show_basic_usage():
     sc += "      mkdir            [DIRECTORY] [OPTIONS]\n"
     sc += "      mkfile           [FILE.py] [OPTIONS]\n"
     sc += "      mkrec / codegen  [FILE.py] [OPTIONS]\n"
-    sc += "      recorder         (Open Recorder Desktop App)\n"
+    sc += "      recorder         (Open Recorder Desktop App.)\n"
+    sc += "      record           (If args: mkrec. Else: App.)\n"
     sc += "      mkpres           [FILE.py] [LANG]\n"
     sc += "      mkchart          [FILE.py] [LANG]\n"
     sc += "      print            [FILE] [OPTIONS]\n"
@@ -126,13 +129,13 @@ def show_install_usage():
     print("           sbase install chromedriver")
     print("           sbase install geckodriver")
     print("           sbase install edgedriver")
-    print("           sbase install chromedriver 96")
-    print("           sbase install chromedriver 96.0.4664.45")
+    print("           sbase install chromedriver 99")
+    print("           sbase install chromedriver 99.0.4844.51")
     print("           sbase install chromedriver latest")
     print("           sbase install chromedriver latest-1")
     print("           sbase install chromedriver -p")
     print("           sbase install chromedriver latest -p")
-    print("           sbase install edgedriver 96.0.1054.62")
+    print("           sbase install edgedriver 99.0.1150.39")
     print("  Output:")
     print("           Installs the chosen webdriver to seleniumbase/drivers/")
     print("           (chromedriver is required for Chrome automation)")
@@ -216,6 +219,7 @@ def show_mkrec_usage():
     print("           --url=URL  (Sets the initial start page URL.)")
     print("           --edge  (Use Edge browser instead of Chrome.)")
     print("           --gui / --headed  (Use headed mode on Linux.)")
+    print("           --overwrite  (Overwrite file when it exists.)")
     print("  Output:")
     print("           Creates a new SeleniumBase test using the Recorder.")
     print("           If the filename already exists, an error is raised.")
@@ -239,6 +243,7 @@ def show_codegen_usage():
     print("           --url=URL  (Sets the initial start page URL.)")
     print("           --edge  (Use Edge browser instead of Chrome.)")
     print("           --gui / --headed  (Use headed mode on Linux.)")
+    print("           --overwrite  (Overwrite file when it exists.)")
     print("  Output:")
     print("           Creates a new SeleniumBase test using the Recorder.")
     print("           If the filename already exists, an error is raised.")
@@ -774,10 +779,28 @@ def main():
         else:
             show_basic_usage()
             show_install_usage()
-    elif command == "recorder":
+    elif (
+        command == "recorder"
+        or (command == "record" and len(command_args) == 0)
+    ):
         from seleniumbase.console_scripts import sb_recorder
 
         sb_recorder.main()
+    elif (
+        command == "mkrec"
+        or command == "codegen"
+        or (command == "record" and len(command_args) >= 1)
+    ):
+        if len(command_args) >= 1:
+            from seleniumbase.console_scripts import sb_mkrec
+
+            sb_mkrec.main()
+        else:
+            show_basic_usage()
+            if command == "codegen":
+                show_codegen_usage()
+            else:
+                show_mkrec_usage()
     elif command == "mkdir":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_mkdir
@@ -794,22 +817,6 @@ def main():
         else:
             show_basic_usage()
             show_mkfile_usage()
-    elif command == "mkrec":
-        if len(command_args) >= 1:
-            from seleniumbase.console_scripts import sb_mkrec
-
-            sb_mkrec.main()
-        else:
-            show_basic_usage()
-            show_mkrec_usage()
-    elif command == "codegen":
-        if len(command_args) >= 1:
-            from seleniumbase.console_scripts import sb_mkrec
-
-            sb_mkrec.main()
-        else:
-            show_basic_usage()
-            show_codegen_usage()
     elif command == "mkpres":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_mkpres