Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Playwright.TestAdapter/PlaywrightSettingsProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,12 @@ private static void ValidateBrowserName(string browserName, string fromText, str
public void Load(XmlReader reader)
{
// NOTE: ISettingsProvider::Load is not called when there are no runsettings (either file or passed via command line).
_settings = new PlaywrightSettingsXml(reader);
Load(new PlaywrightSettingsXml(reader));
}

public static void Load(PlaywrightSettingsXml settings)
{
_settings = settings;
Environment.SetEnvironmentVariable("PW_INTERNAL_ADAPTER_SETTINGS", JsonSerializer.Serialize(_settings));
}
}
Expand Down
10 changes: 6 additions & 4 deletions src/Playwright.Xunit.v3/BrowserService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ private BrowserService(IBrowser browser)
Browser = browser;
}

public static Task<BrowserService> Register(WorkerAwareTest test, IBrowserType browserType, (string, BrowserTypeConnectOptions?)? connectOptions)
public static Task<BrowserService> Register(WorkerAwareTest test, IBrowserType browserType, (string, BrowserTypeConnectOptions?)? connectOptions, BrowserTypeLaunchOptions? launchOptions)
{
return test.RegisterService("Browser", async () => new BrowserService(await CreateBrowser(browserType, connectOptions).ConfigureAwait(false)));
return test.RegisterService("Browser", async () => new BrowserService(await CreateBrowser(browserType, connectOptions, launchOptions).ConfigureAwait(false)));
}

private static async Task<IBrowser> CreateBrowser(IBrowserType browserType, (string WSEndpoint, BrowserTypeConnectOptions? Options)? connectOptions)
private static async Task<IBrowser> CreateBrowser(IBrowserType browserType, (string WSEndpoint, BrowserTypeConnectOptions? Options)? connectOptions, BrowserTypeLaunchOptions? launchOptions)
{
if (connectOptions.HasValue && connectOptions.Value.WSEndpoint != null)
{
Expand All @@ -63,7 +63,9 @@ private static async Task<IBrowser> CreateBrowser(IBrowserType browserType, (str
{
return legacyBrowser;
}
return await browserType.LaunchAsync(PlaywrightSettingsProvider.LaunchOptions).ConfigureAwait(false);

launchOptions ??= PlaywrightSettingsProvider.LaunchOptions;
return await browserType.LaunchAsync(launchOptions).ConfigureAwait(false);
}

// TODO: Remove at some point
Expand Down
10 changes: 9 additions & 1 deletion src/Playwright.Xunit.v3/BrowserTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public async Task<IBrowserContext> NewContext(BrowserNewContextOptions? options
public override async ValueTask InitializeAsync()
{
await base.InitializeAsync().ConfigureAwait(false);
var service = await BrowserService.Register(this, BrowserType, await ConnectOptionsAsync()).ConfigureAwait(false);
var service = await BrowserService.Register(this, BrowserType, await ConnectOptionsAsync(), await LaunchOptionsAsync()).ConfigureAwait(false);
Browser = service.Browser;
}

Expand All @@ -60,5 +60,13 @@ public override async ValueTask DisposeAsync()
await base.DisposeAsync().ConfigureAwait(false);
}

/// <summary>
/// Override to provide custom connect options for the browser.
/// </summary>
public virtual Task<(string, BrowserTypeConnectOptions?)?> ConnectOptionsAsync() => Task.FromResult<(string, BrowserTypeConnectOptions?)?>(null);

/// <summary>
/// Override to provide custom launch options for the browser.
/// </summary>
public virtual Task<BrowserTypeLaunchOptions?> LaunchOptionsAsync() => Task.FromResult<BrowserTypeLaunchOptions?>(null);
}
Loading