Browse Source

Method renamed.

pull/373/head
Sebastian Stehle 7 years ago
parent
commit
987c6e4550
  1. 2
      src/Squidex.Domain.Apps.Entities/Contents/DefaultContentWorkflow.cs
  2. 2
      src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs
  3. 2
      src/Squidex.Domain.Apps.Entities/Contents/IContentWorkflow.cs
  4. 4
      tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs
  5. 2
      tests/Squidex.Domain.Apps.Entities.Tests/Contents/DefaultContentWorkflowTests.cs
  6. 6
      tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs

2
src/Squidex.Domain.Apps.Entities/Contents/DefaultContentWorkflow.cs

@ -31,7 +31,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
return Task.FromResult(Status.Draft);
}
public Task<bool> IsValidNextStatus(IContentEntity content, Status next)
public Task<bool> CanMoveToAsync(IContentEntity content, Status next)
{
return Task.FromResult(Flow.TryGetValue(content.Status, out var state) && state.Contains(next));
}

2
src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs

@ -76,7 +76,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guards
return Validate.It(() => "Cannot change status.", async e =>
{
if (!await contentWorkflow.IsValidNextStatus(content, command.Status))
if (!await contentWorkflow.CanMoveToAsync(content, command.Status))
{
if (content.Status == command.Status && content.Status == Status.Published)
{

2
src/Squidex.Domain.Apps.Entities/Contents/IContentWorkflow.cs

@ -15,7 +15,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
{
Task<Status> GetInitialStatusAsync(ISchemaEntity schema);
Task<bool> IsValidNextStatus(IContentEntity content, Status next);
Task<bool> CanMoveToAsync(IContentEntity content, Status next);
Task<bool> CanUpdateAsync(IContentEntity content);

4
tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs

@ -105,7 +105,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
A.CallTo(() => contentWorkflow.CanUpdateAsync(A<IContentEntity>.Ignored))
.Returns(true);
A.CallTo(() => contentWorkflow.IsValidNextStatus(A<IContentEntity>.Ignored, A<Status>.Ignored))
A.CallTo(() => contentWorkflow.CanMoveToAsync(A<IContentEntity>.Ignored, A<Status>.Ignored))
.Returns(true);
patched = patch.MergeInto(data);
@ -476,7 +476,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
var command = new ChangeContentStatus { Status = Status.Draft, JobId = sut.Snapshot.ScheduleJob.Id };
A.CallTo(() => contentWorkflow.IsValidNextStatus(sut.Snapshot, command.Status))
A.CallTo(() => contentWorkflow.CanMoveToAsync(sut.Snapshot, command.Status))
.Returns(false);
var result = await sut.ExecuteAsync(CreateContentCommand(command));

2
tests/Squidex.Domain.Apps.Entities.Tests/Contents/DefaultContentWorkflowTests.cs

@ -29,7 +29,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
{
var entity = CreateContent(Status.Published);
var result = await sut.IsValidNextStatus(entity, Status.Draft);
var result = await sut.CanMoveToAsync(entity, Status.Draft);
Assert.True(result);
}

6
tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs

@ -182,7 +182,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard
var content = CreateContent(Status.Draft, false);
var command = new ChangeContentStatus { Status = Status.Published, DueTime = dueTimeInPast };
A.CallTo(() => contentWorkflow.IsValidNextStatus(content, command.Status))
A.CallTo(() => contentWorkflow.CanMoveToAsync(content, command.Status))
.Returns(true);
await ValidationAssert.ThrowsAsync(() => GuardContent.CanChangeStatus(schema, content, contentWorkflow, command),
@ -197,7 +197,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard
var content = CreateContent(Status.Draft, false);
var command = new ChangeContentStatus { Status = Status.Published };
A.CallTo(() => contentWorkflow.IsValidNextStatus(content, command.Status))
A.CallTo(() => contentWorkflow.CanMoveToAsync(content, command.Status))
.Returns(false);
await ValidationAssert.ThrowsAsync(() => GuardContent.CanChangeStatus(schema, content, contentWorkflow, command),
@ -212,7 +212,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard
var content = CreateContent(Status.Draft, false);
var command = new ChangeContentStatus { Status = Status.Published };
A.CallTo(() => contentWorkflow.IsValidNextStatus(content, command.Status))
A.CallTo(() => contentWorkflow.CanMoveToAsync(content, command.Status))
.Returns(true);
await GuardContent.CanChangeStatus(schema, content, contentWorkflow, command);

Loading…
Cancel
Save