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-903: Update to Orchard Core 2.1.0 #96

Merged
merged 5 commits into from
Dec 4, 2024
Merged

OSOE-903: Update to Orchard Core 2.1.0 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee243a3
Using new UITT TestUser
Piedone Nov 28, 2024
e2cb718
Using AddDisplayDriver()
Piedone Nov 28, 2024
420bbbb
Removing deprecated code
Piedone Nov 28, 2024
4448935
Updating UITT reference to latest alpha
Piedone Nov 28, 2024
2b93d1b
Suppressing breaking changes
Piedone Nov 28, 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
6 changes: 3 additions & 3 deletions Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Forms" Version="2.0.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0" />
<PackageReference Include="OrchardCore.Workflows" Version="2.0.0" />
<PackageReference Include="OrchardCore.Forms" Version="2.1.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.1.0" />
<PackageReference Include="OrchardCore.Workflows" Version="2.1.0" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
Expand Down
11 changes: 11 additions & 0 deletions Lombiq.Privacy.Tests.UI/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Lombiq.Privacy.Tests.UI.Constants.TestUser</Target>
<Left>lib/net8.0/Lombiq.Privacy.Tests.UI.dll</Left>
<Right>lib/net8.0/Lombiq.Privacy.Tests.UI.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
</Suppressions>
8 changes: 0 additions & 8 deletions Lombiq.Privacy.Tests.UI/Constants/TestUser.cs
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions Lombiq.Privacy.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Lombiq.Privacy.Tests.UI.Constants;
using Lombiq.Tests.UI.Constants;
using Lombiq.Tests.UI.Extensions;
using Lombiq.Tests.UI.Services;
using OpenQA.Selenium;
using OrchardCore.Users.Models;
using Shouldly;
using System.Threading.Tasks;

Expand Down Expand Up @@ -101,22 +101,21 @@ public static async Task TestRegistrationConsentCheckboxAsync(this UITestContext
{
await context.EnablePrivacyConsentBannerFeatureAsync();
await context.EnablePrivacyRegistrationConsentFeatureAsync();
await context.SetUserRegistrationTypeAsync(UserRegistrationType.AllowRegistration);

await context.TestRegistrationConsentCheckboxContentAsync();

// Go to registration and create a new user.
await context.GoToRegistrationPageAsync();
await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_UserName"), TestUser.Name);
await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_UserName"), TestUser.UserName);
await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_Email"), TestUser.Email);
await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_Password"), TestUser.Password);
await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_ConfirmPassword"), TestUser.Password);
await context.SetCheckboxValueAsync(By.Id("RegisterUserForm_RegistrationCheckbox"));
await context.ClickReliablyOnSubmitAsync();

// Login with the created user.
await context.SignInDirectlyAsync(TestUser.Name);
(await context.GetCurrentUserNameAsync()).ShouldBe(TestUser.Name);
await context.SignInDirectlyAsync(TestUser.UserName);
(await context.GetCurrentUserNameAsync()).ShouldBe(TestUser.UserName);

// Check that, the consent banner doesn't come up after login.
await context.GoToHomePageAsync();
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="11.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="11.1.1-alpha.1.osoe-903" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions Lombiq.Privacy/Lombiq.Privacy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.CustomSettings" Version="2.0.0" />
<PackageReference Include="OrchardCore.Forms" Version="2.0.0" />
<PackageReference Include="OrchardCore.Liquid" Version="2.0.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0" />
<PackageReference Include="OrchardCore.Navigation" Version="2.0.0" />
<PackageReference Include="OrchardCore.Users" Version="2.0.0" />
<PackageReference Include="OrchardCore.CustomSettings" Version="2.1.0" />
<PackageReference Include="OrchardCore.Forms" Version="2.1.0" />
<PackageReference Include="OrchardCore.Liquid" Version="2.1.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.1.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="2.1.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.1.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.1.0" />
<PackageReference Include="OrchardCore.Navigation" Version="2.1.0" />
<PackageReference Include="OrchardCore.Users" Version="2.1.0" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.Privacy/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public sealed class RegistrationConsentStartup : StartupBase

public override void ConfigureServices(IServiceCollection services)
{
services.AddScoped<IDisplayDriver<RegisterUserForm>, RegistrationCheckboxDriver>();
services.AddDisplayDriver<RegisterUserForm, RegistrationCheckboxDriver>();
services.AddScoped<IRegistrationFormEvents, RegistrationFormEventHandler>();
services.AddDataMigration<PrivacyRegistrationConsentSettingsMigrations>();
services.AddNavigationProvider<PrivacyRegistrationConsentSettingsMenu>();
Expand Down
Loading