bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-24 04:03:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into feature/sm-billing

Browse Source
This commit is contained in:
Conner Turnbull
2023-07-14 14:04:14 -04:00
parent 99b598ae8e 4f87e4e1a4
commit a79a52395d
43 changed files with 213 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/Api.Test/Controllers/GroupsControllerTests.cs
View File

@@ -33,10 +33,8 @@ public class GroupsControllerTests
organization,
Arg.Any<IEnumerable<CollectionAccessSelection>>(),
Arg.Any<IEnumerable<Guid>>());
Assert.NotNull(response.Id);
Assert.Equal(groupRequestModel.Name, response.Name);
Assert.Equal(organization.Id.ToString(), response.OrganizationId);
Assert.Equal(organization.Id, response.OrganizationId);
Assert.Equal(groupRequestModel.AccessAll, response.AccessAll);
}
@@ -60,10 +58,8 @@ public class GroupsControllerTests
Arg.Is<Organization>(o => o.Id == organization.Id),
Arg.Any<IEnumerable<CollectionAccessSelection>>(),
Arg.Any<IEnumerable<Guid>>());
Assert.NotNull(response.Id);
Assert.Equal(groupRequestModel.Name, response.Name);
Assert.Equal(organization.Id.ToString(), response.OrganizationId);
Assert.Equal(organization.Id, response.OrganizationId);
Assert.Equal(groupRequestModel.AccessAll, response.AccessAll);
}
}

4
test/Api.Test/Controllers/OrganizationDomainControllerTests.cs
View File

@@ -67,7 +67,7 @@ public class OrganizationDomainControllerTests
var result = await sutProvider.Sut.Get(orgId.ToString());
Assert.IsType<ListResponseModel<OrganizationDomainResponseModel>>(result);
Assert.Equal(orgId.ToString(), result.Data.Select(x => x.OrganizationId).FirstOrDefault());
Assert.Equal(orgId, result.Data.Select(x => x.OrganizationId).FirstOrDefault());
}
[Theory, BitAutoData]
@@ -125,7 +125,7 @@ public class OrganizationDomainControllerTests
var result = await sutProvider.Sut.Get(orgId.ToString(), id.ToString());
Assert.IsType<OrganizationDomainResponseModel>(result);
Assert.Equal(orgId.ToString(), result.OrganizationId);
Assert.Equal(orgId, result.OrganizationId);
}
[Theory, BitAutoData]

2
test/Api.Test/Vault/Controllers/CiphersControllerTests.cs
View File

@@ -39,7 +39,7 @@ public class CiphersControllerTests
var result = await sutProvider.Sut.PutPartial(cipherId.ToString(), new CipherPartialRequestModel { Favorite = isFavorite, FolderId = folderId.ToString() });
Assert.Equal(folderId.ToString(), result.FolderId);
Assert.Equal(folderId, result.FolderId);
Assert.Equal(isFavorite, result.Favorite);
}
}

2
test/Api.Test/Vault/Controllers/SyncControllerTests.cs
View File

@@ -301,7 +301,7 @@ public class SyncControllerTests
foreach (var profProviderOrg in result.Profile.ProviderOrganizations)
{
var matchedProviderUserOrgDetails =
providerUserOrganizationDetails.FirstOrDefault(p => p.OrganizationId.ToString() == profProviderOrg.Id);
providerUserOrganizationDetails.FirstOrDefault(p => p.OrganizationId == profProviderOrg.Id);
if (matchedProviderUserOrgDetails != null)
{