Skip to content

Commit 6207316

Browse files
mdmintzmdmintz
committed
Move "objectify.py" into console scripts
1 parent 8f15bff commit 6207316

File tree

2 files changed

+124
-1
lines changed

2 files changed

+124
-1
lines changed

‎seleniumbase/utilities/selenium_ide/objectify.py renamed to ‎seleniumbase/console_scripts/objectify.py

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,129 @@ def process_test_file(
670670
seleniumbase_lines.append(command)
671671
continue
672672

673+
# Handle self.input(SELECTOR, TEXT)
674+
if not object_dict:
675+
data = re.match(
676+
r'''^(\s*)self\.input'''
677+
r'''\((r?['"][\S\s]+['"]),\s?([\S\s]+)\)([\S\s]*)'''
678+
r'''$''', line)
679+
else:
680+
data = re.match(
681+
r'''^(\s*)self\.input'''
682+
r'''\(([\S\s]+),\s?([\S\s]+)\)([\S\s]*)'''
683+
r'''$''', line)
684+
if data:
685+
whitespace = data.group(1)
686+
selector = '%s' % data.group(2)
687+
selector = remove_extra_slashes(selector)
688+
page_selectors.append(selector)
689+
text = data.group(3)
690+
comments = data.group(4)
691+
command = '''%sself.input(%s, %s)%s''' % (
692+
whitespace, selector, text, comments)
693+
if selector_dict:
694+
if add_comments:
695+
comments = " # %s" % selector
696+
selector = optimize_selector(selector)
697+
if selector in selector_dict.keys():
698+
selector_object = selector_dict[selector]
699+
changed.append(selector_object.split('.')[0])
700+
command = '''%sself.input(%s, %s)%s''' % (
701+
whitespace, selector_object, text, comments)
702+
if object_dict:
703+
if not add_comments:
704+
comments = ""
705+
object_name = selector
706+
if object_name in object_dict.keys():
707+
selector_object = object_dict[object_name]
708+
changed.append(object_name.split('.')[0])
709+
command = '''%sself.input(%s, %s)%s''' % (
710+
whitespace, selector_object, text, comments)
711+
seleniumbase_lines.append(command)
712+
continue
713+
714+
# Handle self.write(SELECTOR, TEXT)
715+
if not object_dict:
716+
data = re.match(
717+
r'''^(\s*)self\.write'''
718+
r'''\((r?['"][\S\s]+['"]),\s?([\S\s]+)\)([\S\s]*)'''
719+
r'''$''', line)
720+
else:
721+
data = re.match(
722+
r'''^(\s*)self\.write'''
723+
r'''\(([\S\s]+),\s?([\S\s]+)\)([\S\s]*)'''
724+
r'''$''', line)
725+
if data:
726+
whitespace = data.group(1)
727+
selector = '%s' % data.group(2)
728+
selector = remove_extra_slashes(selector)
729+
page_selectors.append(selector)
730+
text = data.group(3)
731+
comments = data.group(4)
732+
command = '''%sself.write(%s, %s)%s''' % (
733+
whitespace, selector, text, comments)
734+
if selector_dict:
735+
if add_comments:
736+
comments = " # %s" % selector
737+
selector = optimize_selector(selector)
738+
if selector in selector_dict.keys():
739+
selector_object = selector_dict[selector]
740+
changed.append(selector_object.split('.')[0])
741+
command = '''%sself.write(%s, %s)%s''' % (
742+
whitespace, selector_object, text, comments)
743+
if object_dict:
744+
if not add_comments:
745+
comments = ""
746+
object_name = selector
747+
if object_name in object_dict.keys():
748+
selector_object = object_dict[object_name]
749+
changed.append(object_name.split('.')[0])
750+
command = '''%sself.write(%s, %s)%s''' % (
751+
whitespace, selector_object, text, comments)
752+
seleniumbase_lines.append(command)
753+
continue
754+
755+
# Handle self.add_text(SELECTOR, TEXT)
756+
if not object_dict:
757+
data = re.match(
758+
r'''^(\s*)self\.add_text'''
759+
r'''\((r?['"][\S\s]+['"]),\s?([\S\s]+)\)([\S\s]*)'''
760+
r'''$''', line)
761+
else:
762+
data = re.match(
763+
r'''^(\s*)self\.add_text'''
764+
r'''\(([\S\s]+),\s?([\S\s]+)\)([\S\s]*)'''
765+
r'''$''', line)
766+
if data:
767+
whitespace = data.group(1)
768+
selector = '%s' % data.group(2)
769+
selector = remove_extra_slashes(selector)
770+
page_selectors.append(selector)
771+
text = data.group(3)
772+
comments = data.group(4)
773+
command = '''%sself.add_text(%s, %s)%s''' % (
774+
whitespace, selector, text, comments)
775+
if selector_dict:
776+
if add_comments:
777+
comments = " # %s" % selector
778+
selector = optimize_selector(selector)
779+
if selector in selector_dict.keys():
780+
selector_object = selector_dict[selector]
781+
changed.append(selector_object.split('.')[0])
782+
command = '''%sself.add_text(%s, %s)%s''' % (
783+
whitespace, selector_object, text, comments)
784+
if object_dict:
785+
if not add_comments:
786+
comments = ""
787+
object_name = selector
788+
if object_name in object_dict.keys():
789+
selector_object = object_dict[object_name]
790+
changed.append(object_name.split('.')[0])
791+
command = '''%sself.add_text(%s, %s)%s''' % (
792+
whitespace, selector_object, text, comments)
793+
seleniumbase_lines.append(command)
794+
continue
795+
673796
# Handle self.send_keys(SELECTOR, TEXT)
674797
if not object_dict:
675798
data = re.match(

‎seleniumbase/console_scripts/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
from seleniumbase.common import obfuscate
2424
from seleniumbase.common import unobfuscate
2525
from seleniumbase.console_scripts import logo_helper
26+
from seleniumbase.console_scripts import objectify
2627
from seleniumbase.console_scripts import sb_mkdir
2728
from seleniumbase.console_scripts import sb_install
2829
from seleniumbase.utilities.selenium_grid import download_selenium_server
2930
from seleniumbase.utilities.selenium_grid import grid_hub
3031
from seleniumbase.utilities.selenium_grid import grid_node
3132
from seleniumbase.utilities.selenium_ide import convert_ide
32-
from seleniumbase.utilities.selenium_ide import objectify
3333

3434

3535
def show_usage():

0 commit comments

Comments
 (0)