yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v12/dev' into v13/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
#	src/Umbraco.Core/CompatibilitySuppressions.xml
#	src/Umbraco.Infrastructure/CompatibilitySuppressions.xml
This commit is contained in:
Bjarke Berg
2023-04-19 11:23:50 +02:00
parent cb682e2f3e c06e89af64
commit fff393c9ed
182 changed files with 6893 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs
View File

@@ -8,6 +8,8 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core.DeliveryApi;
using Umbraco.Cms.Core.Models.DeliveryApi;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models;
@@ -36,7 +38,7 @@ public class NestedContentTests
PropertyEditorCollection editors = null;
var editor = new NestedContentPropertyEditor(
Mock.Of<IDataValueEditorFactory>(),
Mock.Of<IIOHelper>(),
Mock.Of<IIOHelper>(),
Mock.Of<IEditorConfigurationParser>(),
Mock.Of<INestedContentPropertyIndexValueFactory>());
editors = new PropertyEditorCollection(new DataEditorCollection(() => new DataEditor[] { editor }));
@@ -139,8 +141,8 @@ public class NestedContentTests
var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[]
{
new NestedContentSingleValueConverter(publishedSnapshotAccessor.Object, publishedModelFactory.Object, proflog),
new NestedContentManyValueConverter(publishedSnapshotAccessor.Object, publishedModelFactory.Object, proflog),
new NestedContentSingleValueConverter(publishedSnapshotAccessor.Object, publishedModelFactory.Object, proflog, Mock.Of<IApiElementBuilder>()),
new NestedContentManyValueConverter(publishedSnapshotAccessor.Object, publishedModelFactory.Object, proflog, Mock.Of<IApiElementBuilder>()),
});
var factory =
@@ -294,5 +296,8 @@ public class NestedContentTests
public override object GetXPathValue(string culture = null, string? segment = null) =>
throw new InvalidOperationException("This method won't be implemented.");
public override object GetDeliveryApiValue(bool expanding, string culture = null, string segment = null) =>
PropertyType.ConvertInterToDeliveryApiObject(_owner, ReferenceCacheLevel, InterValue, _preview);
}
}