Merge pull request #1958 from seleniumbase/refactor-file-generators

Refactor file generators

Author: mdmintz

examples/translations/korean_test_1.py

@@ -11,7 +11,7 @@ def test_실시예_1(self):
         self.JS_입력("#searchform input", "김치")
         self.클릭("#searchform button")
         self.텍스트_확인("김치", "#firstHeading")
-        self.요소_확인('img[alt="Various kimchi.jpg"]')
+        self.요소_확인('img[src*="Various_kimchi.jpg"]')
         self.링크_텍스트_확인("한국 요리")
         self.JS_입력("#searchform input", "비빔밥")
         self.클릭("#searchform button")

help_docs/syntax_formats.md

@@ -572,7 +572,7 @@ class 테스트_클래스(셀레늄_테스트_케이스):
         self.JS_입력("#searchform input", "김치")
         self.클릭("#searchform button")
         self.텍스트_확인("김치", "#firstHeading")
-        self.요소_확인('img[alt="Various kimchi.jpg"]')
+        self.요소_확인('img[src*="Various_kimchi.jpg"]')
         self.링크_텍스트_확인("한국 요리")
         self.JS_입력("#searchform input", "비빔밥")
         self.클릭("#searchform button")

requirements.txt

@@ -30,7 +30,7 @@ pynose==1.4.6
 sniffio==1.3.0;python_version>="3.7"
 h11==0.14.0;python_version>="3.7"
 outcome==1.2.0;python_version>="3.7"
-trio==0.22.1;python_version>="3.7"
+trio==0.22.2;python_version>="3.7"
 trio-websocket==0.10.3;python_version>="3.7"
 wsproto==1.2.0;python_version>="3.7"
 selenium==3.141.0;python_version<"3.7"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.15.14"
+__version__ = "4.15.15"

seleniumbase/console_scripts/sb_mkchart.py

@@ -183,8 +183,8 @@ def main():
         chart_options = '"circular", "barras", "columnas", "líneas", "área"'
 
     import_line = "from seleniumbase import BaseCase"
+    main_line = "BaseCase.main(__name__, __file__)"
     parent_class = "BaseCase"
-    class_line = "class MyTestClass(BaseCase):"
     if language != "English":
         from seleniumbase.translate.master_dict import MD_F
 
@@ -196,6 +196,7 @@ def main():
     add_slide = '"<p>Chart Demo</p>" + self.extract_chart()'
     data = []
     data.append("%s" % import_line)
+    data.append("%s" % main_line)
     data.append("")
     data.append("")
     data.append("%s" % class_line)
@@ -204,12 +205,12 @@ def main():
     data.append("")
     data.append("        # %s => %s" % (select_option, chart_options))
     data.append("        self.create_pie_chart(%s)" % chart_settings)
-    data.append('        self.add_data_point("%s A", 50)' % item)
-    data.append('        self.add_data_point("%s B", 40)' % item)
-    data.append('        self.add_data_point("%s C", 35)' % item)
-    data.append('        self.add_data_point("%s D", 30)' % item)
-    data.append('        self.add_data_point("%s E", 25)' % item)
-    data.append('        self.add_data_point("%s F", 20)' % item)
+    data.append('        self.add_data_point("%s A", 36)' % item)
+    data.append('        self.add_data_point("%s B", 33)' % item)
+    data.append('        self.add_data_point("%s C", 27)' % item)
+    data.append('        self.add_data_point("%s D", 21)' % item)
+    data.append('        self.add_data_point("%s E", 18)' % item)
+    data.append('        self.add_data_point("%s F", 15)' % item)
     data.append("        self.add_slide(%s)" % add_slide)
     data.append("")
     data.append('        self.begin_presentation(filename="%s")' % html_name)
@@ -243,6 +244,10 @@ def main():
                         # Example: self.assert_true("Name" in self.get_title())
                         line = new_line
                         continue
+            if main_line in line:
+                new_main = "%s.main(__name__, __file__)" % parent_class
+                new_line = line.replace(main_line, new_main)
+                found_swap = True
             if found_swap:
                 if new_line.endswith("  # noqa"):  # Remove flake8 skip
                     new_line = new_line[0 : -len("  # noqa")]

seleniumbase/console_scripts/sb_mkfile.py

@@ -231,15 +231,14 @@ def main():
         url = "data:text/html,<p>%s<br><input>" % hello
 
     import_line = "from seleniumbase import BaseCase"
+    main_line = "BaseCase.main(__name__, __file__)"
     parent_class = "BaseCase"
-    class_line = "class MyTestClass(BaseCase):"
     if language != "English":
         from seleniumbase.translate.master_dict import MD_F
 
         import_line = MD_F.get_import_line(language)
         parent_class = MD_F.get_lang_parent_class(language)
     class_line = "class %s(%s):" % (class_name, parent_class)
-    main_line = "BaseCase.main(__name__, __file__)"
 
     data = []
     data.append("%s" % import_line)

seleniumbase/console_scripts/sb_mkpres.py

@@ -194,8 +194,8 @@ def main():
         class_name = "MiClaseDePrueba"
 
     import_line = "from seleniumbase import BaseCase"
+    main_line = "BaseCase.main(__name__, __file__)"
     parent_class = "BaseCase"
-    class_line = "class MyTestClass(BaseCase):"
     if language != "English":
         from seleniumbase.translate.master_dict import MD_F
 
@@ -223,6 +223,7 @@ def main():
 
     data = []
     data.append("%s" % import_line)
+    data.append("%s" % main_line)
     data.append("")
     data.append("")
     data.append("%s" % class_line)
@@ -262,6 +263,10 @@ def main():
                         # Example: self.assert_true("Name" in self.get_title())
                         line = new_line
                         continue
+            if main_line in line:
+                new_main = "%s.main(__name__, __file__)" % parent_class
+                new_line = line.replace(main_line, new_main)
+                found_swap = True
             if found_swap:
                 if new_line.endswith("  # noqa"):  # Remove flake8 skip
                     new_line = new_line[0 : -len("  # noqa")]

setup.py

@@ -164,7 +164,7 @@
         'sniffio==1.3.0;python_version>="3.7"',
         'h11==0.14.0;python_version>="3.7"',
         'outcome==1.2.0;python_version>="3.7"',
-        'trio==0.22.1;python_version>="3.7"',
+        'trio==0.22.2;python_version>="3.7"',
         'trio-websocket==0.10.3;python_version>="3.7"',
         'wsproto==1.2.0;python_version>="3.7"',
         'selenium==3.141.0;python_version<"3.7"',