Changes per PR

This commit is contained in:
Pranav K 2019-06-24 16:14:46 -07:00
parent 6b36c377f6
commit 6c5374db0d
No known key found for this signature in database
GPG Key ID: 1963DA6D96C3057A
2 changed files with 5 additions and 66 deletions

View File

@ -340,57 +340,10 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
}
[Fact]
public override async Task ActionsReturnBadRequest_WhenModelStateIsInvalid()
[Fact(Skip = "https://github.com/aspnet/AspNetCore/pull/11460")]
public override Task ActionsReturnBadRequest_WhenModelStateIsInvalid()
{
// Arrange
using var _ = new ActivityReplacer();
var contactModel = new Contact
{
Name = "Abc",
City = "Redmond",
State = "WA",
Zip = "Invalid",
};
var contactString = JsonConvert.SerializeObject(contactModel);
// Act
var response = await Client.PostAsJsonAsync("/contact", contactModel);
// Assert
await response.AssertStatusCodeAsync(HttpStatusCode.BadRequest);
Assert.Equal("application/problem+json", response.Content.Headers.ContentType.MediaType);
var problemDetails = JsonConvert.DeserializeObject<ValidationProblemDetails>(
await response.Content.ReadAsStringAsync(),
new JsonSerializerSettings
{
Converters = { new ValidationProblemDetailsConverter() }
});
Assert.Collection(
problemDetails.Errors.OrderBy(kvp => kvp.Key),
kvp =>
{
Assert.Equal("Name", kvp.Key);
var error = Assert.Single(kvp.Value);
Assert.Equal("The field Name must be a string with a minimum length of 5 and a maximum length of 30.", error);
},
kvp =>
{
Assert.Equal("Zip", kvp.Key);
var error = Assert.Single(kvp.Value);
Assert.Equal("The field Zip must match the regular expression '\\d{5}'.", error);
}
);
Assert.Collection(
problemDetails.Extensions,
kvp =>
{
Assert.Equal("extensions", kvp.Key);
var jObject = Assert.IsType<JObject>(kvp.Value);
Assert.Equal("traceId", Assert.Single(jObject.Properties()).Name);
});
return base.ActionsReturnBadRequest_WhenModelStateIsInvalid();
}
[Fact(Skip = "https://github.com/dotnet/corefx/issues/38769")]

View File

@ -33,22 +33,8 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
[Fact]
public override Task Formatting_DictionaryType() => base.Formatting_DictionaryType();
[Fact]
public override async Task Formatting_ProblemDetails()
{
using var _ = new ActivityReplacer();
// Act
var response = await Client.GetAsync($"/JsonOutputFormatter/{nameof(JsonOutputFormatterController.ProblemDetailsResult)}");
// Assert
await response.AssertStatusCodeAsync(HttpStatusCode.NotFound);
var obj = JObject.Parse(await response.Content.ReadAsStringAsync());
Assert.Equal("https://tools.ietf.org/html/rfc7231#section-6.5.4", obj.Value<string>("type"));
Assert.Equal("Not Found", obj.Value<string>("title"));
Assert.Equal("404", obj.Value<string>("status"));
}
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11522")]
public override Task Formatting_ProblemDetails() => base.Formatting_ProblemDetails();
[Fact]
public override Task Formatting_PolymorphicModel() => base.Formatting_PolymorphicModel();