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

Applied linting rules to tests within the Umbraco.Tests.Integration project.

Browse Source
This commit is contained in:
Andy Butland
2020-12-23 11:35:49 +01:00
parent 2dc72ea323
commit cd5f5778ee
101 changed files with 7717 additions and 7365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,7 @@
using System;
// Copyright (c) Umbraco.
// See LICENSE for more details.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
@@ -28,11 +31,11 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
[Test]
public async Task Save_User()
{
var url = PrepareUrl<UsersController>(x => x.PostSaveUser(null));
string url = PrepareUrl<UsersController>(x => x.PostSaveUser(null));
var userService = GetRequiredService<IUserService>();
IUserService userService = GetRequiredService<IUserService>();
var user = new UserBuilder()
User user = new UserBuilder()
.AddUserGroup()
.WithAlias("writer") // Needs to be an existing alias
.Done()
@@ -49,101 +52,102 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
Name = user.Name,
UserGroups = user.Groups.Select(x => x.Alias).ToArray()
};
// Act
var response = await Client.PostAsync(url,
new StringContent(JsonConvert.SerializeObject(userSave), Encoding.UTF8,
MediaTypeNames.Application.Json));
HttpResponseMessage response = await Client.PostAsync(
url,
new StringContent(JsonConvert.SerializeObject(userSave), Encoding.UTF8, MediaTypeNames.Application.Json));
// Assert
Assert.Multiple(() =>
{
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var body = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
string body = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
var actual = JsonConvert.DeserializeObject<UserDisplay>(body, new JsonSerializerSettings
UserDisplay actual = JsonConvert.DeserializeObject<UserDisplay>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.AreEqual(userSave.Name, actual.Name);
Assert.AreEqual(userSave.Id, actual.Id);
Assert.AreEqual(userSave.Email, actual.Email);
var userGroupAliases = actual.UserGroups.Select(x => x.Alias).ToArray();
string[] userGroupAliases = actual.UserGroups.Select(x => x.Alias).ToArray();
CollectionAssert.AreEquivalent(userSave.UserGroups, userGroupAliases);
});
}
[Test]
public async Task GetPagedUsers_Empty()
{
//We get page 2 to force an empty response because there always in the useradmin user
var url = PrepareUrl<UsersController>(x => x.GetPagedUsers(2, 10, "username", Direction.Ascending, null, null, string.Empty));
public async Task GetPagedUsers_Empty()
{
// We get page 2 to force an empty response because there always in the useradmin user
string url = PrepareUrl<UsersController>(x => x.GetPagedUsers(2, 10, "username", Direction.Ascending, null, null, string.Empty));
// Act
var response = await Client.GetAsync(url);
// Act
HttpResponseMessage response = await Client.GetAsync(url);
var body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>
{
Assert.IsNotNull(actual);
Assert.AreEqual(1, actual.TotalItems);
CollectionAssert.IsEmpty(actual.Items);
});
}
string body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
PagedResult<UserBasic> actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>
{
Assert.IsNotNull(actual);
Assert.AreEqual(1, actual.TotalItems);
CollectionAssert.IsEmpty(actual.Items);
});
}
[Test]
public async Task GetPagedUsers_multiple_pages()
{
var totalNumberOfUsers = 11;
var pageSize = totalNumberOfUsers - 1;
var url = PrepareUrl<UsersController>(x => x.GetPagedUsers(1, pageSize, "username", Direction.Ascending, null, null, string.Empty));
[Test]
public async Task GetPagedUsers_multiple_pages()
{
int totalNumberOfUsers = 11;
int pageSize = totalNumberOfUsers - 1;
string url = PrepareUrl<UsersController>(x => x.GetPagedUsers(1, pageSize, "username", Direction.Ascending, null, null, string.Empty));
var userService = GetRequiredService<IUserService>();
IUserService userService = GetRequiredService<IUserService>();
for (int i = 1; i < totalNumberOfUsers; i++) // We already has admin user = -1, so we start from 1
{
var user = new UserBuilder()
// We already has admin user = -1, so we start from 1.
for (int i = 1; i < totalNumberOfUsers; i++)
{
User user = new UserBuilder()
.WithName($"Test user {i}")
.AddUserGroup()
.WithAlias("writer") // Needs to be an existing alias
.Done()
.Build();
userService.Save(user);
}
// Act
var response = await Client.GetAsync(url);
var body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>
{
Assert.IsNotNull(actual);
Assert.AreEqual(totalNumberOfUsers, actual.TotalItems);
Assert.AreEqual(pageSize, actual.Items.Count());
});
}
[Test]
public async Task PostUnlockUsers_When_UserIds_Not_Supplied_Expect_Ok_Response()
{
var url = PrepareUrl<UsersController>(x => x.PostUnlockUsers(Array.Empty<int>()));
userService.Save(user);
}
// Act
var response = await Client.PostAsync(url, new StringContent(string.Empty));
HttpResponseMessage response = await Client.GetAsync(url);
string body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
PagedResult<UserBasic> actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>
{
Assert.IsNotNull(actual);
Assert.AreEqual(totalNumberOfUsers, actual.TotalItems);
Assert.AreEqual(pageSize, actual.Items.Count());
});
}
[Test]
public async Task PostUnlockUsers_When_UserIds_Not_Supplied_Expect_Ok_Response()
{
string url = PrepareUrl<UsersController>(x => x.PostUnlockUsers(Array.Empty<int>()));
// Act
HttpResponseMessage response = await Client.PostAsync(url, new StringContent(string.Empty));
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
}
@@ -151,31 +155,28 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
[Test]
public async Task PostUnlockUsers_When_User_Does_Not_Exist_Expect_Zero_Users_Message()
{
var userId = 42; // Must not exist
var url = PrepareUrl<UsersController>(x => x.PostUnlockUsers(new []{userId}));
int userId = 42; // Must not exist
string url = PrepareUrl<UsersController>(x => x.PostUnlockUsers(new[] { userId }));
// Act
var response = await Client.PostAsync(url, new StringContent(string.Empty));
var body = await response.Content.ReadAsStringAsync();
HttpResponseMessage response = await Client.PostAsync(url, new StringContent(string.Empty));
string body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
SimpleNotificationModel actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributesResolver()
});
Assert.Multiple(() =>
{
Assert.AreEqual($"Unlocked 0 users", actual.Message);
});
Assert.Multiple(() => Assert.AreEqual($"Unlocked 0 users", actual.Message));
}
[Test]
public async Task PostUnlockUsers_When_One_UserId_Supplied_Expect_User_Locked_Out_With_Correct_Response_Message()
{
var userService = GetRequiredService<IUserService>();
IUserService userService = GetRequiredService<IUserService>();
var user = new UserBuilder()
User user = new UserBuilder()
.AddUserGroup()
.WithAlias("writer") // Needs to be an existing alias
.Done()
@@ -183,14 +184,14 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
.Build();
userService.Save(user);
var url = PrepareUrl<UsersController>(x => x.PostUnlockUsers(new []{user.Id}));
string url = PrepareUrl<UsersController>(x => x.PostUnlockUsers(new[] { user.Id }));
// Act
var response = await Client.PostAsync(url, new StringContent(string.Empty));
var body = await response.Content.ReadAsStringAsync();
HttpResponseMessage response = await Client.PostAsync(url, new StringContent(string.Empty));
string body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
SimpleNotificationModel actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributesResolver()
});
@@ -205,8 +206,8 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
[Test]
public async Task PostUnlockUsers_When_Multiple_UserIds_Supplied_Expect_User_Locked_Out_With_Correct_Response_Message()
{
var numberOfUsers = 3;
var userService = GetRequiredService<IUserService>();
int numberOfUsers = 3;
IUserService userService = GetRequiredService<IUserService>();
var users = new List<IUser>();
for (int i = 0; i < numberOfUsers; i++)
@@ -222,19 +223,19 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers
.Build());
}
foreach (var user in users)
foreach (IUser user in users)
{
userService.Save(user);
}
var url = PrepareUrl<UsersController>(x => x.PostUnlockUsers(users.Select(x=>x.Id).ToArray()));
string url = PrepareUrl<UsersController>(x => x.PostUnlockUsers(users.Select(x => x.Id).ToArray()));
// Act
var response = await Client.PostAsync(url, new StringContent(string.Empty));
var body = await response.Content.ReadAsStringAsync();
HttpResponseMessage response = await Client.PostAsync(url, new StringContent(string.Empty));
string body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
SimpleNotificationModel actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
{
ContractResolver = new IgnoreRequiredAttributesResolver()
});