nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-02 16:42:50 -05:00
Code Activity

Add FeatureServiceFixtures to set feature flags in test

Browse Source
This commit is contained in:
Thomas Rittson
2023-10-11 14:49:26 +10:00
parent ea4b282c6b
commit 60ea32bb1d
3 changed files with 78 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/Api.Test/Controllers/CollectionsControllerTests.cs
View File

@ -10,6 +10,7 @@ using Bit.Core.Models.Data;
using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
using Bit.Core.Repositories;
using Bit.Core.Services;
using Bit.Core.Test.AutoFixture;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using Microsoft.AspNetCore.Authorization;
@ -20,14 +21,13 @@ namespace Bit.Api.Test.Controllers;
[ControllerCustomize(typeof(CollectionsController))]
[SutProviderCustomize]
[FeatureServiceCustomize(FeatureFlagKeys.FlexibleCollections)]
public class CollectionsControllerTests
{
[Theory, BitAutoData]
public async Task Post_Success(Guid orgId, CollectionRequestModel collectionRequest,
SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
Collection ExpectedCollection() => Arg.Is<Collection>(c =>
c.Name == collectionRequest.Name && c.ExternalId == collectionRequest.ExternalId &&
c.OrganizationId == orgId);
@ -50,7 +50,6 @@ public class CollectionsControllerTests
public async Task Put_Success(Guid orgId, Guid collectionId, Guid userId, CollectionRequestModel collectionRequest,
SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
sutProvider.GetDependency<ICurrentContext>()
.ViewAssignedCollections(orgId)
.Returns(true);
@ -77,7 +76,6 @@ public class CollectionsControllerTests
public async Task Put_CanNotEditAssignedCollection_ThrowsNotFound(Guid orgId, Guid collectionId, Guid userId, CollectionRequestModel collectionRequest,
SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
sutProvider.GetDependency<ICurrentContext>()
.EditAssignedCollections(orgId)
.Returns(true);
@ -96,7 +94,6 @@ public class CollectionsControllerTests
[Theory, BitAutoData]
public async Task GetOrganizationCollectionsWithGroups_NoManagerPermissions_ThrowsNotFound(Organization organization, SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
sutProvider.GetDependency<ICurrentContext>().ViewAssignedCollections(organization.Id).Returns(false);
await Assert.ThrowsAsync<NotFoundException>(() => sutProvider.Sut.GetManyWithDetails(organization.Id));
@ -107,7 +104,6 @@ public class CollectionsControllerTests
[Theory, BitAutoData]
public async Task GetOrganizationCollectionsWithGroups_AdminPermissions_GetsAllCollections(Organization organization, User user, SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
sutProvider.GetDependency<ICurrentContext>().UserId.Returns(user.Id);
sutProvider.GetDependency<ICurrentContext>().ViewAllCollections(organization.Id).Returns(true);
sutProvider.GetDependency<ICurrentContext>().OrganizationAdmin(organization.Id).Returns(true);
@ -121,7 +117,6 @@ public class CollectionsControllerTests
[Theory, BitAutoData]
public async Task GetOrganizationCollectionsWithGroups_MissingViewAllPermissions_GetsAssignedCollections(Organization organization, User user, SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
sutProvider.GetDependency<ICurrentContext>().UserId.Returns(user.Id);
sutProvider.GetDependency<ICurrentContext>().ViewAssignedCollections(organization.Id).Returns(true);
sutProvider.GetDependency<ICurrentContext>().OrganizationManager(organization.Id).Returns(true);
@ -135,7 +130,6 @@ public class CollectionsControllerTests
[Theory, BitAutoData]
public async Task GetOrganizationCollectionsWithGroups_CustomUserWithManagerPermissions_GetsAssignedCollections(Organization organization, User user, SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
sutProvider.GetDependency<ICurrentContext>().UserId.Returns(user.Id);
sutProvider.GetDependency<ICurrentContext>().ViewAssignedCollections(organization.Id).Returns(true);
sutProvider.GetDependency<ICurrentContext>().EditAssignedCollections(organization.Id).Returns(true);
@ -151,7 +145,6 @@ public class CollectionsControllerTests
[Theory, BitAutoData]
public async Task DeleteMany_Success(Guid orgId, Collection collection1, Collection collection2, SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
// Arrange
var model = new CollectionBulkDeleteRequestModel
{
@ -194,7 +187,6 @@ public class CollectionsControllerTests
[Theory, BitAutoData]
public async Task DeleteMany_PermissionDenied_ThrowsNotFound(Guid orgId, Collection collection1, Collection collection2, SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
// Arrange
var model = new CollectionBulkDeleteRequestModel
{
@ -236,7 +228,6 @@ public class CollectionsControllerTests
[Theory, BitAutoData]
public async Task PostBulkCollectionAccess_Success(User actingUser, ICollection<Collection> collections, SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
// Arrange
var userId = Guid.NewGuid();
var groupId = Guid.NewGuid();
@ -283,7 +274,6 @@ public class CollectionsControllerTests
[Theory, BitAutoData]
public async Task PostBulkCollectionAccess_CollectionsNotFound_Throws(User actingUser, ICollection<Collection> collections, SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
var userId = Guid.NewGuid();
var groupId = Guid.NewGuid();
var model = new BulkCollectionAccessRequestModel
@ -315,7 +305,6 @@ public class CollectionsControllerTests
[Theory, BitAutoData]
public async Task PostBulkCollectionAccess_AccessDenied_Throws(User actingUser, ICollection<Collection> collections, SutProvider<CollectionsController> sutProvider)
{
sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
var userId = Guid.NewGuid();
var groupId = Guid.NewGuid();
var model = new BulkCollectionAccessRequestModel