Update console scripts

Author: mdmintz

seleniumbase/console_scripts/sb_mkdir.py

@@ -453,23 +453,33 @@ def main():
     data.append("BaseCase.main(__name__, __file__)")
     data.append("")
     data.append("")
-    data.append("class GoogleTests(BaseCase):")
+    data.append("class SearchTests(BaseCase):")
     data.append("    @parameterized.expand(")
     data.append("        [")
-    data.append('            ["Download Python", "Download Python"],')
-    data.append('            ["wikipedia", "www.wikipedia.org"],')
-    data.append('            ["SeleniumBase.io Docs", "SeleniumBase"],')
+    data.append(
+        "            "
+        '["SeleniumBase Commander", "Commander", "GUI / Commander"],'
+    )
+    data.append(
+        '            ["SeleniumBase Recorder", "Recorder", "Recorder Mode"],'
+    )
+    data.append(
+        '            ["SeleniumBase Syntax", "Syntax", "Syntax Formats"],'
+    )
     data.append("        ]")
     data.append("    )")
     data.append(
-        "    def test_parameterized_google_search("
-        "self, search_term, expected_text):"
+        "    def test_parameterized_search("
+        "self, search_term, keyword, title_text):"
+    )
+    data.append(
+        '        self.open("https://seleniumbase.io/help_docs/how_it_works/")'
     )
-    data.append('        self.open("https://google.com/ncr")')
     data.append(
-        '        self.type(\'input[title="Search"]\', search_term + "\\n")'
+        '        self.type(\'input[aria-label="Search"]\', search_term)'
     )
-    data.append('        self.assert_text(expected_text, "#search")')
+    data.append('        self.click(\'mark:contains("%s")\' % keyword)')
+    data.append('        self.assert_title_contains(title_text)')
     data.append("")
     file_path = "%s/%s" % (dir_name, "parameterized_test.py")
     file = codecs.open(file_path, "w+", "utf-8")

seleniumbase/console_scripts/sb_mkrec.py

@@ -35,6 +35,11 @@
 import os
 import sys
 
+PLATFORM = sys.platform
+IS_WINDOWS = False
+if "win32" in PLATFORM or "win64" in PLATFORM or "x64" in PLATFORM:
+    IS_WINDOWS = True
+
 
 def invalid_run_command(msg=None):
     exp = "  ** mkrec / record / codegen **\n\n"
@@ -195,19 +200,24 @@ def main():
         run_cmd += " --uc"
     if rec_behave:
         run_cmd += " --rec-behave"
+    if IS_WINDOWS:
+        run_cmd = "python.exe -m %s" % run_cmd
     print(run_cmd)
     os.system(run_cmd)
     if os.path.exists(file_path):
         os.remove(file_path)
     recorded_filename = file_name[:-3] + "_rec.py"
     recordings_dir = os.path.join(dir_name, "recordings")
     recorded_file = os.path.join(recordings_dir, recorded_filename)
+    prefix = ""
+    if IS_WINDOWS:
+        prefix = "python.exe -m "
     if " " not in recorded_file:
-        os.system("sbase print %s -n" % recorded_file)
+        os.system("%sseleniumbase print %s -n" % (prefix, recorded_file))
     elif '"' not in recorded_file:
-        os.system('sbase print "%s" -n' % recorded_file)
+        os.system('%sseleniumbase print "%s" -n' % (prefix, recorded_file))
     else:
-        os.system("sbase print '%s' -n" % recorded_file)
+        os.system("%sseleniumbase print '%s' -n" % (prefix, recorded_file))
     shutil.copy(recorded_file, file_path)
     success = (
         "\n" + c2 + "***" + cr + " RECORDING COPIED to: "
@@ -220,11 +230,11 @@ def main():
         features_dir = os.path.join(recordings_dir, "features")
         recorded_file = os.path.join(features_dir, recorded_filename)
         if " " not in recorded_file:
-            os.system("sbase print %s -n" % recorded_file)
+            os.system("%sseleniumbase print %s -n" % (prefix, recorded_file))
         elif '"' not in recorded_file:
-            os.system('sbase print "%s" -n' % recorded_file)
+            os.system('%sseleniumbase print "%s" -n' % (prefix, recorded_file))
         else:
-            os.system("sbase print '%s' -n" % recorded_file)
+            os.system("%sseleniumbase print '%s' -n" % (prefix, recorded_file))
         success = (
             "\n" + c2 + "***" + cr + " BEHAVE RECORDING at: "
             "" + c1 + os.path.relpath(recorded_file) + cr + "\n"

seleniumbase/console_scripts/sb_recorder.py

@@ -1,4 +1,6 @@
 """
+** recorder **
+
 Launches the SeleniumBase Recorder Desktop App.
 
 Usage:
@@ -19,6 +21,10 @@
 from seleniumbase import config as sb_config
 from seleniumbase.fixtures import page_utils
 
+PLATFORM = sys.platform
+IS_WINDOWS = False
+if "win32" in PLATFORM or "win64" in PLATFORM or "x64" in PLATFORM:
+    IS_WINDOWS = True
 sb_config.rec_subprocess_p = None
 sb_config.rec_subprocess_used = False
 if sys.version_info <= (3, 7):
@@ -128,7 +134,9 @@ def do_recording(file_name, url, overwrite_enabled, use_chrome, window):
             or "--gherkin" in command_args
         ):
             add_on = " --rec-behave"
-        command = "sbase mkrec %s --url=%s --gui" % (file_name, url)
+        command = "seleniumbase mkrec %s --url=%s --gui" % (file_name, url)
+        if IS_WINDOWS:
+            command = "python.exe -m %s" % command
         if not use_chrome:
             command += " --edge"
         if (
@@ -164,6 +172,8 @@ def do_playback(file_name, use_chrome, window, demo_mode=False):
         )
         return
     command = "pytest %s -q -s" % file_name
+    if IS_WINDOWS:
+        command = "python.exe -m %s" % command
     if "linux" in sys.platform:
         command += " --gui"
     if not use_chrome:
@@ -320,4 +330,4 @@ def main():
 
 
 if __name__ == "__main__":
-    print('To open the Recorder Desktop App: "sbase recorder"')
+    print('To open the Recorder Desktop App: "seleniumbase recorder"')