cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 14:37:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix test build errors

Browse Source
This commit is contained in:
Jordan Dominion
2025-08-17 22:35:31 -04:00
parent 4af07f6eef
commit e3f63cb8d5
6 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Client.GraphQL/GQL/Queries/GetUserNameByNodeId.graphql
-8
View File
@@ -1,8 +0,0 @@
query GetUserNameByNodeId($id: ID!) {
node(id: $id) {
... on UserName {
id
name
}
}
}
src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUserGroups.graphql
+1 -1
View File
@@ -1,7 +1,7 @@
query ListUserGroups {
swarm {
userGroups {
queryableGroups {
queryable {
totalCount
nodes {
id
src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUsers.graphql
+1 -1
View File
@@ -1,7 +1,7 @@
query ListUsers {
swarm {
users {
queryableUsers {
queryable {
nodes {
id
}
src/Tgstation.Server.Client.GraphQL/GQL/Queries/PageUserIds.graphql
+1 -1
View File
@@ -1,7 +1,7 @@
query PageUserIds($first: Int, $after: String) {
swarm {
users {
queryableUsers(first: $first, after: $after) {
queryable(first: $first, after: $after) {
pageInfo {
endCursor
hasNextPage
src/Tgstation.Server.Host/GraphQL/Types/UserGroup.cs
+1 -1
View File
@@ -83,7 +83,7 @@ namespace Tgstation.Server.Host.GraphQL.Types
[UseFiltering]
[UseSorting]
[Cost(Costs.NonIndexedQueryable)]
public async ValueTask<IQueryable<User>> QueryableUsers(
public async ValueTask<IQueryable<User>> Users(
[Service] IGraphQLAuthorityInvoker<IUserAuthority> userAuthority)
{
ArgumentNullException.ThrowIfNull(userAuthority);
tests/Tgstation.Server.Tests/Live/UsersTest.cs
+5 -7
View File
@@ -263,14 +263,12 @@ namespace Tgstation.Server.Tests.Live
{
var result = await client.RunOperation(gql => gql.ListUsers.ExecuteAsync(cancellationToken), cancellationToken);
result.EnsureNoErrors();
var users = result.Data.Swarm.Users.QueryableUsers;
var users = result.Data.Swarm.Users.Queryable;
Assert.IsTrue(users.Nodes.Count > 0);
// Can't assert this, there's a race condition
// Assert.AreEqual(Math.Min(ApiController.DefaultPageSize, users.TotalCount), users.Nodes.Count);
Assert.IsTrue(Math.Min(ApiController.DefaultPageSize, users.TotalCount) >= users.Nodes.Count);
var tgsUserResult = await client.RunOperation(gql => gql.GetUserNameByNodeId.ExecuteAsync(gqlUser.Swarm.Users.Current.CreatedBy.Id, cancellationToken), cancellationToken);
tgsUserResult.EnsureNoErrors();
var tgsUserResult2 = await client.RunOperation(gql => gql.GetUserById.ExecuteAsync(gqlUser.Swarm.Users.Current.CreatedBy.Id, cancellationToken), cancellationToken);
Assert.IsTrue(tgsUserResult2.IsErrorResult());
@@ -376,7 +374,7 @@ namespace Tgstation.Server.Tests.Live
gql => gql.ListUserGroups.ExecuteAsync(cancellationToken),
cancellationToken);
var groups = groupsResult.Swarm.UserGroups.QueryableGroups;
var groups = groupsResult.Swarm.UserGroups.Queryable;
Assert.AreEqual(2, groups.TotalCount);
foreach (var igroup in groups.Nodes)
@@ -391,7 +389,7 @@ namespace Tgstation.Server.Tests.Live
gql => gql.ListUserGroups.ExecuteAsync(cancellationToken),
cancellationToken);
groups = groupsResult.Swarm.UserGroups.QueryableGroups;
groups = groupsResult.Swarm.UserGroups.Queryable;
Assert.AreEqual(1, groups.TotalCount);
foreach (var igroup in groups.Nodes)
@@ -681,7 +679,7 @@ namespace Tgstation.Server.Tests.Live
cancellationToken))
.Swarm
.Users
.QueryableUsers;
.Queryable;
if (!isLastIteration || exactMatch)
Assert.AreEqual(outputPageSize, queryable.Nodes.Count);
@@ -704,7 +702,7 @@ namespace Tgstation.Server.Tests.Live
{
// special case
result.EnsureNoErrors();
Assert.AreEqual(0, result.Data.Swarm.Users.QueryableUsers.Nodes.Count);
Assert.AreEqual(0, result.Data.Swarm.Users.Queryable.Nodes.Count);
return;
}