Skip to content

Commit c251e5a

Browse files
committed
Update console scripts
1 parent 0cf99b0 commit c251e5a

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

seleniumbase/console_scripts/sb_mkdir.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ def main():
318318

319319
data = []
320320
data.append("from seleniumbase import BaseCase")
321+
data.append("BaseCase.main(__name__, __file__)")
321322
data.append("")
322323
data.append("")
323324
data.append("class MyTestClass(BaseCase):")
@@ -353,6 +354,7 @@ def main():
353354

354355
data = []
355356
data.append("from seleniumbase import BaseCase")
357+
data.append("BaseCase.main(__name__, __file__)")
356358
data.append("")
357359
data.append("")
358360
data.append("class DemoSiteTests(BaseCase):")
@@ -448,6 +450,7 @@ def main():
448450
data = []
449451
data.append("from parameterized import parameterized")
450452
data.append("from seleniumbase import BaseCase")
453+
data.append("BaseCase.main(__name__, __file__)")
451454
data.append("")
452455
data.append("")
453456
data.append("class GoogleTests(BaseCase):")
@@ -485,6 +488,7 @@ def main():
485488

486489
data = []
487490
data.append("from seleniumbase import BaseCase")
491+
data.append("BaseCase.main(__name__, __file__)")
488492
data.append("")
489493
data.append("")
490494
data.append("class BaseTestCase(BaseCase):")
@@ -550,6 +554,7 @@ def main():
550554

551555
data = []
552556
data.append("from seleniumbase import BaseCase")
557+
data.append("BaseCase.main(__name__, __file__)")
553558
data.append("")
554559
data.append("")
555560
data.append("class DataPage:")
@@ -647,6 +652,7 @@ def main():
647652
data.append('""" Classic Page Object Model with BaseCase inheritance """')
648653
data.append("")
649654
data.append("from seleniumbase import BaseCase")
655+
data.append("BaseCase.main(__name__, __file__)")
650656
data.append("")
651657
data.append("")
652658
data.append("class LoginPage:")

seleniumbase/console_scripts/sb_mkfile.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
1212
Options:
1313
-b / --basic (Basic boilerplate / single-line test)
14-
-r / --rec (add pdb++ breakpoint for Recorder Mode)
14+
-r / --rec (adds Pdb+ breakpoint for Recorder Mode)
1515
1616
Language Options:
1717
--en / --English | --zh / --Chinese
@@ -45,7 +45,7 @@ def invalid_run_command(msg=None):
4545
exp += " sbase mkfile new_test.py\n"
4646
exp += " Options:\n"
4747
exp += " -b / --basic (Basic boilerplate / single-line test)\n"
48-
exp += " -r / --rec (add pdb++ breakpoint for Recorder Mode)\n"
48+
exp += " -r / --rec (adds Pdb+ breakpoint for Recorder Mode)\n"
4949
exp += " Language Options:\n"
5050
exp += " --en / --English | --zh / --Chinese\n"
5151
exp += " --nl / --Dutch | --fr / --French\n"
@@ -220,9 +220,12 @@ def main():
220220
import_line = MD_F.get_import_line(language)
221221
parent_class = MD_F.get_lang_parent_class(language)
222222
class_line = "class %s(%s):" % (class_name, parent_class)
223+
main_line = "BaseCase.main(__name__, __file__)"
223224

224225
data = []
225226
data.append("%s" % import_line)
227+
if not recorder:
228+
data.append(main_line)
226229
data.append("")
227230
data.append("")
228231
data.append("%s" % class_line)
@@ -272,6 +275,10 @@ def main():
272275
# Example: self.assert_true("Name" in self.get_title())
273276
line = new_line
274277
continue
278+
if main_line in line:
279+
new_main = "%s.main(__name__, __file__)" % parent_class
280+
new_line = line.replace(main_line, new_main)
281+
found_swap = True
275282
if found_swap:
276283
if new_line.endswith(" # noqa"): # Remove flake8 skip
277284
new_line = new_line[0 : -len(" # noqa")]

seleniumbase/translate/translator.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,12 @@ def invalid_run_command(msg=None):
7575

7676

7777
def sc_ranges():
78-
# Get the ranges of special characters of Chinese, Japanese, and Korean.
78+
# Get the ranges of special double-width characters.
7979
special_char_ranges = [
8080
{"from": ord("\u4e00"), "to": ord("\u9FFF")},
8181
{"from": ord("\u3040"), "to": ord("\u30ff")},
8282
{"from": ord("\uac00"), "to": ord("\ud7a3")},
83+
{"from": ord("\uff01"), "to": ord("\uff60")},
8384
]
8485
return special_char_ranges
8586

@@ -220,6 +221,19 @@ def process_test_file(code_lines, new_lang):
220221
seleniumbase_lines.append(line)
221222
continue
222223

224+
if (
225+
".main(__name__, __file__)" in line
226+
and detected_lang
227+
and new_lang
228+
and (detected_lang != new_lang)
229+
):
230+
old_basecase = MD_F.get_lang_parent_class(detected_lang)
231+
new_basecase = MD_F.get_lang_parent_class(new_lang)
232+
if old_basecase in line:
233+
new_line = line.replace(old_basecase, new_basecase)
234+
seleniumbase_lines.append(new_line)
235+
continue
236+
223237
if (
224238
"self." in line
225239
and "(" in line

0 commit comments

Comments
 (0)