Skip to content

OSOE-1105: Release v13.0.0 in, and move Elasticsearch sample to Lombiq.UITestingToolbox #1042

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

Merged
LombiqBot merged 18 commits into from
Apr 30, 2025
Merged

OSOE-1105: Release v13.0.0 in, and move Elasticsearch sample to Lombiq.UITestingToolbox #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d7dcb52
Submodule tools/Lombiq.GitHub.Actions updated
Piedone Apr 27, 2025
e3ba269
NuGet publishes
Piedone Apr 27, 2025
1aa8562
Updating Helpful Libraries everywhere
Piedone Apr 27, 2025
1bf6e0a
Updating Helpful Libraries also in Lombiq.TrainingDemo
Piedone Apr 27, 2025
bcc1c26
Fixing deprecation
Piedone Apr 27, 2025
ed5a09a
Updating Lombiq.Hosting.Tenants NuGet references too
Piedone Apr 27, 2025
b47121a
Fixing build error
Piedone Apr 27, 2025
2b36386
Submodule src/Modules/Lombiq.Hosting.Tenants updated
Piedone Apr 27, 2025
4009dce
Submodule src/Modules/Lombiq.Hosting.Tenants updated
Piedone Apr 27, 2025
f57daac
Updating Lombiq.Hosting.Tenants NuGet references again
Piedone Apr 27, 2025
dee403d
Submodule test/Lombiq.UITestingToolbox updated
Piedone Apr 27, 2025
31f16bf
Merge remote-tracking branch 'origin/dev' into issue/OSOE-1105
Piedone Apr 27, 2025
8e6f262
Submodule src/Libraries/Lombiq.HelpfulLibraries updated
Piedone Apr 27, 2025
263ab23
Fixing that ElasticsearchTests shouldn't run under Windows
Piedone Apr 27, 2025
34dd901
Merge remote-tracking branch 'origin/dev' into issue/OSOE-1105
Piedone Apr 29, 2025
7be962f
Typo/docs clarity
Piedone Apr 29, 2025
597cee9
submodules
sarahelsaig Apr 30, 2025
2df2367
Merge remote-tracking branch 'origin/dev' into issue/OSOE-1105
sarahelsaig Apr 30, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
# supported by GHA.
# The currently used Elasticsearch setup action (https://github.com/elastic/elastic-github-actions/tree/master/elasticsearch)
# can only be used on Linux.
test-filter: FullyQualifiedName!~SecurityScanningTests&FullyQualifiedName!~BehaviorElasticsearchTests
test-filter: FullyQualifiedName!~SecurityScanningTests&FullyQualifiedName!~ElasticsearchTests

build-and-test-standard-runners:
if: github.ref_name == github.event.repository.default_branch
Expand All @@ -74,7 +74,7 @@ jobs:
# supported by GHA.
# The currently used Elasticsearch setup action (https://github.com/elastic/elastic-github-actions/tree/master/elasticsearch)
# can only be used on Linux.
test-filter: FullyQualifiedName!~SecurityScanningTests&FullyQualifiedName!~BehaviorElasticsearchTests
test-filter: FullyQualifiedName!~SecurityScanningTests&FullyQualifiedName!~ElasticsearchTests

build-and-test-nuget-test:
if: github.ref_name == github.event.repository.default_branch ||
Expand All @@ -98,7 +98,7 @@ jobs:
# Without quotes, somehow the value won't be passed properly and the test execution will hang, despite seemingly
# every value being the same as with quotes.
# yamllint disable-line rule:quoted-strings
test-filter: 'FullyQualifiedName!~SecurityScanningTests&FullyQualifiedName!~BehaviorElasticsearchTests'
test-filter: 'FullyQualifiedName!~SecurityScanningTests&FullyQualifiedName!~ElasticsearchTests'

powershell-static-code-analysis:
if: github.ref_name == github.event.repository.default_branch ||
Expand Down
20 changes: 10 additions & 10 deletions NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.JsonEditor" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.LoginAsAnybody" Version="5.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Privacy" Version="10.0.1-alpha.2.osoe-1064" />
<PackageReference Include="Lombiq.Privacy.Samples" Version="10.0.1-alpha.2.osoe-1064" />
<PackageReference Include="Lombiq.SetupExtensions" Version="7.0.0" />
<PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="12.1.1-alpha.32.osoe-1064" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="12.1.1-alpha.32.osoe-1064" />
<PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="13.0.0" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="13.0.0" />
<PackageReference Include="Lombiq.UIKit" Version="9.1.0" />
<PackageReference Include="Lombiq.UIKit.Widgets" Version="9.1.0" />
<PackageReference Include="Lombiq.UIKit.Widgets.Tests.UI" Version="9.1.0" />
Expand Down
16 changes: 8 additions & 8 deletions NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="7.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge.Tests.UI" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="9.0.1-alpha.5.osoe-1064" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="9.0.1-alpha.7.osoe-1105" />
<PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.LoginAsAnybody.Tests.UI" Version="5.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.OrchardCoreApiClient.Tests.UI" Version="7.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="10.0.1-alpha.2.osoe-1064" />
<PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="10.0.1-alpha.7.osoe-1057" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.1.1-alpha.32.osoe-1064" />
<PackageReference Include="Lombiq.Tests.UI" Version="13.0.0" />
<PackageReference Include="Lombiq.VueJs.Tests.UI" Version="8.0.2-alpha.1.osoe-945" />
<PackageReference Include="Lombiq.UIKit.Widgets.Tests.UI" Version="9.1.0" />
<PackageReference Include="Lombiq.Walkthroughs.Tests.UI" Version="3.0.1-alpha.13.osoe-1064" />
Expand Down
7 changes: 6 additions & 1 deletion NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/BasicOrchardFeaturesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Lombiq.Tests.UI.BasicOrchardFeaturesTesting;
using Lombiq.Tests.UI.Pages;
using System.Threading.Tasks;
using Xunit;

Expand All @@ -14,5 +15,9 @@ public BasicOrchardFeaturesTests(ITestOutputHelper testOutputHelper)
[Fact]
public Task BasicOrchardFeaturesShouldWork() =>
ExecuteTestAsync(
context => context.TestBasicOrchardFeaturesExceptRegistrationAsync("Lombiq.OSOCE.NuGet.BasicOrchardFeaturesTests"));
context => context.TestBasicOrchardFeaturesAsync(new OrchardCoreSetupParameters
{
RecipeId = "Lombiq.OSOCE.NuGet.BasicOrchardFeaturesTests",
SkipRegistration = true,
}));
}
2 changes: 1 addition & 1 deletion NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public Task EmailQuotaShouldNotBlockEmailsWhenDifferentHostIsUsedThanOriginalFro
// thinking it's a non-default host.
await context.SignInDirectlyAndGoToDashboardAsync();
await context.ConfigureSmtpSettingsAsync("sender@example.com", "127.0.0.1");
await context.TestEmailQuotaManagementBehaviorAsync(1, moduleShouldInterfere: false);
await context.TestEmailQuotaManagementBehaviorAsync(1, quotaShouldBeEnforced: false);
},
configuration => configuration.SetEmailQuotaManagementOptionsForUITest(1));
}
2 changes: 1 addition & 1 deletion NuGetTest/test/Lombiq.OSOCE.NuGet.Tests/Lombiq.OSOCE.NuGet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Lombiq.HelpfulLibraries" Version="12.2.0" />
<PackageReference Include="Lombiq.Tests" Version="4.0.1-alpha.1.osoe-935" />
<PackageReference Include="Lombiq.Tests" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="xunit.v3" Version="2.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Lombiq.HelpfulLibraries
Open in desktop
Submodule Lombiq.HelpfulLibraries updated 1 files
+1 −1 Lombiq.HelpfulLibraries.OrchardCore/Elasticsearch/ResponseExtensions.cs
62 changes: 0 additions & 62 deletions src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.Elasticsearch.recipe.json
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions test/Lombiq.OSOCE.Tests.UI/Tests/ElasticsearchTests/BehaviorElasticsearchTests.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/Lombiq.UITestingToolbox
Open in desktop
Submodule Lombiq.UITestingToolbox updated 13 files
+10 −4 Lombiq.Tests.UI.Samples/Helpers/SetupHelpers.cs
+5 −0 Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+1 −0 Lombiq.Tests.UI.Samples/Readme.md
+63 −0 Lombiq.Tests.UI.Samples/Recipes/Lombiq.OSOCE.Tests.Elasticsearch.recipe.json
+59 −0 Lombiq.Tests.UI.Samples/Tests/ElasticsearchTests.cs
+1 −1 Lombiq.Tests.UI.Samples/Tests/ShiftTimeTests.cs
+0 −2 Lombiq.Tests.UI/Docs/Configuration.md
+10 −2 Lombiq.Tests.UI/Extensions/OrchardCoreConfigurationExtensions.cs
+8 −6 Lombiq.Tests.UI/Extensions/TestContextExtensions.cs
+64 −60 Lombiq.Tests.UI/Models/ElasticsearchRunningContext.cs
+1 −1 Lombiq.Tests.UI/Services/OrchardCoreUITestExecutorConfiguration.cs
+4 −4 Lombiq.Tests.UI/Services/UITestExecutionSession.cs
+4 −3 Readme.md
2 changes: 1 addition & 1 deletion tools/Lombiq.GitHub.Actions
Open in desktop
Submodule Lombiq.GitHub.Actions updated 2 files
+1 −3 .github/actions/publish-nuget/action.yml
+4 −1 .github/workflows/validate-nuget-publish.yml
Loading