bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-15 07:43:54 +00:00
Code Issues Releases Wiki Activity

Fix merge issues

Browse Source
This commit is contained in:
Justin Baur
2025-11-19 10:16:52 -05:00
parent 3360b6839f
commit 8a3531e821
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/Api.IntegrationTest/AdminConsole/Controllers/OrganizationUserControllerAutoConfirmTests.cs
View File

@@ -39,7 +39,7 @@ public class OrganizationUserControllerAutoConfirmTests : IClassFixture<ApiAppli
_loginHelper = new LoginHelper(_factory, _client);
}
public async Task InitializeAsync()
public async ValueTask InitializeAsync()
{
_ownerEmail = $"org-owner-{Guid.NewGuid()}@example.com";
await _factory.LoginWithNewAccount(_ownerEmail);
@@ -144,7 +144,7 @@ public class OrganizationUserControllerAutoConfirmTests : IClassFixture<ApiAppli
var collections = await collectionRepository.GetManyByUserIdAsync(organizationUser.UserId!.Value);
Assert.NotEmpty(collections);
Assert.Single(collections.Where(c => c.Type == CollectionType.DefaultUserCollection));
Assert.Single(collections, c => c.Type == CollectionType.DefaultUserCollection);
await _factory.GetService<IOrganizationRepository>().DeleteAsync(organization);
}
@@ -212,14 +212,14 @@ public class OrganizationUserControllerAutoConfirmTests : IClassFixture<ApiAppli
.GetManyByUserIdAsync(organizationUser.UserId!.Value);
Assert.NotEmpty(collections);
// validates user only received one default collection
Assert.Single(collections.Where(c => c.Type == CollectionType.DefaultUserCollection));
Assert.Single(collections, c => c.Type == CollectionType.DefaultUserCollection);
await _factory.GetService<IOrganizationRepository>().DeleteAsync(organization);
}
public Task DisposeAsync()
public ValueTask DisposeAsync()
{
_client.Dispose();
return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}

2
test/Core.Test/AdminConsole/AutoFixture/OrganizationFixtures.cs
View File

@@ -2,7 +2,7 @@
using System.Text.Json;
using AutoFixture;
using AutoFixture.Kernel;
using AutoFixture.Xunit2;
using AutoFixture.Xunit3;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Auth.Enums;
using Bit.Core.Auth.Models;