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

Jump to bottom

OSOE-641: Fix remaining issues for the Orchard Core 1.6 upgrade in UI-Testing-Toolbox #284

Merged
merged 4 commits into from
Jun 10, 2023
Merged

OSOE-641: Fix remaining issues for the Orchard Core 1.6 upgrade in UI-Testing-Toolbox #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7325810
Upgrading Lombiq.HelpfulLibraries.*
dministro Jun 9, 2023
63ae846
Fixing package reference version
dministro Jun 9, 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
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 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 @@ -50,7 +50,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.3-alpha.1.osoe-548" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.3-alpha.3.osoe-641" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 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,8 +58,8 @@
<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="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.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" />
Expand Down Expand Up @@ -90,9 +90,9 @@

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests" Version="2.2.2" />
<PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="5.1.3-alpha.1.osoe-548" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.3-alpha.1.osoe-548" />
<PackageReference Include="Lombiq.HelpfulLibraries.RestEase" Version="5.1.3-alpha.1.osoe-548" />
<PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="5.1.3-alpha.3.osoe-641" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.3-alpha.3.osoe-641" />
<PackageReference Include="Lombiq.HelpfulLibraries.RestEase" Version="5.1.3-alpha.3.osoe-641" />
<PackageReference Include="Lombiq.Npm.Targets" Version="1.3.1" />
<!--The reference for NodeJs Extensions is for the reason to prevent NuGet build
to use a PNPM version higher than 7.x.x. We need to upgrade solutions to use PNPM 8, also see
Expand Down
2 changes: 0 additions & 2 deletions Lombiq.Tests.UI/Models/VisualVerificationMatchApprovedContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ public VisualVerificationMatchApprovedContext(

BaselineImageFileName = configuration.BaselineFileNameFormatter(configuration, this);
BaselineImageResourceName = $"{testFrame.MethodInfo.DeclaringType!.Namespace}.{BaselineImageFileName}.png";
var testDirectory = new FileInfo(testFrame.GetFileName());
var testPath = testDirectory.Directory.FullName;

var testSourceDirectoryPath = Path.GetDirectoryName(testFrame.GetFileName());
if (!string.IsNullOrEmpty(testSourceDirectoryPath))
Expand Down