diff --git a/examples/translations/korean_test_1.py b/examples/translations/korean_test_1.py index a800c595..aecf83dd 100644 --- a/examples/translations/korean_test_1.py +++ b/examples/translations/korean_test_1.py @@ -11,7 +11,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") diff --git a/help_docs/syntax_formats.md b/help_docs/syntax_formats.md index 0cce270d..bd602a84 100644 --- a/help_docs/syntax_formats.md +++ b/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") diff --git a/requirements.txt b/requirements.txt index dc4088f5..e84f91a6 100755 --- a/requirements.txt +++ b/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" diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py index 521d6f9a..2731a775 100755 --- a/seleniumbase/__version__.py +++ b/seleniumbase/__version__.py @@ -1,2 +1,2 @@ # seleniumbase package -__version__ = "4.15.14" +__version__ = "4.15.15" diff --git a/seleniumbase/console_scripts/sb_mkchart.py b/seleniumbase/console_scripts/sb_mkchart.py index 64edc7bb..f6e82d34 100644 --- a/seleniumbase/console_scripts/sb_mkchart.py +++ b/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 = '"

Chart Demo

" + 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")] diff --git a/seleniumbase/console_scripts/sb_mkfile.py b/seleniumbase/console_scripts/sb_mkfile.py index 8f28fa00..08b8ab07 100644 --- a/seleniumbase/console_scripts/sb_mkfile.py +++ b/seleniumbase/console_scripts/sb_mkfile.py @@ -231,15 +231,14 @@ def main(): url = "data:text/html,

%s
" % 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) diff --git a/seleniumbase/console_scripts/sb_mkpres.py b/seleniumbase/console_scripts/sb_mkpres.py index 9aca138d..da1e7ccc 100644 --- a/seleniumbase/console_scripts/sb_mkpres.py +++ b/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")] diff --git a/setup.py b/setup.py index ccc633ac..8a0255f8 100755 --- a/setup.py +++ b/setup.py @@ -164,7 +164,7 @@ setup( '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"',