From 4578afcd7a06d5bcd881a5f3b810e8b967008c74 Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 22 Nov 2024 15:08:31 -0500 Subject: [PATCH] add feature flag to tests for deleteManyAsync --- src/Core/Services/IUserService.cs | 2 -- ...anagedOrganizationUserAccountCommandTests.cs | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/Core/Services/IUserService.cs b/src/Core/Services/IUserService.cs index ba96ba961d..0094538ebd 100644 --- a/src/Core/Services/IUserService.cs +++ b/src/Core/Services/IUserService.cs @@ -8,8 +8,6 @@ using Bit.Core.Models.Business; using Fido2NetLib; using Microsoft.AspNetCore.Identity; -#nullable enable - namespace Bit.Core.Services; public interface IUserService diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteManagedOrganizationUserAccountCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteManagedOrganizationUserAccountCommandTests.cs index 6a40b360d4..0fdfad615f 100644 --- a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteManagedOrganizationUserAccountCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteManagedOrganizationUserAccountCommandTests.cs @@ -385,6 +385,9 @@ public class DeleteManagedOrganizationUserAccountCommandTests .GetManyAsync(Arg.Is>(ids => ids.Contains(user.Id))) .Returns(new[] { user }); + sutProvider.GetDependency() + .IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); + // Act var result = await sutProvider.Sut.DeleteManyUsersAsync(orgUser.OrganizationId, new[] { orgUser.Id }, deletingUserId); @@ -410,6 +413,9 @@ public class DeleteManagedOrganizationUserAccountCommandTests .GetManyAsync(Arg.Any>()) .Returns(new List { orgUser }); + sutProvider.GetDependency() + .IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); + // Act var result = await sutProvider.Sut.DeleteManyUsersAsync(orgUser.OrganizationId, new[] { orgUser.Id }, null); @@ -444,6 +450,9 @@ public class DeleteManagedOrganizationUserAccountCommandTests .OrganizationOwner(orgUser.OrganizationId) .Returns(false); + sutProvider.GetDependency() + .IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); + var result = await sutProvider.Sut.DeleteManyUsersAsync(orgUser.OrganizationId, new[] { orgUser.Id }, deletingUserId); Assert.Single(result); @@ -480,6 +489,9 @@ public class DeleteManagedOrganizationUserAccountCommandTests .HasConfirmedOwnersExceptAsync(orgUser.OrganizationId, Arg.Any>(), Arg.Any()) .Returns(false); + sutProvider.GetDependency() + .IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); + // Act var result = await sutProvider.Sut.DeleteManyUsersAsync(orgUser.OrganizationId, new[] { orgUser.Id }, deletingUserId); @@ -513,6 +525,8 @@ public class DeleteManagedOrganizationUserAccountCommandTests .GetUsersOrganizationManagementStatusAsync(Arg.Any(), Arg.Any>()) .Returns(new Dictionary { { orgUser.Id, false } }); + sutProvider.GetDependency() + .IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); // Act var result = await sutProvider.Sut.DeleteManyUsersAsync(orgUser.OrganizationId, new[] { orgUser.Id }, null); @@ -552,6 +566,9 @@ public class DeleteManagedOrganizationUserAccountCommandTests .GetUsersOrganizationManagementStatusAsync(organizationId, Arg.Any>()) .Returns(new Dictionary { { orgUser1.Id, true }, { orgUser3.Id, false } }); + sutProvider.GetDependency() + .IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); + // Act var results = await sutProvider.Sut.DeleteManyUsersAsync(organizationId, new[] { orgUser1.Id, orgUser2.Id, orgUser3.Id }, null);