Skip to content

Commit bc470c9

Browse files
Merge pull request #510 from AutomationSolutionz/go-to-link
Go to link
2 parents 78186a6 + 7bc6808 commit bc470c9

File tree

6 files changed

+361
-1008
lines changed

6 files changed

+361
-1008
lines changed

Framework/Built_In_Automation/Desktop/Windows/BuiltInFunctions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ def _child_search_by_path(
851851
if found:
852852
if switch_window:
853853
CommonUtil.ExecLog(sModuleInfo, "Switching to window: %s" % NameE, 1)
854-
if Shared_Resources.Get_Shared_Variables("zeuz_window_auto_switch").strip().lower() in CommonUtil.Affirmative_words:
854+
if Shared_Resources.Get_Shared_Variables("zeuz_window_auto_switch").strip().lower() in CommonUtil.affirmative_words:
855855
autoit.win_activate(NameE)
856856
all_elements.append(each_child)
857857
if 0 <= element_index == len(all_elements) - 1: break
@@ -1653,7 +1653,7 @@ def _get_main_window(WindowName):
16531653
if MainWindowElement.Current.ProcessId in current_pid_list:
16541654
CommonUtil.ExecLog(sModuleInfo, "Switching to window: %s" % NameS, 1)
16551655
CommonUtil.ExecLog(sModuleInfo, f"pid matched: {MainWindowElement.Current.ProcessId}", 5)
1656-
if Shared_Resources.Get_Shared_Variables("zeuz_window_auto_switch").strip().lower() in CommonUtil.Affirmative_words:
1656+
if Shared_Resources.Get_Shared_Variables("zeuz_window_auto_switch").strip().lower() in CommonUtil.affirmative_words:
16571657
autoit.win_activate(NameS)
16581658
return MainWindowElement
16591659
else:
@@ -1662,7 +1662,7 @@ def _get_main_window(WindowName):
16621662
pass
16631663
if len(found_windows) > 0:
16641664
CommonUtil.ExecLog(sModuleInfo, "Switching to window: %s" % found_windows[0].Current.Name, 1)
1665-
if Shared_Resources.Get_Shared_Variables("zeuz_window_auto_switch").strip().lower() in CommonUtil.Affirmative_words:
1665+
if Shared_Resources.Get_Shared_Variables("zeuz_window_auto_switch").strip().lower() in CommonUtil.affirmative_words:
16661666
autoit.win_activate(found_windows[0].Current.Name)
16671667
return found_windows[0]
16681668
return None

Framework/Built_In_Automation/Sequential_Actions/action_declarations/info.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@
8383
"attribute constrain",
8484
"optional option",
8585
"graphql",
86-
"shared capability",
87-
"chrome option", "chrome options", "chrome experimental option", "chrome experimental options",
86+
"shared capability", "chrome option", "edge option", "chromium option", "firefox option", "safari option",
8887
"pre sleep", "post sleep", "pre post sleep", "post pre sleep",
8988
"zoom parameter", "optional zoom parameter", "pan parameter", "optional pan parameter",
9089
"profile option", "profile options",

Framework/Built_In_Automation/Sequential_Actions/action_declarations/selenium.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{ "name": "deselect by value", "function": "Select_Deselect", "screenshot": "web" },
1818
{ "name": "select by index", "function": "Select_Deselect", "screenshot": "web" },
1919
{ "name": "deselect by index", "function": "Select_Deselect", "screenshot": "web" },
20-
{ "name": "open browser", "function": "Open_Empty_Browser", "screenshot": "web" },
20+
{ "name": "open browser", "function": "Go_To_Link", "screenshot": "web" },
2121
{ "name": "open electron app", "function": "Open_Electron_App", "screenshot": "web" },
2222
{ "name": "go to link", "function": "Go_To_Link", "screenshot": "web" },
2323
{ "name": "go to link v2", "function": "Go_To_Link_V2", "screenshot": "web" },
@@ -27,7 +27,6 @@
2727
{ "name": "navigate", "function": "Navigate", "screenshot": "web" },
2828
{ "name": "validate table", "function": "validate_table", "screenshot": "web" },
2929
{ "name": "handle alert", "function": "Handle_Browser_Alert", "screenshot": "desktop"},
30-
{ "name": "browser", "function": "Open_Browser_Wrapper", "screenshot": "web" },
3130
{ "name": "teardown", "function": "Tear_Down_Selenium", "screenshot": "none"},
3231
{ "name": "open new tab", "function": "open_new_tab", "screenshot": "web" },
3332
{ "name": "close tab", "function": "close_tab", "screenshot": "web" },
@@ -56,7 +55,6 @@
5655
{ "name": "check uncheck", "function": "check_uncheck", "screenshot": "web" },
5756
{ "name": "multiple check uncheck", "function": "multiple_check_uncheck", "screenshot": "web" },
5857
{ "name": "slider bar", "function": "slider_bar", "screenshot": "web" },
59-
{ "name": "get performance metrics", "function": "get_performance_metrics", "screenshot": "web" },
6058
{ "name": "resize window", "function": "resize_window", "screenshot": "web" },
6159
{ "name": "change attribute value", "function": "Change_Attribute_Value", "screenshot": "web" },
6260
{ "name": "capture network log", "function": "capture_network_log", "screenshot": "web" },

Framework/Built_In_Automation/Sequential_Actions/sequential_actions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ def Run_Sequential_Actions(
10841084
else:
10851085
data_set_list.append(i)
10861086

1087-
if len(data_set_list) == 0 and CommonUtil.debug_status and not sr.Test_Shared_Variables("selenium_driver") and ConfigModule.get_config_value("Inspector", "ai_plugin").strip().lower() in CommonUtil.Affirmative_words:
1087+
if len(data_set_list) == 0 and CommonUtil.debug_status and not sr.Test_Shared_Variables("selenium_driver") and ConfigModule.get_config_value("Inspector", "ai_plugin").strip().lower() in CommonUtil.affirmative_words:
10881088
return Action_Handler([["browser", "selenium action", "browser"]], ["browser", "selenium action", "browser"]), []
10891089

10901090
for dataset_cnt in data_set_list: # For each data set within step data

0 commit comments

Comments
 (0)