[dotnet] add support for Safari Technology Preview (#12342)

titusfortner · web-flow · commit 3daa319c8491 · 2023-07-12T16:21:38.000-05:00
diff --git a/dotnet/src/webdriver/Safari/SafariDriverService.cs b/dotnet/src/webdriver/Safari/SafariDriverService.cs
@@ -32,6 +32,7 @@ public sealed class SafariDriverService : DriverService
     {
         private const string DefaultSafariDriverServiceExecutableName = "safaridriver";
         private const string DefaultSafariDriverServiceExecutablePath = "/usr/bin";
+        private const string DefaultSafariPreviewDriverServiceExecutablePath = "/Applications/Safari Technology Preview.app/Contents/MacOS/";
 
         private static readonly Uri SafariDriverDownloadUrl = new Uri("http://apple.com");
 
@@ -164,6 +165,20 @@ public static SafariDriverService CreateDefaultService()
             return CreateDefaultService(DefaultSafariDriverServiceExecutablePath);
         }
 
+        /// <summary>
+        /// Creates a default instance of the SafariDriverService.
+        /// </summary>
+        /// <returns>A SafariDriverService that implements default settings.</returns>
+        public static SafariDriverService CreateDefaultService(SafariOptions options)
+        {
+            if (options.TechnologyPreview)
+            {
+                return CreateDefaultService(DefaultSafariPreviewDriverServiceExecutablePath);
+            }
+
+            return CreateDefaultService(DefaultSafariDriverServiceExecutablePath);
+        }
+
         /// <summary>
         /// Creates a default instance of the SafariDriverService using a specified path to the SafariDriver executable.
         /// </summary>
diff --git a/dotnet/src/webdriver/Safari/SafariOptions.cs b/dotnet/src/webdriver/Safari/SafariOptions.cs
@@ -47,19 +47,39 @@ public class SafariOptions : DriverOptions
     {
         private const string BrowserNameValue = "safari";
         private const string EnableAutomaticInspectionSafariOption = "safari:automaticInspection";
-        private const string EnableAutomticProfilingSafariOption = "safari:automaticProfiling";
+        private const string EnableAutomaticProfilingSafariOption = "safari:automaticProfiling";
 
         private bool enableAutomaticInspection = false;
         private bool enableAutomaticProfiling = false;
+        private bool technologyPreview = false;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SafariOptions"/> class.
         /// </summary>
         public SafariOptions() : base()
         {
             this.BrowserName = BrowserNameValue;
+            this.technologyPreview = false;
             this.AddKnownCapabilityName(SafariOptions.EnableAutomaticInspectionSafariOption, "EnableAutomaticInspection property");
-            this.AddKnownCapabilityName(SafariOptions.EnableAutomticProfilingSafariOption, "EnableAutomaticProfiling property");
+            this.AddKnownCapabilityName(SafariOptions.EnableAutomaticProfilingSafariOption, "EnableAutomaticProfiling property");
+        }
+
+        /// <summary>
+        /// Allows the Options class to be used with a Safari Technology Preview driver
+        /// </summary>
+        public void UseTechnologyPreview()
+        {
+            this.technologyPreview = true;
+            this.BrowserName = "Safari Technology Preview";
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to have the driver preload the
+        /// Web Inspector and JavaScript debugger in the background.
+        /// </summary>
+        public bool TechnologyPreview
+        {
+            get { return this.technologyPreview; }
         }
 
         /// <summary>
@@ -98,7 +118,7 @@ public override ICapabilities ToCapabilities()
 
             if (this.enableAutomaticProfiling)
             {
-                capabilities.SetCapability(EnableAutomticProfilingSafariOption, true);
+                capabilities.SetCapability(EnableAutomaticProfilingSafariOption, true);
             }
 
             return capabilities.AsReadOnly();
diff --git a/dotnet/test/common/CustomDriverConfigs/SafariTechnologyPreviewDriver.cs b/dotnet/test/common/CustomDriverConfigs/SafariTechnologyPreviewDriver.cs
@@ -22,7 +22,12 @@ public static SafariDriverService DefaultService
 
         public static SafariOptions DefaultOptions
         {
-            get { return new SafariOptions(); }
+            get
+            {
+                SafariOptions options = new SafariOptions();
+                options.UseTechnologyPreview();
+                return options;
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,12 @@ public static SafariDriverService DefaultService`
`22`	`22`
`23`	`23`	`public static SafariOptions DefaultOptions`
`24`	`24`	`{`
`25`		`- get { return new SafariOptions(); }`
	`25`	`+ get`
	`26`	`+ {`
	`27`	`+ SafariOptions options = new SafariOptions();`
	`28`	`+ options.UseTechnologyPreview();`
	`29`	`+ return options;`
	`30`	`+ }`
`26`	`31`	`}`
`27`	`32`	`}`
`28`	`33`	`}`