Merge pull request #369 from meysamhadeli/fix/fix-ci-failed

Fix/fix ci failed

Author: meysamhadeli

src/BuildingBlocks/TestBase/TestBase.cs

@@ -140,7 +140,6 @@ public async Task InitializeAsync()
         if (ServiceProvider.GetService<ITestHarness>() is { } harness)
         {
             await harness.Start();
-            await Task.Delay(1000);
         }
     }
 

src/BuildingBlocks/TestBase/TestContainers.cs

@@ -1,3 +1,5 @@
+using DotNet.Testcontainers.Builders;
+
 namespace BuildingBlocks.TestBase;
 
 using Testcontainers.EventStoreDb;
@@ -18,15 +20,19 @@ static TestContainers()
     {
         var configuration = ConfigurationHelper.GetConfiguration();
 
-        RabbitMqContainerConfiguration =
-            configuration.GetOptions<RabbitMqContainerOptions>(nameof(RabbitMqContainerOptions));
-        PostgresContainerConfiguration =
-            configuration.GetOptions<PostgresContainerOptions>(nameof(PostgresContainerOptions));
-        PostgresPersistContainerConfiguration =
-            configuration.GetOptions<PostgresPersistContainerOptions>(nameof(PostgresPersistContainerOptions));
+        RabbitMqContainerConfiguration = configuration.GetOptions<RabbitMqContainerOptions>(
+            nameof(RabbitMqContainerOptions)
+        );
+        PostgresContainerConfiguration = configuration.GetOptions<PostgresContainerOptions>(
+            nameof(PostgresContainerOptions)
+        );
+        PostgresPersistContainerConfiguration = configuration.GetOptions<PostgresPersistContainerOptions>(
+            nameof(PostgresPersistContainerOptions)
+        );
         MongoContainerConfiguration = configuration.GetOptions<MongoContainerOptions>(nameof(MongoContainerOptions));
-        EventStoreContainerConfiguration =
-            configuration.GetOptions<EventStoreContainerOptions>(nameof(EventStoreContainerOptions));
+        EventStoreContainerConfiguration = configuration.GetOptions<EventStoreContainerOptions>(
+            nameof(EventStoreContainerOptions)
+        );
     }
 
     public static PostgreSqlContainer PostgresTestContainer()
@@ -81,25 +87,33 @@ public static MongoDbContainer MongoTestContainer()
 
     public static RabbitMqContainer RabbitMqTestContainer()
     {
-        var baseBuilder = new RabbitMqBuilder()
+        var builder = new RabbitMqBuilder()
             .WithUsername(RabbitMqContainerConfiguration.UserName)
             .WithPassword(RabbitMqContainerConfiguration.Password)
-            .WithLabel("Key", "Value");
-
-        var builder = baseBuilder
             .WithImage(RabbitMqContainerConfiguration.ImageName)
             .WithName(RabbitMqContainerConfiguration.Name)
             .WithPortBinding(RabbitMqContainerConfiguration.ApiPort, true)
             .WithPortBinding(RabbitMqContainerConfiguration.Port, true)
+            .WithWaitStrategy(
+                Wait.ForUnixContainer()
+                    .UntilHttpRequestIsSucceeded(request =>
+                        request
+                            .ForPort((ushort)RabbitMqContainerConfiguration.ApiPort)
+                            .ForPath("/api/overview")
+                            .WithBasicAuthentication(
+                                RabbitMqContainerConfiguration.UserName,
+                                RabbitMqContainerConfiguration.Password
+                            )
+                    )
+            )
             .Build();
 
         return builder;
     }
 
     public static EventStoreDbContainer EventStoreTestContainer()
     {
-        var baseBuilder = new EventStoreDbBuilder()
-            .WithLabel("Key", "Value");
+        var baseBuilder = new EventStoreDbBuilder().WithLabel("Key", "Value");
 
         var builder = baseBuilder
             .WithImage(EventStoreContainerConfiguration.ImageName)