Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/dev

# Conflicts: # src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs # src/Umbraco.Core/Composing/CompositionExtensions/Services.cs # src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs # src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs # src/Umbraco.Core/ContentEditing/HistoryCleanup.cs # src/Umbraco.Core/Models/ContentEditing/DocumentTypeDisplay.cs # src/Umbraco.Core/Models/ContentType.cs # src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs # src/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository.cs # src/Umbraco.Core/Scheduling/ContentVersionCleanup.cs # src/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy.cs # src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs # src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs # src/Umbraco.Infrastructure/Services/Implement/ContentService.cs # src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config # src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs # src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs # src/Umbraco.Tests/Umbraco.Tests.csproj # src/Umbraco.Web.UI.Client/package-lock.json # src/Umbraco.Web.UI/config/umbracoSettings.Release.config # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml # src/Umbraco.Web/Scheduling/SchedulerComponent.cs # src/Umbraco.Web/Umbraco.Web.csproj # tests/Umbraco.Tests.Common/Extensions/AutoMoqDataAttribute.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanup_Tests_UnitTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_Integration.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_UnitTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
2021-10-29 15:00:27 +02:00
parent 14fc4b6e25 698e6b1533
commit 53631ee48b
44 changed files with 3354 additions and 1063 deletions
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanupTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanupTest.cs
@@ -0,0 +1,117 @@
+using System;
+using System.Threading.Tasks;
+using AutoFixture.NUnit3;
+using Microsoft.Extensions.Options;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Runtime;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Sync;
+using Umbraco.Cms.Infrastructure.HostedServices;
+using Umbraco.Cms.Tests.UnitTests.AutoFixture;
+
+namespace Umbraco.Tests.Scheduling
+{
+    [TestFixture]
+    class ContentVersionCleanupTest
+    {
+        [Test, AutoMoqData]
+        public async Task ContentVersionCleanup_WhenNotEnabled_DoesNotCleanupWillRepeat(
+            [Frozen] Mock<IOptions<ContentSettings>> settings,
+            [Frozen] Mock<IMainDom> mainDom,
+            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+            [Frozen] Mock<IRuntimeState> runtimeState,
+            [Frozen] Mock<IContentVersionService> cleanupService,
+            ContentVersionCleanup sut)
+        {
+            settings.Setup(x => x.Value.ContentVersionCleanupPolicy.EnableCleanup).Returns(false);
+
+            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
+            mainDom.Setup(x => x.IsMainDom).Returns(true);
+            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
+
+            await sut.PerformExecuteAsync(null);
+
+            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
+        }
+
+        [Test, AutoMoqData]
+        public async Task ContentVersionCleanup_RuntimeLevelNotRun_DoesNotCleanupWillRepeat(
+            [Frozen] Mock<IOptions<ContentSettings>> settings,
+            [Frozen] Mock<IMainDom> mainDom,
+            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+            [Frozen] Mock<IRuntimeState> runtimeState,
+            [Frozen] Mock<IContentVersionService> cleanupService,
+            ContentVersionCleanup sut)
+        {
+            settings.Setup(x => x.Value.ContentVersionCleanupPolicy.EnableCleanup).Returns(true);
+            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Unknown);
+            mainDom.Setup(x => x.IsMainDom).Returns(true);
+            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
+
+            await sut.PerformExecuteAsync(null);
+
+            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
+        }
+
+        [Test, AutoMoqData]
+        public async Task  ContentVersionCleanup_ServerRoleUnknown_DoesNotCleanupWillRepeat(
+            [Frozen] Mock<IOptions<ContentSettings>> settings,
+            [Frozen] Mock<IMainDom> mainDom,
+            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+            [Frozen] Mock<IRuntimeState> runtimeState,
+            [Frozen] Mock<IContentVersionService> cleanupService,
+            ContentVersionCleanup sut)
+        {
+            settings.Setup(x => x.Value.ContentVersionCleanupPolicy.EnableCleanup).Returns(true);
+            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
+            mainDom.Setup(x => x.IsMainDom).Returns(true);
+            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.Unknown);
+
+            await sut.PerformExecuteAsync(null);
+
+            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
+        }
+
+        [Test, AutoMoqData]
+        public async Task ContentVersionCleanup_NotMainDom_DoesNotCleanupWillNotRepeat(
+            [Frozen] Mock<IOptions<ContentSettings>> settings,
+            [Frozen] Mock<IMainDom> mainDom,
+            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+            [Frozen] Mock<IRuntimeState> runtimeState,
+            [Frozen] Mock<IContentVersionService> cleanupService,
+            ContentVersionCleanup sut)
+        {
+            settings.Setup(x => x.Value.ContentVersionCleanupPolicy.EnableCleanup).Returns(true);
+            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
+            mainDom.Setup(x => x.IsMainDom).Returns(false);
+            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
+
+            await sut.PerformExecuteAsync(null);
+
+            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
+        }
+
+        [Test, AutoMoqData]
+        public async Task ContentVersionCleanup_Enabled_DelegatesToCleanupService(
+            [Frozen] Mock<IOptions<ContentSettings>> settings,
+            [Frozen] Mock<IMainDom> mainDom,
+            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+            [Frozen] Mock<IRuntimeState> runtimeState,
+            [Frozen] Mock<IContentVersionService> cleanupService,
+            ContentVersionCleanup sut)
+        {
+            settings.Setup(x => x.Value.ContentVersionCleanupPolicy.EnableCleanup).Returns(true);
+            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
+            mainDom.Setup(x => x.IsMainDom).Returns(true);
+            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
+
+
+            await sut.PerformExecuteAsync(null);
+
+            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Once);
+        }
+    }
+}