yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Bjarke Berg
2020-06-26 13:58:15 +02:00
parent 16a2cd1b3f
commit 6d993eb63b
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests.Common/Builders/UserBuilder.cs
View File

@@ -79,7 +79,7 @@ namespace Umbraco.Tests.Common.Builders
return this;
}
public UserBuilder<TParent> WithUsername(string username)
public UserBuilder<TParent> WithUsername(string username)
{
_username = username;
return this;

12
src/Umbraco.Tests.Integration/TestServerTest/Controllers/UsersControllerTests.cs
View File

@@ -66,7 +66,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
var actual = JsonConvert.DeserializeObject<UserDisplay>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributsResolver()
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.AreEqual(userSave.Name, actual.Name);
Assert.AreEqual(userSave.Id, actual.Id);
@@ -90,7 +90,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributsResolver()
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>
{
@@ -129,7 +129,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributsResolver()
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>
{
@@ -164,7 +164,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
var actual = JsonConvert.DeserializeObject<ExceptionViewModel>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributsResolver()
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>
{
@@ -197,7 +197,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributsResolver()
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>
@@ -243,7 +243,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributsResolver()
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>

2
src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs
View File

@@ -23,7 +23,7 @@ namespace Umbraco.Web.BackOffice.Filters
private readonly IUserService _userService;
private readonly UmbracoMapper _umbracoMapper;
public UserGroupValidateFilter(
public UserGroupValidateFilter(
IUserService userService,
UmbracoMapper umbracoMapper)
{

2
src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributsResolver.cs → src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolver.cs
View File

@@ -4,7 +4,7 @@ using Newtonsoft.Json.Serialization;
namespace Umbraco.Web.Common.Formatters
{
public class IgnoreRequiredAttributsResolver : DefaultContractResolver
public class IgnoreRequiredAttributesResolver : DefaultContractResolver
{
protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
{

2
src/Umbraco.Web.Common/ModelBinding/UmbracoJsonModelBinderProvider.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Web.Common.ModelBinding
var ss = jsonOptions.SerializerSettings; // Just use the defaults as base
// We need to ignore required attributes when serializing. E.g UserSave.ChangePassword. Otherwise the model is not model bound.
ss.ContractResolver = new IgnoreRequiredAttributsResolver();
ss.ContractResolver = new IgnoreRequiredAttributesResolver();
return new IInputFormatter[]
{
new NewtonsoftJsonInputFormatter(