Add FeatureServiceFixtures to set feature flags in test

test/Api.Test/Controllers/CollectionsControllerTests.cs

@@ -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

test/Core.Test/AutoFixture/FeatureServiceFixtures.cs

@@ -0,0 +1,73 @@
+using System.Reflection;
+using AutoFixture;
+using AutoFixture.Kernel;
+using Bit.Core.Context;
+using Bit.Core.Services;
+using Bit.Test.Common.AutoFixture.Attributes;
+using NSubstitute;
+
+namespace Bit.Core.Test.AutoFixture;
+
+internal class FeatureServiceBuilder : ISpecimenBuilder
+{
+    private readonly string _enabledFeatureFlag;
+
+    public FeatureServiceBuilder(string enabledFeatureFlag)
+    {
+        _enabledFeatureFlag = enabledFeatureFlag;
+    }
+
+    public object Create(object request, ISpecimenContext context)
+    {
+        if (context == null)
+        {
+            throw new ArgumentNullException(nameof(context));
+        }
+
+        if (request is not ParameterInfo pi)
+        {
+            return new NoSpecimen();
+        }
+
+        if (pi.ParameterType == typeof(IFeatureService))
+        {
+            var featureService = Substitute.For<IFeatureService>();
+            featureService
+                .IsEnabled(_enabledFeatureFlag, Arg.Any<ICurrentContext>(), Arg.Any<bool>())
+                .Returns(true);
+            return featureService;
+        }
+
+        return new NoSpecimen();
+    }
+}
+
+internal class FeatureServiceCustomization : ICustomization
+{
+    private readonly string _enabledFeatureFlag;
+
+    public FeatureServiceCustomization(string enabledFeatureFlag)
+    {
+        _enabledFeatureFlag = enabledFeatureFlag;
+    }
+
+    public void Customize(IFixture fixture)
+    {
+        fixture.Customizations.Add(new FeatureServiceBuilder(_enabledFeatureFlag));
+    }
+}
+
+/// <summary>
+/// Arranges the IFeatureService mock to enable the specified feature flag
+/// </summary>
+public class FeatureServiceCustomizeAttribute : BitCustomizeAttribute
+{
+    private readonly string _enabledFeatureFlag;
+
+    public FeatureServiceCustomizeAttribute(string enabledFeatureFlag)
+    {
+        _enabledFeatureFlag = enabledFeatureFlag;
+    }
+
+    public override ICustomization GetCustomization() => new FeatureServiceCustomization(_enabledFeatureFlag);
+}

test/Core.Test/Services/CollectionServiceTests.cs

@@ -112,7 +112,9 @@ public class CollectionServiceTest
     {
         collection.Id = default;
         sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organization.Id).Returns(organization);
-        sutProvider.EnableFeatureFlag(FeatureFlagKeys.FlexibleCollections);
+        sutProvider.GetDependency<IFeatureService>()
+            .IsEnabled(FeatureFlagKeys.FlexibleCollections, Arg.Any<ICurrentContext>(), Arg.Any<bool>())
+            .Returns(true);
 
         var ex = await Assert.ThrowsAsync<BadRequestException>(() => sutProvider.Sut.SaveAsync(collection, null, users));
         Assert.Contains("At least one member or group must have can manage permission.", ex.Message);