From f2ca23b780a6f9b2ffe6faa7b18f24e586b512dd Mon Sep 17 00:00:00 2001 From: Nikodem Jaworski Date: Mon, 13 Mar 2017 17:40:01 +0100 Subject: [PATCH 1/2] Use 204 on empty delete response --- src/JsonApiDotNetCore/Controllers/JsonApiController.cs | 2 +- .../Acceptance/Spec/DeletingDataTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiController.cs index ab6eedbf9d..31a30bb454 100644 --- a/src/JsonApiDotNetCore/Controllers/JsonApiController.cs +++ b/src/JsonApiDotNetCore/Controllers/JsonApiController.cs @@ -201,7 +201,7 @@ public virtual async Task DeleteAsync(TId id) if (!wasDeleted) return NotFound(); - return Ok(); + return NoContent(); } private IQueryable ApplySortAndFilterQuery(IQueryable entities) diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DeletingDataTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DeletingDataTests.cs index 888f1a262c..371bd31714 100644 --- a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DeletingDataTests.cs +++ b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DeletingDataTests.cs @@ -55,7 +55,7 @@ public async Task Respond_404_If_EntityDoesNotExist() var response = await client.SendAsync(request); // Assert - Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); + Assert.Equal(HttpStatusCode.NoContent, response.StatusCode); } } } From 00c4ee826136d5791519ea633809e26702e9a35c Mon Sep 17 00:00:00 2001 From: Jared Nance Date: Mon, 13 Mar 2017 14:47:32 -0500 Subject: [PATCH 2/2] test(deleting): server must respond 204 on delete this check was happening on the wrong test --- .../Acceptance/Spec/DeletingDataTests.cs | 7 +------ .../Acceptance/TodoItemsControllerTests.cs | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DeletingDataTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DeletingDataTests.cs index 371bd31714..6b30e43a0e 100644 --- a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DeletingDataTests.cs +++ b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DeletingDataTests.cs @@ -1,20 +1,15 @@ -using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; -using System.Net.Http.Headers; using System.Threading.Tasks; using Bogus; using DotNetCoreDocs; using DotNetCoreDocs.Writers; -using JsonApiDotNetCore.Serialization; -using JsonApiDotNetCore.Services; using JsonApiDotNetCoreExample; using JsonApiDotNetCoreExample.Data; using JsonApiDotNetCoreExample.Models; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; -using Newtonsoft.Json; using Xunit; namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec @@ -55,7 +50,7 @@ public async Task Respond_404_If_EntityDoesNotExist() var response = await client.SendAsync(request); // Assert - Assert.Equal(HttpStatusCode.NoContent, response.StatusCode); + Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); } } } diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/TodoItemsControllerTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/TodoItemsControllerTests.cs index a6d234f3cd..1038b17146 100644 --- a/test/JsonApiDotNetCoreExampleTests/Acceptance/TodoItemsControllerTests.cs +++ b/test/JsonApiDotNetCoreExampleTests/Acceptance/TodoItemsControllerTests.cs @@ -424,7 +424,7 @@ public async Task Can_Delete_TodoItem() var response = await _fixture.MakeRequest(description, request); // Assert - Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal(HttpStatusCode.NoContent, response.StatusCode); Assert.Null(_context.TodoItems.FirstOrDefault(t => t.Id == todoItem.Id)); } }