nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-08 06:28:14 -05:00
Code

[AC-2077] Set a minimum number of seats for the tested Organization (#3702)

Browse Source 
* [AC-2077] Set a minimum number of seats for the tested Organization

* [AC-2077] Added PlanType property to OrganizationCustomization

* [AC-2077] Set up the test secrets manager seats to be null in case the plan does not support it
This commit is contained in:
Rui Tomé 2024-02-16 11:49:05 +00:00 committed by GitHub
parent 268db7d45e
commit d187487cb7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,17 +19,26 @@ public class OrganizationCustomization : ICustomization
{ {
public bool UseGroups { get; set; } public bool UseGroups { get; set; }
public bool FlexibleCollections { get; set; } public bool FlexibleCollections { get; set; }
public PlanType PlanType { get; set; }
public void Customize(IFixture fixture) public void Customize(IFixture fixture)
{ {
var organizationId = Guid.NewGuid(); var organizationId = Guid.NewGuid();
var maxCollections = (short)new Random().Next(10, short.MaxValue); var maxCollections = (short)new Random().Next(10, short.MaxValue);
var plan = StaticStore.Plans.FirstOrDefault(p => p.Type == PlanType);
var seats = (short)new Random().Next(plan.PasswordManager.BaseSeats, plan.PasswordManager.MaxSeats ?? short.MaxValue);
var smSeats = plan.SupportsSecretsManager
? (short?)new Random().Next(plan.SecretsManager.BaseSeats, plan.SecretsManager.MaxSeats ?? short.MaxValue)
: null;
fixture.Customize<Organization>(composer => composer fixture.Customize<Organization>(composer => composer
.With(o => o.Id, organizationId) .With(o => o.Id, organizationId)
.With(o => o.MaxCollections, maxCollections) .With(o => o.MaxCollections, maxCollections)
.With(o => o.UseGroups, UseGroups) .With(o => o.UseGroups, UseGroups)
.With(o => o.FlexibleCollections, FlexibleCollections)); .With(o => o.FlexibleCollections, FlexibleCollections)
.With(o => o.PlanType, PlanType)
.With(o => o.Seats, seats)
.With(o => o.SmSeats, smSeats));
fixture.Customize<Collection>(composer => fixture.Customize<Collection>(composer =>
composer composer
@ -186,10 +195,12 @@ public class OrganizationCustomizeAttribute : BitCustomizeAttribute
{ {
public bool UseGroups { get; set; } public bool UseGroups { get; set; }
public bool FlexibleCollections { get; set; } public bool FlexibleCollections { get; set; }
public PlanType PlanType { get; set; } = PlanType.EnterpriseAnnually;
public override ICustomization GetCustomization() => new OrganizationCustomization() public override ICustomization GetCustomization() => new OrganizationCustomization()
{ {
UseGroups = UseGroups, UseGroups = UseGroups,
FlexibleCollections = FlexibleCollections FlexibleCollections = FlexibleCollections,
PlanType = PlanType
}; };
} }