Fix schedule state and improved test namings.

backend/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs

@@ -81,6 +81,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.State
 
                 case ContentStatusChanged e:
                     {
+                        ScheduleJob = null;
+
                         if (NewVersion != null)
                         {
                             if (e.Status == Status.Published)

backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppDomainObjectTests.cs

@@ -88,7 +88,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task Create_should_create_events_and_update_state()
+        public async Task Create_should_create_events_and_set_intitial_state()
         {
             var command = new CreateApp { Name = AppName, AppId = AppId };
 
@@ -127,7 +127,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task Update_should_create_events_and_update_state()
+        public async Task Update_should_create_events_and_update_label_and_description()
         {
             var command = new UpdateApp { Label = "my-label", Description = "my-description" };
 
@@ -147,7 +147,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task UploadImage_should_create_events_and_update_state()
+        public async Task UploadImage_should_create_events_and_update_image()
         {
             var command = new UploadAppImage { File = new AssetFile("image.png", "image/png", 100, () => new MemoryStream()) };
 
@@ -166,7 +166,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task RemoveImage_should_create_events_and_update_state()
+        public async Task RemoveImage_should_create_events_and_update_image()
         {
             var command = new RemoveAppImage();
 
@@ -186,7 +186,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task ChangePlan_should_create_events_and_update_state()
+        public async Task ChangePlan_should_create_events_and_update_plan()
         {
             var command = new ChangePlan { PlanId = planIdPaid };
 
@@ -208,7 +208,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task ChangePlan_from_callback_should_create_events_and_update_state()
+        public async Task ChangePlan_from_callback_should_create_events_and_update_plan()
         {
             var command = new ChangePlan { PlanId = planIdPaid, FromCallback = true };
 
@@ -314,7 +314,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task AssignContributor_should_create_events_and_update_state()
+        public async Task AssignContributor_should_create_events_and_add_contributor()
         {
             var command = new AssignContributor { ContributorId = contributorId, Role = Role.Editor };
 
@@ -333,7 +333,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task AssignContributor_should_create_update_events_and_update_state()
+        public async Task AssignContributor_should_create_update_events_and_update_contributor()
         {
             var command = new AssignContributor { ContributorId = contributorId, Role = Role.Owner };
 
@@ -353,7 +353,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task RemoveContributor_should_create_events_and_update_state()
+        public async Task RemoveContributor_should_create_events_and_remove_contributor()
         {
             var command = new RemoveContributor { ContributorId = contributorId };
 
@@ -373,7 +373,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task AttachClient_should_create_events_and_update_state()
+        public async Task AttachClient_should_create_events_and_add_client()
         {
             var command = new AttachClient { Id = clientId };
 
@@ -392,7 +392,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task UpdateClient_should_create_events_and_update_state()
+        public async Task UpdateClient_should_create_events_and_update_client()
         {
             var command = new UpdateClient { Id = clientId, Name = clientNewName, Role = Role.Developer };
 
@@ -413,7 +413,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task RevokeClient_should_create_events_and_update_state()
+        public async Task RevokeClient_should_create_events_and_remove_client()
         {
             var command = new RevokeClient { Id = clientId };
 
@@ -433,7 +433,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task AddWorkflow_should_create_events_and_update_state()
+        public async Task AddWorkflow_should_create_events_and_add_workflow()
         {
             var command = new AddWorkflow { WorkflowId = workflowId, Name = "my-workflow" };
 
@@ -452,7 +452,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task UpdateWorkflow_should_create_events_and_update_state()
+        public async Task UpdateWorkflow_should_create_events_and_update_workflow()
         {
             var command = new UpdateWorkflow { WorkflowId = workflowId, Workflow = Workflow.Default };
 
@@ -472,7 +472,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task DeleteWorkflow_should_create_events_and_update_state()
+        public async Task DeleteWorkflow_should_create_events_and_remove_workflow()
         {
             var command = new DeleteWorkflow { WorkflowId = workflowId };
 
@@ -492,7 +492,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task AddLanguage_should_create_events_and_update_state()
+        public async Task AddLanguage_should_create_events_and_add_language()
         {
             var command = new AddLanguage { Language = Language.DE };
 
@@ -511,7 +511,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task RemoveLanguage_should_create_events_and_update_state()
+        public async Task RemoveLanguage_should_create_events_and_remove_language()
         {
             var command = new RemoveLanguage { Language = Language.DE };
 
@@ -531,7 +531,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task UpdateLanguage_should_create_events_and_update_state()
+        public async Task UpdateLanguage_should_create_events_and_update_language()
         {
             var command = new UpdateLanguage { Language = Language.DE, Fallback = new List<Language> { Language.EN } };
 
@@ -551,7 +551,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task AddRole_should_create_events_and_update_state()
+        public async Task AddRole_should_create_events_and_add_role()
         {
             var command = new AddRole { Name = roleName };
 
@@ -570,7 +570,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task DeleteRole_should_create_events_and_update_state()
+        public async Task DeleteRole_should_create_events_and_delete_role()
         {
             var command = new DeleteRole { Name = roleName };
 
@@ -590,7 +590,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task UpdateRole_should_create_events_and_update_state()
+        public async Task UpdateRole_should_create_events_and_update_role()
         {
             var command = new UpdateRole { Name = roleName, Permissions = new[] { "clients.read" } };
 
@@ -608,7 +608,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task AddPattern_should_create_events_and_update_state()
+        public async Task AddPattern_should_create_events_and_add_pattern()
         {
             var command = new AddPattern { PatternId = patternId3, Name = "Any", Pattern = ".*", Message = "Msg" };
 
@@ -627,7 +627,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task DeletePattern_should_create_events_and_update_state()
+        public async Task DeletePattern_should_create_events_and_update_pattern()
         {
             var command = new DeletePattern { PatternId = patternId3 };
 
@@ -647,7 +647,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task UpdatePattern_should_create_events_and_update_state()
+        public async Task UpdatePattern_should_create_events_and_remove_pattern()
         {
             var command = new UpdatePattern { PatternId = patternId3, Name = "Any", Pattern = ".*", Message = "Msg" };
 
@@ -665,7 +665,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
         }
 
         [Fact]
-        public async Task ArchiveApp_should_create_events_and_update_state()
+        public async Task ArchiveApp_should_create_events_and_update_archived_flag()
         {
             var command = new ArchiveApp();
 
@@ -675,6 +675,8 @@ namespace Squidex.Domain.Apps.Entities.Apps
 
             result.ShouldBeEquivalent(new EntitySavedResult(4));
 
+            Assert.True(sut.Snapshot.IsArchived);
+
             LastEvents
                 .ShouldHaveSameEvents(
                     CreateEvent(new AppArchived())

backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetDomainObjectTests.cs

@@ -61,7 +61,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task Create_should_create_events_and_update_state()
+        public async Task Create_should_create_events_and_set_intitial_state()
         {
             var command = new CreateAsset { File = file, FileHash = "NewHash" };
 
@@ -89,7 +89,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task Update_should_create_events_and_update_state()
+        public async Task Update_should_create_events_and_update_file_state()
         {
             var command = new UpdateAsset { File = file, FileHash = "NewHash" };
 
@@ -116,7 +116,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task AnnotateName_should_create_events_and_update_state()
+        public async Task AnnotateName_should_create_events_and_update_file_name()
         {
             var command = new AnnotateAsset { FileName = "My New Image.png" };
 
@@ -135,7 +135,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task AnnotateSlug_should_create_events_and_update_state()
+        public async Task AnnotateSlug_should_create_events_and_update_slug()
         {
             var command = new AnnotateAsset { Slug = "my-new-image.png" };
 
@@ -154,7 +154,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task AnnotateProtected_should_create_events_and_update_state()
+        public async Task AnnotateProtected_should_create_events_and_update_protected_flag()
         {
             var command = new AnnotateAsset { IsProtected = true };
 
@@ -173,7 +173,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task AnnotateMetadata_should_create_events_and_update_state()
+        public async Task AnnotateMetadata_should_create_events_and_update_metadata()
         {
             var command = new AnnotateAsset { Metadata = new AssetMetadata().SetPixelWidth(800) };
 
@@ -192,7 +192,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task AnnotateTags_should_create_events_and_update_state()
+        public async Task AnnotateTags_should_create_events_and_update_tags()
         {
             var command = new AnnotateAsset { Tags = new HashSet<string> { "tag1" } };
 
@@ -209,7 +209,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task Move_should_create_events_and_update_state()
+        public async Task Move_should_create_events_and_update_parent_id()
         {
             var command = new MoveAsset { ParentId = parentId };
 
@@ -228,7 +228,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task Delete_should_create_events_with_total_file_size()
+        public async Task Delete_should_create_events_with_total_file_size_and_update_deleted_flag()
         {
             var command = new DeleteAsset();
 

backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetFolderDomainObjectTests.cs

@@ -51,7 +51,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
         }
 
         [Fact]
-        public async Task Create_should_create_events_and_update_state()
+        public async Task Create_should_create_events_and_set_intitial_state()
         {
             var command = new CreateAssetFolder { FolderName = "New Name" };
 

backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsGrainTests.cs

@@ -74,7 +74,7 @@ namespace Squidex.Domain.Apps.Entities.Comments
         }
 
         [Fact]
-        public async Task Update_should_create_events_and_update_state()
+        public async Task Update_should_create_events()
         {
             await ExecuteCreateAsync();
 
@@ -109,7 +109,7 @@ namespace Squidex.Domain.Apps.Entities.Comments
         }
 
         [Fact]
-        public async Task Delete_should_create_events_and_update_state()
+        public async Task Delete_should_create_events()
         {
             await ExecuteCreateAsync();
             await ExecuteUpdateAsync();

backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs

@@ -143,7 +143,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
         }
 
         [Fact]
-        public async Task Create_should_also_publish()
+        public async Task Create_should_create_events_and_update_status_when_publishing()
         {
             var command = new CreateContent { Data = data, Publish = true };
 
@@ -310,7 +310,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
         }
 
         [Fact]
-        public async Task ChangeStatus_should_create_events_and_update_status()
+        public async Task ChangeStatus_should_create_events_and_update_status_when_published()
         {
             var command = new ChangeContentStatus { Status = Status.Published };
 
@@ -324,7 +324,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
 
             LastEvents
                 .ShouldHaveSameEvents(
-                    CreateContentEvent(new ContentStatusChanged { Change = StatusChange.Published, Status = Status.Published })
+                    CreateContentEvent(new ContentStatusChanged { Status = Status.Published, Change = StatusChange.Published })
                 );
 
             A.CallTo(() => scriptEngine.Execute(ScriptContext(data, null, Status.Published, Status.Draft), "<change-script>"))
@@ -332,31 +332,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
         }
 
         [Fact]
-        public async Task ChangeStatus_should_create_events_and_update_new_version_when_draft_available()
+        public async Task ChangeStatus_should_create_events_and_update_status_when_changed()
-        {
-            var command = new ChangeContentStatus { Status = Status.Archived };
-
-            await ExecuteCreateAsync();
-            await ExecutePublishAsync();
-            await ExecuteCreateDraftAsync();
-
-            var result = await PublishAsync(CreateContentCommand(command));
-
-            result.ShouldBeEquivalent(sut.Snapshot);
-
-            Assert.Equal(Status.Archived, sut.Snapshot.NewVersion?.Status);
-
-            LastEvents
-                .ShouldHaveSameEvents(
-                    CreateContentEvent(new ContentStatusChanged { Change = StatusChange.Change, Status = Status.Archived })
-                );
-
-            A.CallTo(() => scriptEngine.Execute(ScriptContext(data, null, Status.Archived, Status.Draft), "<change-script>"))
-                .MustHaveHappened();
-        }
-
-        [Fact]
-        public async Task ChangeStatus_should_create_events_and_update_state_when_archived()
         {
             var command = new ChangeContentStatus { Status = Status.Archived };
 
@@ -378,7 +354,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
         }
 
         [Fact]
-        public async Task ChangeStatus_should_create_events_and_update_state_when_unpublished()
+        public async Task ChangeStatus_should_create_events_and_update_status_when_unpublished()
         {
             var command = new ChangeContentStatus { Status = Status.Draft };
 
@@ -393,7 +369,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
 
             LastEvents
                 .ShouldHaveSameEvents(
-                    CreateContentEvent(new ContentStatusChanged { Change = StatusChange.Unpublished, Status = Status.Draft })
+                    CreateContentEvent(new ContentStatusChanged { Status = Status.Draft, Change = StatusChange.Unpublished })
                 );
 
             A.CallTo(() => scriptEngine.Execute(ScriptContext(data, null, Status.Draft, Status.Published), "<change-script>"))
@@ -401,84 +377,91 @@ namespace Squidex.Domain.Apps.Entities.Contents
         }
 
         [Fact]
-        public async Task ChangeStatus_should_create_events_and_update_state_when_restored()
+        public async Task ChangeStatus_should_create_events_and_update_new_version_when_draft_available()
         {
-            var command = new ChangeContentStatus { Status = Status.Draft };
+            var command = new ChangeContentStatus { Status = Status.Archived };
 
             await ExecuteCreateAsync();
-            await ExecuteArchiveAsync();
+            await ExecutePublishAsync();
+            await ExecuteCreateDraftAsync();
 
             var result = await PublishAsync(CreateContentCommand(command));
 
             result.ShouldBeEquivalent(sut.Snapshot);
 
-            Assert.Equal(Status.Draft, sut.Snapshot.CurrentVersion.Status);
+            Assert.Equal(Status.Archived, sut.Snapshot.NewVersion?.Status);
 
             LastEvents
                 .ShouldHaveSameEvents(
-                    CreateContentEvent(new ContentStatusChanged { Status = Status.Draft })
+                    CreateContentEvent(new ContentStatusChanged { Change = StatusChange.Change, Status = Status.Archived })
                 );
 
-            A.CallTo(() => scriptEngine.Execute(ScriptContext(data, null, Status.Draft, Status.Archived), "<change-script>"))
+            A.CallTo(() => scriptEngine.Execute(ScriptContext(data, null, Status.Archived, Status.Draft), "<change-script>"))
                 .MustHaveHappened();
         }
 
         [Fact]
-        public async Task ChangeStatus_should_create_proposal_events_and_update_state()
+        public async Task ChangeStatus_create_events_and_set_schedule_when_duetime_set()
         {
-            var command = new ChangeContentStatus { Status = Status.Published };
+            var dueTime = Instant.MaxValue;
+
+            var command = new ChangeContentStatus { Status = Status.Published, DueTime = dueTime };
 
             await ExecuteCreateAsync();
-            await ExecutePublishAsync();
-            await ExecuteCreateDraftAsync();
 
             var result = await PublishAsync(CreateContentCommand(command));
 
             result.ShouldBeEquivalent(sut.Snapshot);
 
-            Assert.Null(sut.Snapshot.NewVersion);
+            Assert.Equal(Status.Draft, sut.Snapshot.CurrentVersion.Status);
+            Assert.Equal(Status.Published, sut.Snapshot.ScheduleJob?.Status);
+
+            Assert.Equal(dueTime, sut.Snapshot.ScheduleJob?.DueTime);
 
             LastEvents
                 .ShouldHaveSameEvents(
-                    CreateContentEvent(new ContentStatusChanged { Status = Status.Published, Change = StatusChange.Published })
+                    CreateContentEvent(new ContentStatusScheduled { Status = Status.Published, DueTime = dueTime })
                 );
 
-            A.CallTo(() => scriptEngine.Execute(A<ScriptContext>._, "<update-script>"))
+            A.CallTo(() => scriptEngine.Execute(A<ScriptContext>._, "<change-script>"))
                 .MustNotHaveHappened();
         }
 
         [Fact]
-        public async Task ChangeStatus_should_refresh_properties_and_create_scheduled_events_when_command_has_due_time()
+        public async Task ChangeStatus_should_refresh_properties_and_unset_schedule_when_completed()
         {
             var dueTime = Instant.MaxValue;
 
-            var command = new ChangeContentStatus { Status = Status.Published, DueTime = dueTime };
-
             await ExecuteCreateAsync();
+            await ExecuteChangeStatusAsync(Status.Archived, dueTime);
+
+            var command = new ChangeContentStatus { Status = Status.Archived, JobId = sut.Snapshot.ScheduleJob!.Id };
+
+            A.CallTo(() => contentWorkflow.CanMoveToAsync(A<IContentEntity>._, Status.Draft, Status.Archived, User))
+                .Returns(true);
 
             var result = await PublishAsync(CreateContentCommand(command));
 
             result.ShouldBeEquivalent(sut.Snapshot);
 
-            Assert.Equal(Status.Draft, sut.Snapshot.CurrentVersion.Status);
+            Assert.Null(sut.Snapshot.ScheduleJob);
-            Assert.Equal(Status.Published, sut.Snapshot.ScheduleJob?.Status);
-
-            Assert.Equal(dueTime, sut.Snapshot.ScheduleJob?.DueTime);
 
             LastEvents
                 .ShouldHaveSameEvents(
-                    CreateContentEvent(new ContentStatusScheduled { Status = Status.Published, DueTime = dueTime })
+                    CreateContentEvent(new ContentStatusChanged { Status = Status.Archived })
                 );
 
             A.CallTo(() => scriptEngine.Execute(A<ScriptContext>._, "<change-script>"))
-                .MustNotHaveHappened();
+                .MustHaveHappened();
         }
 
         [Fact]
-        public async Task ChangeStatus_should_refresh_properties_and_revert_scheduling_when_invoked_by_scheduler()
+        public async Task ChangeStatus_should_create_events_and_unset_schedule_when_failed()
         {
+            var dueTime = Instant.MaxValue;
+
             await ExecuteCreateAsync();
-            await ExecuteChangeStatusAsync(Status.Published, Instant.MaxValue);
+            await ExecuteChangeStatusAsync(Status.Published, dueTime);
 
             var command = new ChangeContentStatus { Status = Status.Published, JobId = sut.Snapshot.ScheduleJob!.Id };
 
@@ -501,7 +484,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
         }
 
         [Fact]
-        public async Task Delete_should_update_properties_and_create_events()
+        public async Task Delete_should_create_events_and_update_deleted_flag()
         {
             var command = new DeleteContent();
 
@@ -523,7 +506,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
         }
 
         [Fact]
-        public async Task CreateDraft_should_create_events_and_update_state()
+        public async Task CreateDraft_should_create_events_and_update_new_state()
         {
             var command = new CreateContentDraft();
 
@@ -543,7 +526,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
         }
 
         [Fact]
-        public async Task DeleteDraft_should_update_properties_and_create_events()
+        public async Task DeleteDraft_should_create_events_and_delete_new_version()
         {
             var command = new DeleteContentDraft();
 
@@ -588,11 +571,6 @@ namespace Squidex.Domain.Apps.Entities.Contents
             return PublishAsync(CreateContentCommand(new DeleteContent()));
         }
 
-        private Task ExecuteArchiveAsync()
-        {
-            return PublishAsync(CreateContentCommand(new ChangeContentStatus { Status = Status.Archived }));
-        }
-
         private Task ExecutePublishAsync()
         {
             return PublishAsync(CreateContentCommand(new ChangeContentStatus { Status = Status.Published }));

backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs

@@ -55,7 +55,7 @@ namespace Squidex.Domain.Apps.Entities.Rules
         }
 
         [Fact]
-        public async Task Create_should_create_events_and_update_state()
+        public async Task Create_should_create_events_and_set_intitial_state()
         {
             var command = MakeCreateCommand();
 
@@ -75,7 +75,7 @@ namespace Squidex.Domain.Apps.Entities.Rules
         }
 
         [Fact]
-        public async Task Update_should_create_events_and_update_state()
+        public async Task Update_should_create_events_and_update_trigger_and_action()
         {
             var command = MakeUpdateCommand();
 
@@ -97,7 +97,7 @@ namespace Squidex.Domain.Apps.Entities.Rules
         }
 
         [Fact]
-        public async Task Enable_should_create_events_and_update_state()
+        public async Task Enable_should_create_events_and_update_enabled_flag()
         {
             var command = new EnableRule();
 
@@ -117,7 +117,7 @@ namespace Squidex.Domain.Apps.Entities.Rules
         }
 
         [Fact]
-        public async Task Disable_should_create_events_and_update_state()
+        public async Task Disable_should_create_events_and_update_enabled_flag()
         {
             var command = new DisableRule();
 
@@ -136,7 +136,7 @@ namespace Squidex.Domain.Apps.Entities.Rules
         }
 
         [Fact]
-        public async Task Delete_should_update_create_events()
+        public async Task Delete_should_create_events_and_update_deleted_flag()
         {
             var command = new DeleteRule();
 

backend/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaDomainObjectTests.cs

@@ -53,7 +53,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Create_should_create_schema_and_create_events()
+        public async Task Create_should_create_events_and_set_intitial_state()
         {
             var properties = new SchemaProperties();
 
@@ -76,7 +76,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Create_should_create_schema_with_initial_fields()
+        public async Task Create_should_create_events_and_schema_with_initial_fields()
         {
             var properties = new SchemaProperties();
 
@@ -113,7 +113,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Update_should_create_events_and_update_state()
+        public async Task Update_should_create_events_and_update_schema_properties()
         {
             var command = new UpdateSchema { Properties = new SchemaProperties { Label = "My Properties" } };
 
@@ -132,7 +132,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task ConfigureScripts_should_create_events()
+        public async Task ConfigureScripts_should_create_events_and_update_schema_scripts()
         {
             var command = new ConfigureScripts
             {
@@ -155,7 +155,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task ConfigureUIFields_should_create_events_for_list_fields()
+        public async Task ConfigureUIFields_should_create_events_for_list_fields_and_update_schema()
         {
             var command = new ConfigureUIFields
             {
@@ -178,7 +178,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task ConfigureUIFields_should_create_events_for_reference_fields()
+        public async Task ConfigureUIFields_should_create_events_for_reference_fields_and_update_schema()
         {
             var command = new ConfigureUIFields
             {
@@ -201,7 +201,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Publish_should_create_events_and_update_state()
+        public async Task Publish_should_create_events_and_update_published_flag()
         {
             var command = new PublishSchema();
 
@@ -220,7 +220,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Unpublish_should_create_events_and_update_state()
+        public async Task Unpublish_should_create_events_and_update_published_flag()
         {
             var command = new UnpublishSchema();
 
@@ -240,7 +240,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task ChangeCategory_should_create_events_and_update_state()
+        public async Task ChangeCategory_should_create_events_and_update_category()
         {
             var command = new ChangeCategory { Name = "my-category" };
 
@@ -259,7 +259,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task ConfigurePreviewUrls_should_create_events_and_update_state()
+        public async Task ConfigurePreviewUrls_should_create_events_and_update_preview_urls()
         {
             var command = new ConfigurePreviewUrls
             {
@@ -284,7 +284,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Delete_should_create_events_and_update_state()
+        public async Task Delete_should_create_events_and_update_deleted_flag()
         {
             var command = new DeleteSchema();
 
@@ -303,7 +303,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Reorder_should_create_events_and_update_state()
+        public async Task Reorder_should_create_events_and_reorder_fields()
         {
             var command = new ReorderFields { FieldIds = new List<long> { 2, 1 } };
 
@@ -322,7 +322,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Reorder_should_create_events_and_update_state_for_array()
+        public async Task Reorder_should_create_events_and_reorder_nestedy_fields()
         {
             var command = new ReorderFields { ParentFieldId = 1, FieldIds = new List<long> { 3, 2 } };
 
@@ -342,7 +342,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Add_should_create_events_and_update_state()
+        public async Task Add_should_create_events_and_add_field()
         {
             var command = new AddField { Name = fieldName, Properties = ValidProperties() };
 
@@ -361,7 +361,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Add_should_create_events_and_update_state_for_array()
+        public async Task Add_should_create_events_and_add_field_to_array()
         {
             var command = new AddField { ParentFieldId = 1, Name = fieldName, Properties = ValidProperties() };
 
@@ -381,7 +381,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task UpdateField_should_create_events_and_update_state()
+        public async Task UpdateField_should_create_events_and_update_field_properties()
         {
             var command = new UpdateField { FieldId = 1, Properties = new StringFieldProperties() };
 
@@ -401,7 +401,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task UpdateField_should_create_events_and_update_state_for_array()
+        public async Task UpdateField_should_create_events_and_update_nested_field_properties()
         {
             var command = new UpdateField { ParentFieldId = 1, FieldId = 2, Properties = new StringFieldProperties() };
 
@@ -422,7 +422,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task LockField_should_create_events_and_update_state()
+        public async Task LockField_should_create_events_and_update_field_locked_flag()
         {
             var command = new LockField { FieldId = 1 };
 
@@ -433,7 +433,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
 
             result.ShouldBeEquivalent(sut.Snapshot);
 
-            Assert.False(GetField(1).IsDisabled);
+            Assert.True(GetField(1).IsLocked);
 
             LastEvents
                 .ShouldHaveSameEvents(
@@ -442,7 +442,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task LockField_should_create_events_and_update_state_for_array()
+        public async Task LockField_should_create_events_and_update_nested_field_locked_flag()
         {
             var command = new LockField { ParentFieldId = 1, FieldId = 2 };
 
@@ -463,7 +463,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task HideField_should_create_events_and_update_state()
+        public async Task HideField_should_create_events_and_update_field_hidden_flag()
         {
             var command = new HideField { FieldId = 1 };
 
@@ -483,7 +483,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task HideField_should_create_events_and_update_state_for_array()
+        public async Task HideField_should_create_events_and_update_nested_field_hidden_flag()
         {
             var command = new HideField { ParentFieldId = 1, FieldId = 2 };
 
@@ -504,7 +504,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task ShowField_should_create_events_and_update_state()
+        public async Task ShowField_should_create_events_and_update_field_hidden_flag()
         {
             var command = new ShowField { FieldId = 1 };
 
@@ -525,7 +525,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task ShowField_should_create_events_and_update_state_for_array()
+        public async Task ShowField_should_create_events_and_update_nested_field_hidden_flag()
         {
             var command = new ShowField { ParentFieldId = 1, FieldId = 2 };
 
@@ -547,7 +547,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task DisableField_should_create_events_and_update_state()
+        public async Task DisableField_should_create_events_and_update_field_disabled_flag()
         {
             var command = new DisableField { FieldId = 1 };
 
@@ -567,7 +567,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task DisableField_should_create_events_and_update_state_for_array()
+        public async Task DisableField_should_create_events_and_update_nested_field_disabled_flag()
         {
             var command = new DisableField { ParentFieldId = 1, FieldId = 2 };
 
@@ -588,7 +588,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task EnableField_should_create_events_and_update_state()
+        public async Task EnableField_should_create_events_and_update_field_disabled_flag()
         {
             var command = new EnableField { FieldId = 1 };
 
@@ -609,7 +609,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task EnableField_should_create_events_and_update_state_for_array()
+        public async Task EnableField_should_create_events_and_update_nested_field_disabled_flag()
         {
             var command = new EnableField { ParentFieldId = 1, FieldId = 2 };
 
@@ -631,7 +631,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task DeleteField_should_create_events_and_update_state()
+        public async Task DeleteField_should_create_events_and_delete_field()
         {
             var command = new DeleteField { FieldId = 1 };
 
@@ -651,7 +651,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task DeleteField_should_create_events_and_update_state_for_array()
+        public async Task DeleteField_should_create_events_and_delete_nested_field()
         {
             var command = new DeleteField { ParentFieldId = 1, FieldId = 2 };
 
@@ -672,7 +672,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas
         }
 
         [Fact]
-        public async Task Synchronize_should_create_events_and_update_state()
+        public async Task Synchronize_should_create_events_and_update_schema()
         {
             var command = new SynchronizeSchema
             {

backend/tools/Migrate_01/OldEvents/ContentChangesPublished.cs

@@ -6,8 +6,10 @@
 // ==========================================================================
 
 using System;
+using Squidex.Domain.Apps.Events.Contents;
 using Squidex.Infrastructure.EventSourcing;
 using Squidex.Infrastructure.Migrations;
+using Squidex.Infrastructure.Reflection;
 
 namespace Migrate_01.OldEvents
 {
@@ -17,7 +19,7 @@ namespace Migrate_01.OldEvents
     {
         public IEvent Migrate()
         {
-            return new NoopEvent();
+            return SimpleMapper.Map(this, new ContentSchedulingCancelled());
         }
     }
 }