Working on startup ordering

Author: andreas-valtech

src/Web/Models/Commerce/TestProduct.cs

@@ -18,5 +18,5 @@ public class TestProduct : ProductContent
     [CultureSpecific]
     [Tokenize]
     [IncludeInDefaultSearch]
-    public XhtmlString? Description { get; set; }
+    public virtual XhtmlString? Description { get; set; }
 }

test/OptimizelyTestContainers.Tests/OptimizelyCmsIntegrationTestBase.cs

@@ -1,4 +1,5 @@
-using EPiServer.Framework;
+using EPiServer.Data;
+using EPiServer.Framework;
 using EPiServer.Framework.Initialization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
@@ -20,6 +21,7 @@ public virtual async Task InitializeAsync()
     {
         // Start SQL Server container
         CmsDbContainer = new MsSqlBuilder()
+            .WithName("Cms")
             .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
             .WithPassword("yourStrong(!)Password")
             .Build();
@@ -29,35 +31,35 @@ public virtual async Task InitializeAsync()
         // Build CMS host
         _host = Host.CreateDefaultBuilder()
             .ConfigureCmsDefaults()
-            .ConfigureWebHostDefaults(CustomizebHostDetaults)
+            .ConfigureWebHostDefaults(webHost =>
+            {
+                CustomizebHostDetaults(webHost);
+
+                webHost.UseStartup<Startup>();
+            })
             .Build();
 
-        await _host.StartAsync();
-
         CustomizeStartup();
 
+        await _host.StartAsync();
+        
         Services = _host.Services;
     }
 
     public virtual void CustomizebHostDetaults(IWebHostBuilder webBuilder)
     {
         webBuilder.ConfigureServices((context, services) =>
         {
-            /*
             services.Configure<DataAccessOptions>(opt =>
             {
                 var containerConnectionString = CmsDbContainer.GetConnectionString();
 
                 opt.SetConnectionString(containerConnectionString);
             });
-            */
-
+            
             // Add data importer service to setup default content for the tests
             services.AddTransient<OptimizelyDataImporter>();
         });
-        
-        // Use the Alloy startup by default
-        webBuilder.UseStartup<Startup>();
     }
 
     public virtual void CustomizeStartup()

test/OptimizelyTestContainers.Tests/OptimizelyCommerceIntegrationTestBase.cs

@@ -14,6 +14,7 @@ public override async Task InitializeAsync()
 
         // Start SQL Server container
         CommerceDbContainer = new MsSqlBuilder()
+            .WithName("Commerce")
             .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
             .WithPassword("yourStrong(!)Password")
             .Build();
@@ -23,25 +24,22 @@ public override async Task InitializeAsync()
 
     public override void CustomizebHostDetaults(IWebHostBuilder webBuilder)
     {
-
+        base.CustomizebHostDetaults(webBuilder);
+        
         webBuilder.ConfigureAppConfiguration((context, configBuilder) =>
         {
             var testSettings = new Dictionary<string, string?>
             {
-                //["ConnectionStrings:EPiServerDB"] = CmsDbContainer.GetConnectionString(),
-                ["ConnectionStrings:EcfSqlConnection"] = CommerceDbContainer.GetConnectionString(),
+                ["ConnectionStrings:EcfSqlConnection"] = CommerceDbContainer.GetConnectionString()
             };
 
             configBuilder.AddInMemoryCollection(testSettings);
         });
-        
-        base.CustomizebHostDetaults(webBuilder);
     }
 
     public override void CustomizeStartup()
     {
-        // TOOD: No-op for now
-        base.CustomizeStartup();
+        // TODO: If need to add more Commerce specific initialization
     }
 
     public override async Task DisposeAsync()