* Removing obsoleted code from ApiMediaQueryService.cs * Removing obsoleted code from ApiRichTextMarkupParserTests.cs * Removing obsoleted code from ContentCacheRefresher.cs * Removing obsoleted code from ContentFinderByUrlAlias.cs and adjusting its tests to use the new logic * Removing obsoleted code from ContentFinderByUrl.cs & its dependencies * Removing obsoleted code from ApiRichTextMarkupParserTests.cs * Removing obsoleted code from DocumentCache.cs & its dependencies * Removing obsoleted code from MediaCache.cs & its dependencies * Removing obsoleted code from PublishedCacheBase.cs & its dependencies * Removing obsoleted code from RenderNoContentController.cs and its tests * Removing obsoleted code from UmbracoRouteValueTransformer.cs * Removing obsoleted constructors from DefaultUrlProvider.cs * Removing accidental bookmark * Introducing a helper method to get the root keys in ApiMediaQueryService.cs * Removing obsoleted code from Cache classes * Removing unused imports * Refactoring to meet the CR * Added attribute to controller * Fixing missing using statement * Removing obsoleted constructor from ExternalLoginService.cs and making usages fit * Removing obsoleted method from IContentTypeFilter.cs * Removing obsoleted methods from IContentEditingService.cs * Removing obosoleted code from DocumentUrlService.cs * Removed obsoleted code from DataTypeService.cs * Removed obsoleted code from PublishStatusService.cs * Removing obsoleted code from the IContentPublishingService.cs and its dependencies. Also implementing a TODO in the service implementation * Removing obsoleted code from IRelationService.cs * Removing obsoleted code from ContentPublishingService.cs * Removing obsoleted code from ContentEditingService.cs * Removing obsoleted code from Constants-DataTypes.cs * Removing obsoleted code from IAction.cs and its implementations * Removing obsoleted code from IContentService.cs * Removing obsoleted code from DomainUtilities.cs * Removing obsoleted code from IIndexedEntitySearchService.cs and dependencies * Removing obsoleted code from UrlProvider.cs * Removing obsoleted code from AliasUrlProvider.cs * Removing obsoleted code from ApiContentRouteBuilder.cs * Removing obsoleted code from ApiPublishedContentCache.cs * Removing obsoleted class TemplateQueryResult.cs * Removing obsoleted code from ApiContentBuilder.cs * Removing obsoleted code from HealthCheck.cs * Removing obsoleted code from ContentTypeEditingService.cs * Removing obsoleted code from NewDefaultUrlProvider.cs * Removing obsoleted code from PublishedElementPropertyBase.cs * Removing obsoleted code from WebhookRequestService.cs * Bumping to obsolete in V18, due to usage in class that will be removed in V18 * Removing obsoleted code from PropertyValidationService.cs * Removing obsoleted code from AddUnroutableContentWarningsWhenPublishingNotificationHandler.cs * Removing obsoleted code from IMemberService.cs * Removing obsoleted code from DocumentCache.cs
185 lines
8.1 KiB
C#
185 lines
8.1 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Cache;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.ContentPublishing;
|
|
using Umbraco.Cms.Core.Notifications;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Services.ContentTypeEditing;
|
|
using Umbraco.Cms.Core.Sync;
|
|
using Umbraco.Cms.Tests.Common.Builders;
|
|
using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
|
using Umbraco.Cms.Tests.Common.TestHelpers;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.PublishedCache.HybridCache;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
|
internal sealed class DocumentHybridCacheAncestryVariantTests : 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 IContent rootContent;
|
|
private IContent childNode;
|
|
private IContent grandChildNode;
|
|
|
|
private ILanguageService LanguageService => GetRequiredService<ILanguageService>();
|
|
|
|
private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
|
|
|
|
private IContentTypeEditingService ContentTypeEditingService => GetRequiredService<IContentTypeEditingService>();
|
|
|
|
private IContentPublishingService ContentPublishingService => GetRequiredService<IContentPublishingService>();
|
|
|
|
private IPublishedContentCache PublishedContentCache => GetRequiredService<IPublishedContentCache>();
|
|
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder)
|
|
{
|
|
builder.AddNotificationHandler<ContentTreeChangeNotification, ContentTreeChangeDistributedCacheNotificationHandler>();
|
|
builder.Services.AddUnique<IServerMessenger, ContentEventsTests.LocalServerMessenger>();
|
|
}
|
|
|
|
[SetUp]
|
|
public async Task Setup() => await CreateTestData();
|
|
|
|
[Test]
|
|
[TestCase(true)]
|
|
[TestCase(false)]
|
|
public async Task AllCulturesUnpublished(bool preview)
|
|
{
|
|
// Publish branch in all cultures
|
|
var publishAttempt = await ContentPublishingService.PublishBranchAsync(rootContent.Key, [_englishIsoCode, _danishIsoCode], PublishBranchFilter.IncludeUnpublished, Constants.Security.SuperUserKey, false);
|
|
Assert.IsTrue(publishAttempt.Success);
|
|
Assert.That(publishAttempt.Result.SucceededItems.Count(), Is.EqualTo(3));
|
|
|
|
// Unpublish all cultures in child
|
|
var unpublishAttempt = await ContentPublishingService.UnpublishAsync(childNode.Key, new HashSet<string>([_englishIsoCode, _danishIsoCode]), Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(unpublishAttempt.Success);
|
|
|
|
var publishedGrandChild = await PublishedContentCache.GetByIdAsync(grandChildNode.Key, preview);
|
|
|
|
if (preview)
|
|
{
|
|
CacheTestsHelper.AssertPage(grandChildNode, publishedGrandChild, false);
|
|
}
|
|
else
|
|
{
|
|
Assert.IsNull(publishedGrandChild);
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task SingleCultureUnpublished()
|
|
{
|
|
var publishAttempt = await ContentPublishingService.PublishBranchAsync(rootContent.Key, [_englishIsoCode, _danishIsoCode], PublishBranchFilter.All, Constants.Security.SuperUserKey, false);
|
|
Assert.IsTrue(publishAttempt.Success);
|
|
Assert.That(publishAttempt.Result.SucceededItems.Count(), Is.EqualTo(3));
|
|
|
|
// Unpublish only english culture
|
|
var unpublishAttempt = await ContentPublishingService.UnpublishAsync(childNode.Key, new HashSet<string> { _englishIsoCode }, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(unpublishAttempt.Success);
|
|
|
|
var publishedGrandChild = await PublishedContentCache.GetByIdAsync(grandChildNode.Key, false);
|
|
CacheTestsHelper.AssertPage(grandChildNode, publishedGrandChild, false);
|
|
Assert.IsTrue(publishedGrandChild!.IsPublished(_danishIsoCode));
|
|
}
|
|
|
|
[Test]
|
|
public async Task SingleCulturePublished()
|
|
{
|
|
var publishAttempt = await ContentPublishingService.PublishAsync(
|
|
rootContent.Key,
|
|
new List<CulturePublishScheduleModel>
|
|
{
|
|
new() { Culture = _danishIsoCode },
|
|
new() { Culture = _englishIsoCode },
|
|
},
|
|
Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(publishAttempt.Success);
|
|
|
|
// Publish only single culture.
|
|
var publishChildAttempt = await ContentPublishingService.PublishAsync(
|
|
childNode.Key,
|
|
new List<CulturePublishScheduleModel>
|
|
{
|
|
new() { Culture = _danishIsoCode },
|
|
},
|
|
Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(publishChildAttempt.Success);
|
|
|
|
var publishGrandChildAttempt = await ContentPublishingService.PublishAsync(
|
|
grandChildNode.Key,
|
|
new List<CulturePublishScheduleModel>
|
|
{
|
|
new() { Culture = _danishIsoCode },
|
|
},
|
|
Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(publishGrandChildAttempt.Success);
|
|
|
|
var publishedGrandChild = await PublishedContentCache.GetByIdAsync(grandChildNode.Key, false);
|
|
|
|
CacheTestsHelper.AssertPage(grandChildNode, publishedGrandChild, false);
|
|
Assert.IsTrue(publishedGrandChild!.IsPublished(_danishIsoCode));
|
|
Assert.IsFalse(publishedGrandChild.IsPublished(_englishIsoCode));
|
|
}
|
|
|
|
private async Task CreateTestData()
|
|
{
|
|
var language = new LanguageBuilder()
|
|
.WithCultureInfo(_danishIsoCode)
|
|
.Build();
|
|
await LanguageService.CreateAsync(language, Constants.Security.SuperUserKey);
|
|
|
|
var contentTypeCreateModel = ContentTypeEditingBuilder.CreateContentTypeWithTwoPropertiesOneVariantAndOneInvariant(
|
|
"cultureVariationTest", "Culture Variation Test", _variantTitleAlias, _variantTitleName,
|
|
_invariantTitleAlias, _invariantTitleName);
|
|
contentTypeCreateModel.AllowedAsRoot = true;
|
|
var contentTypeAttempt = await ContentTypeEditingService.CreateAsync(contentTypeCreateModel, Constants.Security.SuperUserKey);
|
|
if (contentTypeAttempt.Success is false)
|
|
{
|
|
throw new Exception("Failed to create content type");
|
|
}
|
|
|
|
var contentType = contentTypeAttempt.Result!;
|
|
var updateModel = ContentTypeUpdateHelper.CreateContentTypeUpdateModel(contentType);
|
|
updateModel.AllowedContentTypes = [new ContentTypeSort { Alias = contentType.Alias, Key = contentType.Key, SortOrder = 0 }];
|
|
var updateAttempt = await ContentTypeEditingService.UpdateAsync(contentType, updateModel, Constants.Security.SuperUserKey);
|
|
if (updateAttempt.Success is false)
|
|
{
|
|
throw new Exception("Failed to update content type");
|
|
}
|
|
|
|
var contentCreateModel = ContentEditingBuilder.CreateContentWithTwoVariantProperties(
|
|
contentTypeAttempt.Result.Key,
|
|
_danishIsoCode,
|
|
_englishIsoCode,
|
|
_variantTitleAlias,
|
|
_variantTitleName);
|
|
|
|
var rootResult = await ContentEditingService.CreateAsync(contentCreateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(rootResult.Success);
|
|
rootContent = rootResult.Result.Content!;
|
|
|
|
contentCreateModel.ParentKey = rootContent.Key;
|
|
contentCreateModel.Key = Guid.NewGuid();
|
|
var childResult = await ContentEditingService.CreateAsync(contentCreateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(childResult.Success);
|
|
childNode = childResult.Result.Content!;
|
|
|
|
contentCreateModel.ParentKey = childNode.Key;
|
|
contentCreateModel.Key = Guid.NewGuid();
|
|
var grandChildResult = await ContentEditingService.CreateAsync(contentCreateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(grandChildResult.Success);
|
|
grandChildNode = grandChildResult.Result.Content!;
|
|
}
|
|
}
|