Merge branch 'AutomationSolutionz:dev' into upload-android-ui

Author: mahbd

Framework/Built_In_Automation/Web/Selenium/BuiltInFunctions.py

@@ -14,7 +14,7 @@
 #                       #
 #########################
 import platform
-import sys, os, time, inspect, shutil, subprocess, json
+import sys, os, time, inspect, shutil, subprocess, json, re
 import socket
 import requests
 import psutil
@@ -59,6 +59,7 @@
     skipped_tag_list,
 )
 from Framework.AI.NLP import binary_classification
+from .utils import ChromeForTesting, ChromeExtensionDownloader
 
 #########################
 #                       #
@@ -599,6 +600,25 @@ def Open_Browser(browser, browser_options: BrowserOptions):
         options = generate_options(browser, browser_options)
         if browser in ("android", "chrome", "chromeheadless"):
             from selenium.webdriver.chrome.service import Service
+
+            chrome_bin = browser_options["chrome"].get("binary_location", None)
+            driver_bin = browser_options["chrome"].get("driver_path", None)
+
+            if chrome_bin and driver_bin:
+                # Use Chrome for Testing binaries
+                service = Service(executable_path=driver_bin)
+                options.binary_location = chrome_bin
+                CommonUtil.ExecLog(sModuleInfo, "Using Chrome for Testing binaries", 1)
+            else:
+                # Use standard ChromeDriverManager
+                service = Service()
+                CommonUtil.ExecLog(sModuleInfo, "Using standard Chrome binaries", 1)
+
+            selenium_driver = webdriver.Chrome(
+                service=service,
+                options=options,
+            )
+
             service = Service()
             selenium_driver = webdriver.Chrome(
                 service=service,
@@ -725,7 +745,7 @@ def Go_To_Link_V2(step_data):
     return "passed"
 
 
-def parse_and_verify_datatype(left:str, right:str):
+def parse_and_verify_datatype(left:str, right:str, chrome_version=None):
     val = CommonUtil.parse_value_into_object(right)
     if left == "addargument":
         if isinstance(val, list) and all(isinstance(item, str) for item in val):
@@ -734,7 +754,26 @@ def parse_and_verify_datatype(left:str, right:str):
 
     if left == "addextension":
         if isinstance(val, list) and all(isinstance(item, str) for item in val):
-            return val
+            extension_ids = []
+            extension_crxs = []
+            for item in val:
+                if item.lower().endswith(".crx") or os.path.isfile(item):
+                    extension_crxs.append(item)
+                elif re.match(r'^[a-p]{32}$', item):
+                    extension_ids.append(item)
+                else:
+                    raise ValueError(
+                        f"Invalid extension: {item}. Must be .crx file path or Chrome extension ID."
+                    )
+                    
+            # download all extensions from ids
+            for ext_id in extension_ids:
+                downloader = ChromeExtensionDownloader(chrome_version=chrome_version)
+                result = downloader.setup_chrome_extension_download(extension_id=ext_id)
+                if result.get("crx_path"):
+                    extension_crxs.append(result["crx_path"])
+                    
+            return extension_crxs
         raise ValueError("Extensions must be list of strings. Example: ['path/to/ex1.crx', 'path/to/ex2.crx']")
 
     if left == "addencodedextension":
@@ -823,6 +862,8 @@ def Go_To_Link(dataset: Dataset) -> ReturnType:
         else:
             browser = None
         driver_id = ""
+        chrome_version = None
+        chrome_channel = None
         for left, mid, right in dataset:
             left = left.replace(" ", "").replace("_", "").replace("-", "").lower()
             if left == "gotolink":
@@ -837,6 +878,8 @@ def Go_To_Link(dataset: Dataset) -> ReturnType:
                 resolution = right.split(",")
                 window_size_X = int(resolution[0])
                 window_size_Y = int(resolution[1])
+            elif left == "chrome:version":
+                chrome_version = right.strip()
 
             # Capabilities are WebDriver attribute common across different browser
             elif mid.strip().lower() == "shared capability":
@@ -854,7 +897,7 @@ def Go_To_Link(dataset: Dataset) -> ReturnType:
                 elif left == "addexperimentaloption":
                     browser_options[browser]["add_experimental_option"] = parse_and_verify_datatype(left, right)
                 elif left == "addextension":
-                    browser_options[browser]["add_extension"] = parse_and_verify_datatype(left, right)
+                    browser_options[browser]["add_extension"] = parse_and_verify_datatype(left, right, chrome_version)
                 elif left == "addencodedextension":
                     browser_options[browser]["add_encoded_extension"] = parse_and_verify_datatype(left, right)
                 elif left == "setpreference":
@@ -864,6 +907,25 @@ def Go_To_Link(dataset: Dataset) -> ReturnType:
                 elif left == "debuggeraddress":
                     browser_options[browser]["debugger_address"] = right.strip()
 
+        if dependency["Browser"] in ("Chrome", "ChromeHeadless") and not browser_options["chrome"].get("debugger_address", ""):
+            cft = ChromeForTesting()
+
+            if chrome_version:
+                if chrome_version.strip().lower() in ("beta", "dev", "canary"):
+                    chrome_channel = chrome_version.strip().capitalize()
+                    chrome_version = None
+                else:
+                    chrome_version = chrome_version.strip()
+
+            chrome_bin, driver_bin = cft.setup_chrome_for_testing(chrome_version, chrome_channel)
+            
+            if chrome_bin and driver_bin:
+                browser_options["chrome"]["binary_location"] = str(chrome_bin)
+                browser_options["chrome"]["driver_path"] = str(driver_bin)
+                CommonUtil.ExecLog(sModuleInfo, f"Using Chrome for Testing {chrome_version or 'latest'}", 1)
+            else:
+                CommonUtil.ExecLog(sModuleInfo, "Failed to get Chrome for Testing binaries. Using system Chrome", 2)
+
         if not driver_id:
             if len(selenium_details.keys()) == 0:
                 driver_id = "default"
@@ -880,6 +942,10 @@ def Go_To_Link(dataset: Dataset) -> ReturnType:
             if Open_Browser(dependency["Browser"], browser_options) == "zeuz_failed":
                 return "zeuz_failed"
 
+            if ConfigModule.get_config_value("RunDefinition", "window_size_x") and ConfigModule.get_config_value("RunDefinition", "window_size_y"):
+                window_size_X = ConfigModule.get_config_value("RunDefinition", "window_size_x")
+                window_size_Y = ConfigModule.get_config_value("RunDefinition", "window_size_y")
+                
             if not window_size_X and not window_size_Y:
                 selenium_driver.maximize_window()
             else: