* Remove nucache reference from Web.Common * Get tests building-ish * Move ReservedFieldNamesService to the right project * Remove IPublishedSnapshotStatus * Added functionality to the INavigationQueryService to get root keys * Fixed issue with navigation * Remove IPublishedSnapshot from UmbracoContext * Begin removing usage of IPublishedSnapshot from PublishedContentExtensions * Fix PublishedContentExtensions.cs * Don't use snapshots in delivery media api * Use IPublishedMediaCache in QueryMediaApiController * Remove more usages of IPublishedSnapshotAccessor * Comment out tests * Remove more usages of PublishedSnapshotAccessor * Remove PublishedSnapshot from property * Fixed test build * Fix errors * Fix some tests * Delete NuCache 🎉 * Implement DatabaseCacheRebuilder * Remove usage of IPublishedSnapshotService * Remove IPublishedSnapshotService * Remove TestPublishedSnapshotAccessor and make tests build * Don't test Snapshot cachelevel It's no longer supported * Fix BlockEditorConverter Element != Element document type * Remember to set cachemanager * Fix RichTextParserTests * Implement TryGetLevel on INavigationQueryService * Fake level and obsolete it in PublishedContent * Remove ChildrenForAllCultures * Hack Path property on PublishedContent * Remove usages of IPublishedSnapshot in tests * More ConvertersTests * Add hybrid cache to integration tests We can actually do this now because we no longer save files on disk * Rename IPublishedSnapshotRebuilder to ICacheRebuilder * Comment out tests * V15: Replacing the usages of Parent (navigation data) from IPublishedContent (#17125) * Fix .Parent references in PublishedContentExtensions * Add missing methods to FriendlyPublishedContentExtensions (ones that you were able to call on the content directly as they now require extra params) * Fix references from the extension methods * Fix dependencies in tests * Replace IPublishedSnapshotAccessor with the content cache in tests * Resolving more .Parent references * Fix unit tests * Obsolete and use extension methods * Remove private method and use extension instead * Moving code around * Fix tests * Fix more references * Cleanup * Fix more usages * Resolve merge conflict * Fix tests * Cleanup * Fix more tests * Fixed unit tests * Cleanup * Replace last usages --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> * Remove usage of IPublishedSnapshotAccessor from IRequestItemProvider * Post merge fixup * Remo IPublishedSnapshot * Add HasAny to IDocumentUrlService * Fix TextBuilder * Fix modelsbuilder tests * Use explicit types * Implement GetByContentType * Support element types in PublishedContentTypeCache * Run enlistments before publishing notifications * Fix elements cache refreshing * Implement GetByUdi * Implement GetAtRoot * Implement GetByRoute * Reimplement GetRouteById * Fix blocks unit tests * Initialize domain cache on boot * Only return routes with domains on non default lanauges * V15: Replacing the usages of `Children` (navigation data) from `IPublishedContent` (#17159) * Update params in PublishedContentExtensions to the general interfaces for the published cache and navigation service, so that we can use the extension methods on both documents and media * Introduce GetParent() which uses the right services * Fix obsolete message on .Parent * Obsolete .Children * Fix usages of Children for ApiMediaQueryService * Fix usage in internal * Fix usages in views * Fix indentation * Fix issue with delete language * Update nuget pacakges * Clear elements cache when content is deleted instead of trying to update it * Reset publishedModelFactory * Fixed publishing --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: kjac <kja@umbraco.dk>
207 lines
7.2 KiB
C#
207 lines
7.2 KiB
C#
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.DeliveryApi;
|
|
using Umbraco.Cms.Core.Logging;
|
|
using Umbraco.Cms.Core.Models.Blocks;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PropertyEditors;
|
|
using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Infrastructure.Serialization;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
|
|
|
|
[TestFixture]
|
|
public class BlockGridPropertyValueConverterTests : BlockPropertyValueConverterTestsBase<BlockGridConfiguration>
|
|
{
|
|
protected override string PropertyEditorAlias => Constants.PropertyEditors.Aliases.BlockGrid;
|
|
|
|
[Test]
|
|
public void Get_Value_Type()
|
|
{
|
|
var editor = CreateConverter();
|
|
var config = ConfigForSingle();
|
|
var propertyType = GetPropertyType(config);
|
|
|
|
var valueType = editor.GetPropertyValueType(propertyType);
|
|
|
|
// the result is always block grid model
|
|
Assert.AreEqual(typeof(BlockGridModel), valueType);
|
|
}
|
|
|
|
[Test]
|
|
public void Convert_Valid_Json()
|
|
{
|
|
var editor = CreateConverter();
|
|
var config = ConfigForSingle(SettingKey1);
|
|
var propertyType = GetPropertyType(config);
|
|
var publishedElement = GetPublishedElement();
|
|
|
|
var json = @"
|
|
{
|
|
""layout"": {
|
|
""" + Constants.PropertyEditors.Aliases.BlockGrid + @""": [
|
|
{
|
|
""contentKey"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D"",
|
|
""settingsKey"": ""2D3529ED-B47B-4B10-9F6D-4B802DD5DFE2"",
|
|
""rowSpan"": 1,
|
|
""columnSpan"": 12,
|
|
""areas"": []
|
|
}
|
|
]
|
|
},
|
|
""contentData"": [
|
|
{
|
|
""contentTypeKey"": """ + ContentKey1 + @""",
|
|
""key"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D""
|
|
}
|
|
],
|
|
""settingsData"": [
|
|
{
|
|
""contentTypeKey"": """ + SettingKey1 + @""",
|
|
""key"": ""2D3529ED-B47B-4B10-9F6D-4B802DD5DFE2""
|
|
}
|
|
],
|
|
""expose"": [
|
|
{
|
|
""contentKey"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D""
|
|
}
|
|
]
|
|
}";
|
|
var converted =
|
|
editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as
|
|
BlockGridModel;
|
|
|
|
Assert.IsNotNull(converted);
|
|
Assert.AreEqual(1, converted.Count);
|
|
Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), converted[0].Content.Key);
|
|
Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), converted[0].ContentKey);
|
|
Assert.AreEqual(ContentAlias1, converted[0].Content.ContentType.Alias);
|
|
Assert.AreEqual(Guid.Parse("2D3529ED-B47B-4B10-9F6D-4B802DD5DFE2"), converted[0].Settings!.Key);
|
|
Assert.AreEqual(Guid.Parse("2D3529ED-B47B-4B10-9F6D-4B802DD5DFE2"), converted[0].SettingsKey);
|
|
Assert.AreEqual(SettingAlias1, converted[0].Settings.ContentType.Alias);
|
|
}
|
|
|
|
[Test]
|
|
public void Can_Convert_Without_Settings()
|
|
{
|
|
var editor = CreateConverter();
|
|
var config = ConfigForSingle();
|
|
var propertyType = GetPropertyType(config);
|
|
var publishedElement = GetPublishedElement();
|
|
|
|
var json = @"
|
|
{
|
|
""layout"": {
|
|
""" + Constants.PropertyEditors.Aliases.BlockGrid + @""": [
|
|
{
|
|
""contentKey"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D"",
|
|
""rowSpan"": 1,
|
|
""columnSpan"": 12,
|
|
""areas"": []
|
|
}
|
|
]
|
|
},
|
|
""contentData"": [
|
|
{
|
|
""contentTypeKey"": """ + ContentKey1 + @""",
|
|
""key"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D""
|
|
}
|
|
],
|
|
""expose"": [
|
|
{
|
|
""contentKey"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D""
|
|
}
|
|
]
|
|
}";
|
|
var converted =
|
|
editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as
|
|
BlockGridModel;
|
|
|
|
Assert.IsNotNull(converted);
|
|
Assert.AreEqual(1, converted.Count);
|
|
var item0 = converted[0].Content;
|
|
Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Key);
|
|
Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), converted[0].ContentKey);
|
|
Assert.AreEqual("Test1", item0.ContentType.Alias);
|
|
Assert.IsNull(converted[0].Settings);
|
|
}
|
|
|
|
[Test]
|
|
public void Ignores_Other_Layouts()
|
|
{
|
|
var editor = CreateConverter();
|
|
var config = ConfigForSingle();
|
|
var propertyType = GetPropertyType(config);
|
|
var publishedElement = GetPublishedElement();
|
|
|
|
var json = @"
|
|
{
|
|
""layout"": {
|
|
""" + Constants.PropertyEditors.Aliases.BlockGrid + @""": [
|
|
{
|
|
""contentKey"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D"",
|
|
""rowSpan"": 1,
|
|
""columnSpan"": 12,
|
|
""areas"": []
|
|
}
|
|
],
|
|
""" + Constants.PropertyEditors.Aliases.BlockList + @""": [
|
|
{
|
|
""contentKey"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D""
|
|
}
|
|
],
|
|
""Some.Custom.BlockEditor"": [
|
|
{
|
|
""contentKey"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D""
|
|
}
|
|
]
|
|
},
|
|
""contentData"": [
|
|
{
|
|
""contentTypeKey"": """ + ContentKey1 + @""",
|
|
""key"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D""
|
|
}
|
|
],
|
|
""expose"": [
|
|
{
|
|
""contentKey"": ""1304E1DD-AC87-4396-84FE-8A399231CB3D""
|
|
}
|
|
]
|
|
}";
|
|
var converted =
|
|
editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as
|
|
BlockGridModel;
|
|
|
|
Assert.IsNotNull(converted);
|
|
Assert.AreEqual(1, converted.Count);
|
|
var item0 = converted[0].Content;
|
|
Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Key);
|
|
Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), converted[0].ContentKey);
|
|
Assert.AreEqual("Test1", item0.ContentType.Alias);
|
|
Assert.IsNull(converted[0].Settings);
|
|
}
|
|
|
|
private BlockGridPropertyValueConverter CreateConverter()
|
|
{
|
|
var publishedModelFactory = new NoopPublishedModelFactory();
|
|
var blockVarianceHandler = new BlockEditorVarianceHandler(Mock.Of<ILanguageService>());
|
|
var editor = new BlockGridPropertyValueConverter(
|
|
Mock.Of<IProfilingLogger>(),
|
|
new BlockEditorConverter(GetPublishedContentTypeCache(), Mock.Of<ICacheManager>(), publishedModelFactory, Mock.Of<IVariationContextAccessor>(), blockVarianceHandler),
|
|
new SystemTextJsonSerializer(),
|
|
new ApiElementBuilder(Mock.Of<IOutputExpansionStrategyAccessor>()),
|
|
new BlockGridPropertyValueConstructorCache(),
|
|
Mock.Of<IVariationContextAccessor>(),
|
|
blockVarianceHandler);
|
|
return editor;
|
|
}
|
|
|
|
private BlockGridConfiguration ConfigForSingle(Guid? settingsElementTypeKey = null) => new()
|
|
{
|
|
Blocks = new[] { new BlockGridConfiguration.BlockGridBlockConfiguration { ContentElementTypeKey = ContentKey1, SettingsElementTypeKey = settingsElementTypeKey} },
|
|
};
|
|
}
|