Skip to content
Merged
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
44 changes: 44 additions & 0 deletions src/Playwright.TestingHarnessTest/tests/xunit.v3.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -572,3 +572,47 @@ test.describe('ConnectOptions', () => {
expect(result.total).toBe(1);
});
});

test.describe('LaunchOptions', () => {
test('should be able to override launch options via LaunchOptionsAsync', async ({ runTest }) => {
const result = await runTest({
'ExampleTests.cs': `
using System;
using System.Threading.Tasks;
using Microsoft.Playwright;
using Microsoft.Playwright.Xunit.v3;
using Xunit;

namespace Playwright.TestingHarnessTest.Xunit;

public class <class-name> : PageTest
{
private readonly ITestOutputHelper output;

public <class-name>(ITestOutputHelper output)
{
this.output = output;
}

[Fact]
public async Task Test()
{
await Page.GotoAsync("about:blank");
output.WriteLine("User-Agent: " + await Page.EvaluateAsync<string>("() => navigator.userAgent"));
}

public override Task<BrowserTypeLaunchOptions?> LaunchOptionsAsync()
{
return Task.FromResult<BrowserTypeLaunchOptions?>(new BrowserTypeLaunchOptions
{
Args = new[] { "--user-agent=hello" },
});
}
}`,
}, 'dotnet test');
expect(result.passed).toBe(1);
expect(result.failed).toBe(0);
expect(result.total).toBe(1);
expect(result.stdout).toContain("User-Agent: hello");
});
});
8 changes: 4 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,7 @@ private static async Task<IBrowser> CreateBrowser(IBrowserType browserType, (str
{
return legacyBrowser;
}
return await browserType.LaunchAsync(PlaywrightSettingsProvider.LaunchOptions).ConfigureAwait(false);
return await browserType.LaunchAsync(launchOptions ?? PlaywrightSettingsProvider.LaunchOptions).ConfigureAwait(false);
}

// TODO: Remove at some point
Expand Down
4 changes: 3 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 @@ -61,4 +61,6 @@ public override async ValueTask DisposeAsync()
}

public virtual Task<(string, BrowserTypeConnectOptions?)?> ConnectOptionsAsync() => Task.FromResult<(string, BrowserTypeConnectOptions?)?>(null);

public virtual Task<BrowserTypeLaunchOptions?> LaunchOptionsAsync() => Task.FromResult<BrowserTypeLaunchOptions?>(null);
}
Loading