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-548: Upgrade to Orchard Core 1.6 in UI-Testing-Toolbox #273

Merged
merged 50 commits into from
Jun 18, 2023
Merged

OSOE-548: Upgrade to Orchard Core 1.6 in UI-Testing-Toolbox #273

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8116ce8
Upgrading to OC 1.6
Psichorex Apr 25, 2023
cfb9124
Addressing deprecated method.
Psichorex Apr 25, 2023
053c450
Fixing test after OC 1.6 upgrade.
Psichorex Apr 28, 2023
f3c6396
Fixing UI Test
Psichorex Apr 28, 2023
cc2b2b1
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex Apr 29, 2023
0f98c94
Removing deprecated replacement for Orchard RecipeHarvesterAsync.
Psichorex Apr 30, 2023
b65ddda
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex May 12, 2023
df3ce04
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex May 17, 2023
df16fc4
Upgrading Lombiq.Tests to latest.
Psichorex May 19, 2023
ac4ffe2
Trying to revert pnpm-pnpm-lock 5.3 because of failing nuget build.
Psichorex May 19, 2023
1acd500
Reverting pnpm-lock to dev original.
Psichorex May 19, 2023
e9fe270
Referencing NodeJs Extensions for NugetBuild.
Psichorex May 20, 2023
ea04a61
Updating Lombiq.Tests package.
Psichorex May 20, 2023
885d41d
Removing reference.
Psichorex May 20, 2023
85f0cc9
Fix.
Psichorex May 20, 2023
85dadc8
Missing version number.
Psichorex May 20, 2023
1349e3c
Adding comment.
Psichorex May 20, 2023
090da5f
Update Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
Psichorex May 22, 2023
4682a11
Removing whitespace.
Psichorex May 22, 2023
bbd48bb
Node.js Extensions issue reference
Piedone May 22, 2023
9f817af
Updating to latest Lombiq alpha releases.
Psichorex May 22, 2023
98b806f
Merge branch 'issue/OSOE-548' of https://github.com/Lombiq/UI-Testing…
Psichorex May 22, 2023
88c9215
Removing mistakenly included "v" from versions.
Psichorex May 22, 2023
084cdf5
Removing mistakenly included "v" from versions.
Psichorex May 22, 2023
cc62c79
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex May 29, 2023
1e77d5d
Trying to get folder with different method.
Psichorex May 31, 2023
7325810
Upgrading Lombiq.HelpfulLibraries.*
dministro Jun 9, 2023
63ae846
Fixing package reference version
dministro Jun 9, 2023
bcc3613
Merge branch 'dev' of https://github.com/Lombiq/UI-Testing-Toolbox in…
dministro Jun 10, 2023
826321d
Merge branch 'issue/OSOE-548' of https://github.com/Lombiq/UI-Testing…
dministro Jun 10, 2023
3875b57
Removing unnecessary code
dministro Jun 10, 2023
2d811cf
Merge pull request #284 from Lombiq/issue/OSOE-641
Piedone Jun 10, 2023
4498e56
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex Jun 11, 2023
59fcc42
Updating Lombiq.Npm.Targets to latest alpha
Piedone Jun 11, 2023
874bfa6
Updating Lombiq.NodeJs.Extensions NuGet to latest alpha
Piedone Jun 11, 2023
eaf34f4
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 13, 2023
764f894
Merge remote-tracking branch 'origin/issue/OSOE-622' into issue/OSOE-548
Piedone Jun 14, 2023
e8f39c1
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 16, 2023
3b2b659
Updating Lombiq.HelpfulLibraries NuGet reference to latest alpha
Piedone Jun 16, 2023
32a9097
Add helpers to create By for content picker and interpolated CSS.
sarahelsaig Jun 17, 2023
ba49ec2
Add SetContentPickerByDisplayText
sarahelsaig Jun 17, 2023
a13f2ce
Add Async to the name
sarahelsaig Jun 17, 2023
9e0d6bb
Add GetCookieContainer extension.
sarahelsaig Jun 17, 2023
614ab98
unusing
sarahelsaig Jun 17, 2023
d17a7d7
Add FetchWithBrowserContextAsync extension method.
sarahelsaig Jun 17, 2023
a327b7a
Actually disable client checking.
sarahelsaig Jun 17, 2023
38ec58b
Code cleanup.
sarahelsaig Jun 17, 2023
14e683f
Merge pull request #288 from Lombiq/issue/OSOE-647
Piedone Jun 18, 2023
c48fbc7
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 18, 2023
81239ab
Updating Lombiq NuGet references to release versions
Piedone Jun 18, 2023
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
4 changes: 2 additions & 2 deletions Lombiq.Tests.UI.AppExtensions/Lombiq.Tests.UI.AppExtensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore" Version="1.5.0" />
<PackageReference Include="OrchardCore.Email.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore" Version="1.6.0" />
<PackageReference Include="OrchardCore.Email.Abstractions" Version="1.6.0" />
</ItemGroup>

</Project>
20 changes: 10 additions & 10 deletions Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.Tenants" Version="1.5.0" />
<PackageReference Include="OrchardCore.Themes" Version="1.5.0" />
<PackageReference Include="OrchardCore.Users" Version="1.5.0" />
<PackageReference Include="OrchardCore.Media.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.Recipes.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.ResourceManagement.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.Workflows" Version="1.5.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
<PackageReference Include="OrchardCore.Tenants" Version="1.6.0" />
<PackageReference Include="OrchardCore.Themes" Version="1.6.0" />
<PackageReference Include="OrchardCore.Users" Version="1.6.0" />
<PackageReference Include="OrchardCore.Media.Abstractions" Version="1.6.0" />
<PackageReference Include="OrchardCore.Recipes.Abstractions" Version="1.6.0" />
<PackageReference Include="OrchardCore.Abstractions" Version="1.6.0" />
<PackageReference Include="OrchardCore.ResourceManagement.Abstractions" Version="1.6.0" />
<PackageReference Include="OrchardCore.Workflows" Version="1.6.0" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
<ProjectReference Include="..\..\..\src\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.1" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Lombiq.Tests.UI/Extensions/TenantsUITestContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static async Task CreateTenantManuallyAsync(

if (!string.IsNullOrEmpty(featureProfile))
{
await context.SetDropdownByTextAsync("FeatureProfile", featureProfile);
await context.ClickReliablyOnAsync(By.XPath("//option[@value='Features Guard']"));
Piedone marked this conversation as resolved.
Show resolved Hide resolved
}

await context.ClickReliablyOnAsync(By.XPath("//button[contains(., 'Create')]"));
Expand Down
18 changes: 9 additions & 9 deletions Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
<PackageReference Include="Codeuctivity.ImageSharpCompare" Version="2.0.76" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.SqlServer.DACFx" Version="161.6319.0-preview" />
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.8.0" />
<PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-preview" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.5.0" />
<PackageReference Include="OrchardCore.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.Recipes.Core" Version="1.5.0" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.6.0" />
<PackageReference Include="OrchardCore.Abstractions" Version="1.6.0" />
<PackageReference Include="OrchardCore.Recipes.Core" Version="1.6.0" />
<PackageReference Include="Selenium.Axe" Version="4.0.5" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
Expand All @@ -90,10 +90,10 @@

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests" Version="2.2.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="5.1.1" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.1" />
<PackageReference Include="Lombiq.HelpfulLibraries.RestEase" Version="5.1.1" />
<PackageReference Include="Lombiq.Npm.Targets" Version="1.3.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="5.1.2" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.2" />
<PackageReference Include="Lombiq.HelpfulLibraries.RestEase" Version="5.1.2" />
<PackageReference Include="Lombiq.Npm.Targets" Version="1.3.1" />
</ItemGroup>

<!-- These are necessary for symbols NuGet packaging, otherwise Shouldly would prevent PDBs to be packaged, see:
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.Tests.UI/Services/OrchardCoreHosting/RecipeHarvesterAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ protected async Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync(string p
.ToAsyncEnumerable();

return await recipeFiles.SelectAwait(
async recipeFile => await _recipeReader.GetRecipeDescriptor(
async recipeFile => await _recipeReader.GetRecipeDescriptorAsync(
path,
recipeFile,
_hostingEnvironment.ContentRootFileProvider))
Expand Down