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
2 changes: 1 addition & 1 deletion .github/actions/setup-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ runs:
if: runner.os == 'Linux'
uses: oven-sh/setup-bun@v2
with:
bun-version: latest
bun-download-url: "https://github.com/oven-sh/bun/releases/latest/download/bun-linux-x64.zip"

- name: Run Linux setup script
if: runner.os == 'Linux'
Expand Down
1 change: 1 addition & 0 deletions src/AvaloniaXKCD.Tests/BrowserLocalizationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace AvaloniaXKCD.Tests;
[Timeout(5 * 60 * 1000)] // 5 minutes
[Arguments("chromium", "en-US")]
[Arguments("chromium", "es-ES")]
[Retry(2)]
public class BrowserLocalizationTests(string browser, string locale) : BrowserBaseTest(browser)
{
public override BrowserNewContextOptions ContextOptions(TestContext testContext)
Expand Down
1 change: 1 addition & 0 deletions src/AvaloniaXKCD.Tests/BrowserTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ namespace AvaloniaXKCD.Tests;
[Timeout(5 * 60 * 1000)] // 5 minutes
[Arguments("chromium")]
[Arguments("firefox")]
[Retry(2)]
public class BrowserTests(string browser) : BrowserBaseTest(browser)
{
[Test]
Expand Down
22 changes: 20 additions & 2 deletions src/AvaloniaXKCD.Tests/TestBases/BrowserBaseTest.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
namespace AvaloniaXKCD.Tests.TestBases;

public abstract class BrowserBaseTest(string browser) : PageTest
public abstract class BrowserBaseTest : PageTest
{
public override string BrowserName => browser;
private readonly string _browserName;

protected BrowserBaseTest(string browser)
: base(new BrowserTypeLaunchOptions
{
Timeout = 90_000, // 90 second timeout for browser launch
Args =
[
// Flags for limited resource environments like CI
"--disable-dev-shm-usage",
"--no-sandbox",
"--disable-setuid-sandbox"
]
})
{
_browserName = browser;
}

public override string BrowserName => _browserName;

[ClassDataSource<AvaloniaBrowserProject>(Shared = SharedType.PerAssembly)]
public required AvaloniaBrowserProject AvaloniaManager { get; init; }
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
<None Include="LICENSE" Pack="true" PackagePath="..\"/>
</ItemGroup>
<PropertyGroup>
<NoWarn>$(NoWarn);NU1902</NoWarn>
<NoWarn>$(NoWarn);NU1901;NU1902;NU1903;NU1904</NoWarn>
</PropertyGroup>
</Project>