Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OSOE-935: Migrating test project to xUnit v3 #137

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

OSOE-935: Migrating test project to xUnit v3 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ce7c2b
Using TestCancellationToken in UI tests
Piedone Dec 22, 2024
1a272cf
Updating Lombiq NuGet references
Piedone Dec 22, 2024
14e027f
Merge remote-tracking branch 'origin/dev' into issue/OSOE-935
Piedone Dec 25, 2024
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 ...EmailQuotaManagement.Tests.UI/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.1-alpha.0.osoe-935" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...q.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.0.0" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="10.0.1-alpha.0.osoe-935" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...nants.EnvironmentRobots.Tests.UI/Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.1-alpha.0.osoe-935" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...sting.Tenants.FeaturesGuard.Tests.UI/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.1-alpha.0.osoe-935" />
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions ...osting.Tenants.IdleTenantManagement.Tests.UI/Extensions/IdleTenantManagementExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public static void ConfigureIdleTenantManagementTestSettings(this OrchardCoreUIT
(_, fakeLogCollectorOptions) => fakeLogCollectorOptions.FilteredLevels.Add(LogLevel.Information);

configuration.AssertAppLogsAsync = app =>
app.LogsShouldNotContainAsync(logEntry =>
AppLogAssertionHelper.NotMediaCacheEntries(logEntry) && logEntry.Level != LogLevel.Information);
app.LogsShouldNotContainAsync(
logEntry => AppLogAssertionHelper.NotMediaCacheEntries(logEntry) && logEntry.Level != LogLevel.Information,
configuration.TestCancellationToken);
}
}
4 changes: 2 additions & 2 deletions ...sting.Tenants.IdleTenantManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ await context.GoToSetupPageAndSetupOrchardCoreAsync(
// Due to the background ask scheduling configuration in ConfigureIdleTenantManagementTestSettings(), the
// background task should run within not much more than a minute (background tasks are run with a frequency of
// at least a minute, due to the limitation of cron expressions). Polling for it here.
await Task.Delay(TimeSpan.FromMinutes(1));
await Task.Delay(TimeSpan.FromMinutes(1), context.Configuration.TestCancellationToken);
await ReliabilityHelper.DoWithRetriesOrFailAsync(
async () =>
{
var logEntries = await context.Application.GetLogEntriesFromAllLogsAsync();
var logEntries = await context.Application.GetLogEntriesFromAllLogsAsync(context.Configuration.TestCancellationToken);
return logEntries.Any(logEntry =>
logEntry.Message == $"Shutting down tenant \"{IdleTenantName}\" because of idle timeout.");
},
Expand Down
2 changes: 1 addition & 1 deletion ...IdleTenantManagement.Tests.UI/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.1-alpha.0.osoe-935" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...q.Hosting.Tenants.Maintenance.Tests.UI/Lombiq.Hosting.Tenants.Maintenance.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.1-alpha.0.osoe-935" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.Hosting.Tenants.Management.Tests.UI/Lombiq.Hosting.Tenants.Management.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.1-alpha.0.osoe-935" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...aStorageManagement.Tests.UI/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.0.1-alpha.0.osoe-935" />
</ItemGroup>

</Project>
Loading