Browse Source

Fix audit log unit tests.

pull/2824/head
Halil İbrahim Kalkan 7 years ago
parent
commit
f47a0c1f5f
  1. 5
      framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
  2. 1
      framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs
  3. 15
      framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs

5
framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs

@ -38,10 +38,7 @@ namespace Volo.Abp.AspNetCore.Auditing
catch (Exception) catch (Exception)
{ {
hasError = true; hasError = true;
if (!Options.HideErrors) throw;
{
throw;
}
} }
finally finally
{ {

1
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs

@ -5,6 +5,7 @@ using Volo.Abp.Auditing;
namespace Volo.Abp.AspNetCore.Mvc.Auditing namespace Volo.Abp.AspNetCore.Mvc.Auditing
{ {
[Route("api/audit-test")] [Route("api/audit-test")]
[Audited]
public class AuditTestController : AbpController public class AuditTestController : AbpController
{ {
private readonly AbpAuditingOptions _options; private readonly AbpAuditingOptions _options;

15
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs

@ -1,4 +1,5 @@
using Microsoft.Extensions.DependencyInjection; using System;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -33,7 +34,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
_options.IsEnabledForGetRequests = true; _options.IsEnabledForGetRequests = true;
_options.AlwaysLogOnException = false; _options.AlwaysLogOnException = false;
await GetResponseAsync("api/audit-test/audit-success"); await GetResponseAsync("api/audit-test/audit-success");
//await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>()); //Won't work, save happens out of scope await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>()); //Won't work, save happens out of scope
} }
[Fact] [Fact]
@ -41,8 +42,14 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
{ {
_options.IsEnabled = true; _options.IsEnabled = true;
_options.AlwaysLogOnException = true; _options.AlwaysLogOnException = true;
await GetResponseAsync("api/audit-test/audit-fail", System.Net.HttpStatusCode.BadRequest);
//await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>()); //Won't work, save happens out of scope try
{
await GetResponseAsync("api/audit-test/audit-fail", System.Net.HttpStatusCode.Forbidden);
}
catch { }
await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>()); //Won't work, save happens out of scope
} }
} }
} }

Loading…
Cancel
Save