SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

some fixes to the PR change requests

Browse source
This commit is contained in:
axeleron007 2021-09-29 13:42:15 +03:00
parent f9923b5ca1
commit 80ce9995a8
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpoint.cs
View file

@ -82,13 +82,8 @@ namespace Elsa.Activities.Http
[ActivityOutput(Hint = "The received HTTP request.")]
public HttpRequestModel? Output { get; set; }
protected override IActivityExecutionResult OnExecute(ActivityExecutionContext context)
{
var isTest = context.WorkflowExecutionContext.WorkflowInstance.GetMetadata("isTest");
var result = context.WorkflowExecutionContext.IsFirstPass && !Convert.ToBoolean(isTest) ? ExecuteInternal(context) : Suspend();
protected override IActivityExecutionResult OnExecute(ActivityExecutionContext context) => context.WorkflowExecutionContext.IsFirstPass ? ExecuteInternal(context) : Suspend();
return result;
}
protected override IActivityExecutionResult OnResume(ActivityExecutionContext context) => ExecuteInternal(context);
private IActivityExecutionResult ExecuteInternal(ActivityExecutionContext context)

22
src/server/Elsa.Server.Api/Handlers/ConfigureWorkflowContextForTestHandler.cs Normal file
View file

@ -0,0 +1,22 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Elsa.Events;
using MediatR;
namespace Elsa.Server.Api.Handlers
{
public class ConfigureWorkflowContextForTestHandler : INotificationHandler<WorkflowExecuting>
{
public Task Handle(WorkflowExecuting notification, CancellationToken cancellationToken)
{
var isTest = Convert.ToBoolean(notification.WorkflowExecutionContext.WorkflowInstance.GetMetadata("isTest"));
// If we are in test mode, we always block on the first activity.
if (isTest)
notification.WorkflowExecutionContext.CompletePass();
return Task.CompletedTask;
}
}
}

2
test/unit/Elsa.UnitTests/Services/WorkflowExecutionContextForWorkflowBlueprintFactoryTests.cs
View file

@ -20,7 +20,7 @@ namespace Elsa.Services
{
var sut = new WorkflowExecutionContextForWorkflowBlueprintFactory(serviceProvider, workflowFactory);
Mock.Get(workflowFactory)
.Setup(x => x.InstantiateAsync(workflowBlueprint, default, default, default, default, default, default))
.Setup(x => x.InstantiateAsync(workflowBlueprint, default, default, default, default))
.Returns(() => Task.FromResult(instance));
var result = await sut.CreateWorkflowExecutionContextAsync(workflowBlueprint);