* 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>
182 lines
7.2 KiB
C#
182 lines
7.2 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.ContentEditing;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Services.ContentTypeEditing;
|
|
using Umbraco.Cms.Core.Web;
|
|
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 DocumentHybridCacheVariantsTests : UmbracoIntegrationTest
|
|
{
|
|
private string _englishIsoCode = "en-US";
|
|
private string _danishIsoCode = "da-DK";
|
|
private string _variantTitleAlias = "variantTitle";
|
|
private string _variantTitleName = "Variant Title";
|
|
private string _invariantTitleAlias = "invariantTitle";
|
|
private string _invariantTitleName = "Invariant Title";
|
|
|
|
private ILanguageService LanguageService => GetRequiredService<ILanguageService>();
|
|
|
|
private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
|
|
|
|
private IContentTypeEditingService ContentTypeEditingService => GetRequiredService<IContentTypeEditingService>();
|
|
|
|
private IUmbracoContextFactory UmbracoContextFactory => GetRequiredService<IUmbracoContextFactory>();
|
|
|
|
private IPublishedContentCache PublishedContentHybridCache => GetRequiredService<IPublishedContentCache>();
|
|
|
|
private IContent VariantPage { get; set; }
|
|
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddUmbracoHybridCache();
|
|
|
|
[SetUp]
|
|
public async Task Setup() => await CreateTestData();
|
|
|
|
[Test]
|
|
public async Task Can_Set_Invariant_Title()
|
|
{
|
|
// Arrange
|
|
await PublishedContentHybridCache.GetByIdAsync(VariantPage.Id, true);
|
|
var updatedInvariantTitle = "Updated Invariant Title";
|
|
var updatedVariantTitle = "Updated Variant Title";
|
|
|
|
var updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantProperties =
|
|
new[] { new PropertyValueModel { Alias = _invariantTitleAlias, Value = updatedInvariantTitle } },
|
|
Variants = new[]
|
|
{
|
|
new VariantModel
|
|
{
|
|
Culture = _englishIsoCode,
|
|
Name = "Updated English Name",
|
|
Properties =
|
|
new[]
|
|
{
|
|
new PropertyValueModel
|
|
{
|
|
Alias = _variantTitleAlias, Value = updatedVariantTitle
|
|
}
|
|
},
|
|
},
|
|
new VariantModel
|
|
{
|
|
Culture = _danishIsoCode,
|
|
Name = "Updated Danish Name",
|
|
Properties = new[]
|
|
{
|
|
new PropertyValueModel
|
|
{
|
|
Alias = _variantTitleAlias, Value = updatedVariantTitle
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
var result = await ContentEditingService.UpdateAsync(VariantPage.Key, updateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(result.Success);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(VariantPage.Id, true);
|
|
|
|
// Assert
|
|
using var contextReference = UmbracoContextFactory.EnsureUmbracoContext();
|
|
Assert.AreEqual(updatedInvariantTitle, textPage.Value(_invariantTitleAlias, "", ""));
|
|
Assert.AreEqual(updatedVariantTitle, textPage.Value(_variantTitleAlias, _englishIsoCode));
|
|
Assert.AreEqual(updatedVariantTitle, textPage.Value(_variantTitleAlias, _danishIsoCode));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Set_Invariant_Title_On_One_Culture()
|
|
{
|
|
// Arrange
|
|
await PublishedContentHybridCache.GetByIdAsync(VariantPage.Id, true);
|
|
var updatedInvariantTitle = "Updated Invariant Title";
|
|
var updatedVariantTitle = "Updated Invariant Title";
|
|
|
|
var updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantProperties =
|
|
new[] { new PropertyValueModel { Alias = _invariantTitleAlias, Value = updatedInvariantTitle } },
|
|
Variants = new[]
|
|
{
|
|
new VariantModel
|
|
{
|
|
Culture = _englishIsoCode,
|
|
Name = "Updated English Name",
|
|
Properties = new[]
|
|
{
|
|
new PropertyValueModel
|
|
{
|
|
Alias = _variantTitleAlias, Value = updatedVariantTitle
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
var result =
|
|
await ContentEditingService.UpdateAsync(VariantPage.Key, updateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(result.Success);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(VariantPage.Id, true);
|
|
|
|
// Assert
|
|
using var contextReference = UmbracoContextFactory.EnsureUmbracoContext();
|
|
Assert.AreEqual(updatedInvariantTitle, textPage.Value(_invariantTitleAlias, "", ""));
|
|
Assert.AreEqual(updatedVariantTitle, textPage.Value(_variantTitleAlias, _englishIsoCode));
|
|
Assert.AreEqual(_variantTitleName, textPage.Value(_variantTitleAlias, _danishIsoCode));
|
|
}
|
|
|
|
private async Task CreateTestData()
|
|
{
|
|
var language = new LanguageBuilder()
|
|
.WithCultureInfo(_danishIsoCode)
|
|
.Build();
|
|
await LanguageService.CreateAsync(language, Constants.Security.SuperUserKey);
|
|
|
|
var groupKey = Guid.NewGuid();
|
|
var contentType = new ContentTypeEditingBuilder()
|
|
.WithAlias("cultureVariationTest")
|
|
.WithName("Culture Variation Test")
|
|
.WithAllowAtRoot(true)
|
|
.WithVariesByCulture(true)
|
|
.AddPropertyType()
|
|
.WithAlias(_variantTitleAlias)
|
|
.WithName(_variantTitleName)
|
|
.WithVariesByCulture(true)
|
|
.WithContainerKey(groupKey)
|
|
.Done()
|
|
.AddPropertyType()
|
|
.WithAlias(_invariantTitleAlias)
|
|
.WithName(_invariantTitleName)
|
|
.WithContainerKey(groupKey)
|
|
.Done()
|
|
.AddPropertyGroup()
|
|
.WithName("content")
|
|
.WithKey(groupKey)
|
|
.Done()
|
|
.Build();
|
|
var contentTypeAttempt = await ContentTypeEditingService.CreateAsync(contentType, Constants.Security.SuperUserKey);
|
|
if (!contentTypeAttempt.Success)
|
|
{
|
|
throw new Exception("Failed to create content type");
|
|
}
|
|
|
|
var rootContentCreateModel = ContentEditingBuilder.CreateContentWithTwoVariantProperties(contentTypeAttempt.Result.Key, "en-US", "da-DK", _variantTitleAlias, _variantTitleName);
|
|
var result = await ContentEditingService.CreateAsync(rootContentCreateModel, Constants.Security.SuperUserKey);
|
|
VariantPage = result.Result.Content;
|
|
}
|
|
}
|