* 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>
184 lines
7.7 KiB
C#
184 lines
7.7 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.ContentEditing;
|
|
using Umbraco.Cms.Core.Models.ContentPublishing;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Services.ContentTypeEditing;
|
|
using Umbraco.Cms.Core.Services.OperationStatus;
|
|
using Umbraco.Cms.Tests.Common.Builders;
|
|
using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.PublishedCache.HybridCache;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
|
public class DocumentHybridCachePropertyTest : UmbracoIntegrationTest
|
|
{
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddUmbracoHybridCache();
|
|
|
|
private ICacheManager CacheManager => GetRequiredService<ICacheManager>();
|
|
|
|
private ITemplateService TemplateService => GetRequiredService<ITemplateService>();
|
|
|
|
private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
|
|
|
|
private IContentTypeEditingService ContentTypeEditingService => GetRequiredService<IContentTypeEditingService>();
|
|
|
|
private IContentPublishingService ContentPublishingService => GetRequiredService<IContentPublishingService>();
|
|
|
|
[Test]
|
|
public async Task Can_Get_Value_From_ContentPicker()
|
|
{
|
|
// Arrange
|
|
var template = TemplateBuilder.CreateTextPageTemplate();
|
|
await TemplateService.CreateAsync(template, Constants.Security.SuperUserKey);
|
|
var textPage = await CreateTextPageDocument(template.Key);
|
|
var contentPickerDocument = await CreateContentPickerDocument(template.Key, textPage.Key);
|
|
|
|
// Act
|
|
var contentPickerPage = await CacheManager.Content.GetByIdAsync(contentPickerDocument.Id);
|
|
|
|
// Assert
|
|
IPublishedContent contentPickerValue = (IPublishedContent)contentPickerPage.Value("contentPicker");
|
|
Assert.AreEqual(textPage.Key, contentPickerValue.Key);
|
|
Assert.AreEqual(textPage.Id, contentPickerValue.Id);
|
|
Assert.AreEqual(textPage.Name, contentPickerValue.Name);
|
|
Assert.AreEqual("The title value", contentPickerValue.Properties.First(x => x.Alias == "title").GetValue());
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Value_From_Updated_ContentPicker()
|
|
{
|
|
// Arrange
|
|
var template = TemplateBuilder.CreateTextPageTemplate();
|
|
await TemplateService.CreateAsync(template, Constants.Security.SuperUserKey);
|
|
var textPage = await CreateTextPageDocument(template.Key);
|
|
var contentPickerDocument = await CreateContentPickerDocument(template.Key, textPage.Key);
|
|
|
|
// Get for caching
|
|
var notUpdatedContent = await CacheManager.Content.GetByIdAsync(contentPickerDocument.Id);
|
|
|
|
IPublishedContent contentPickerValue = (IPublishedContent)notUpdatedContent.Value("contentPicker");
|
|
Assert.AreEqual("The title value", contentPickerValue.Properties.First(x => x.Alias == "title").GetValue());
|
|
|
|
// Update content
|
|
var updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = "Root Create",
|
|
InvariantProperties = new[]
|
|
{
|
|
new PropertyValueModel { Alias = "title", Value = "Updated title" },
|
|
new PropertyValueModel { Alias = "bodyText", Value = "The body text" }
|
|
},
|
|
};
|
|
|
|
var updateResult = await ContentEditingService.UpdateAsync(textPage.Key, updateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(updateResult.Success);
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(
|
|
updateResult.Result.Content!.Key,
|
|
new CultureAndScheduleModel()
|
|
{
|
|
CulturesToPublishImmediately = new HashSet<string> {"*"},
|
|
Schedules = new ContentScheduleCollection(),
|
|
},
|
|
Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(publishResult);
|
|
|
|
// Act
|
|
var contentPickerPage = await CacheManager.Content.GetByIdAsync(contentPickerDocument.Id);
|
|
|
|
// Assert
|
|
IPublishedContent updatedPickerValue = (IPublishedContent)contentPickerPage.Value("contentPicker");
|
|
Assert.AreEqual(textPage.Key, updatedPickerValue.Key);
|
|
Assert.AreEqual(textPage.Id, updatedPickerValue.Id);
|
|
Assert.AreEqual(textPage.Name, updatedPickerValue.Name);
|
|
Assert.AreEqual("Updated title", updatedPickerValue.Properties.First(x => x.Alias == "title").GetValue());
|
|
}
|
|
|
|
private async Task<IContent> CreateContentPickerDocument(Guid templateKey, Guid textPageKey)
|
|
{
|
|
var builder = new ContentTypeEditingBuilder();
|
|
var pickerContentType = builder
|
|
.WithAlias("test")
|
|
.WithName("TestName")
|
|
.WithAllowAtRoot(true)
|
|
.AddAllowedTemplateKeys([templateKey])
|
|
.AddPropertyGroup()
|
|
.WithName("Content")
|
|
.Done()
|
|
.AddPropertyType()
|
|
.WithAlias("contentPicker")
|
|
.WithName("Content Picker")
|
|
.WithDataTypeKey(Constants.DataTypes.Guids.ContentPickerGuid)
|
|
.WithSortOrder(16)
|
|
.Done()
|
|
.Build();
|
|
|
|
await ContentTypeEditingService.CreateAsync(pickerContentType, Constants.Security.SuperUserKey);
|
|
|
|
|
|
var createOtherModel = new ContentCreateModel
|
|
{
|
|
ContentTypeKey = pickerContentType.Key.Value,
|
|
ParentKey = Constants.System.RootKey,
|
|
InvariantName = "Test Create",
|
|
InvariantProperties = new[] { new PropertyValueModel { Alias = "contentPicker", Value = textPageKey }, },
|
|
};
|
|
|
|
var result = await ContentEditingService.CreateAsync(createOtherModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(result.Success);
|
|
Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status);
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(
|
|
result.Result.Content!.Key,
|
|
new CultureAndScheduleModel()
|
|
{
|
|
CulturesToPublishImmediately = new HashSet<string> {"*"},
|
|
Schedules = new ContentScheduleCollection(),
|
|
},
|
|
Constants.Security.SuperUserKey);
|
|
|
|
return result.Result.Content;
|
|
}
|
|
|
|
private async Task<IContent> CreateTextPageDocument(Guid templateKey)
|
|
{
|
|
var textContentType = ContentTypeEditingBuilder.CreateTextPageContentType(defaultTemplateKey: templateKey);
|
|
await ContentTypeEditingService.CreateAsync(textContentType, Constants.Security.SuperUserKey);
|
|
|
|
var createModel = new ContentCreateModel
|
|
{
|
|
ContentTypeKey = textContentType.Key.Value,
|
|
ParentKey = Constants.System.RootKey,
|
|
InvariantName = "Root Create",
|
|
InvariantProperties = new[]
|
|
{
|
|
new PropertyValueModel { Alias = "title", Value = "The title value" },
|
|
new PropertyValueModel { Alias = "bodyText", Value = "The body text" }
|
|
},
|
|
};
|
|
|
|
var createResult = await ContentEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(createResult.Success);
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(
|
|
createResult.Result.Content!.Key,
|
|
new CultureAndScheduleModel()
|
|
{
|
|
CulturesToPublishImmediately = new HashSet<string> {"*"},
|
|
Schedules = new ContentScheduleCollection(),
|
|
},
|
|
Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(publishResult.Success);
|
|
return createResult.Result.Content;
|
|
}
|
|
}
|