review

microsoft · Jan 24, 2025 · 9f889d6 · 9f889d6
1 parent 435b6f0
commit 9f889d6
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Playwright.NUnit/BrowserService.cs b/src/Playwright.NUnit/BrowserService.cs
@@ -25,6 +25,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
@@ -50,19 +51,23 @@ private static async Task<IBrowser> CreateBrowser(IBrowserType browserType, Play
     {
         if (connectOptions != null)
         {
-            return await browserType.ConnectAsync(connectOptions.WSEndpoint, connectOptions).ConfigureAwait(false);
+            var options = new BrowserTypeConnectOptions(connectOptions);
+            var headers = options.Headers?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value) ?? [];
+            headers.Add("x-playwright-launch-options", JsonSerializer.Serialize(PlaywrightSettingsProvider.LaunchOptions, new JsonSerializerOptions() { DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull }));
+            options.Headers = headers;
+            return await browserType.ConnectAsync(connectOptions.WSEndpoint, options).ConfigureAwait(false);
         }
 
-        var legacyBrowser = await ConnectToLegacyService(browserType);
+        var legacyBrowser = await ConnectBasedOnEnv(browserType);
         if (legacyBrowser != null)
         {
             return legacyBrowser;
         }
         return await browserType.LaunchAsync(PlaywrightSettingsProvider.LaunchOptions).ConfigureAwait(false);
     }
 
-    // TODO: Remove after Q3 2025
-    private static async Task<IBrowser?> ConnectToLegacyService(IBrowserType browserType)
+    // TODO: Remove at some point
+    private static async Task<IBrowser?> ConnectBasedOnEnv(IBrowserType browserType)
     {
         var accessToken = Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_ACCESS_TOKEN");
         var serviceUrl = Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_URL");