Trying to solve the Cms vs Commerce issue with separate projects and startups

Author: andreas-valtech

Optimizely.TestContainers.Shared/OptimizelyIntegrationTestBase.cs

@@ -1,6 +1,7 @@
 using EPiServer.Data;
 using EPiServer.Framework;
 using EPiServer.Framework.Initialization;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -9,7 +10,7 @@
 
 namespace Optimizely.TestContainers.Shared;
 
-public class OptimizelyIntegrationTestBase(bool includeCommerce) : IAsyncLifetime
+public abstract class OptimizelyIntegrationTestBase(bool includeCommerce) : IAsyncLifetime
 {
     private IHost _host = null!;
 
@@ -27,10 +28,10 @@ public virtual async Task InitializeAsync()
         var cmsDatabaseConnectionString = await CreateNamedDatabaseConnectionString(container, "Cms");
 
         string? commerceDatabaseConnectionString = null;
-        /*if (includeCommerce)
-        {*/
+        if (includeCommerce)
+        {
             commerceDatabaseConnectionString = await CreateNamedDatabaseConnectionString(container, "Commerce");
-        /*}*/
+        }
 
 
         // Build CMS host
@@ -66,15 +67,17 @@ public virtual async Task InitializeAsync()
                         /*}*/
                     });
 
+                ConfiureWebHostBuilder(webHostBuilder); 
+                
                 // TOOD: Run startup in each test project!
-                if (includeCommerce && !string.IsNullOrWhiteSpace(commerceDatabaseConnectionString))
+                /*if (includeCommerce && !string.IsNullOrWhiteSpace(commerceDatabaseConnectionString))
                 {
-                    //webHostBuilder.UseStartup<StartupWithCmsAndCommerce>();
+                    webHostBuilder.UseStartup<Optimizely.TestContainers.Startup>();
                 }
                 else
                 {
-                    //webHostBuilder.UseStartup<StartupWithCms>(); 
-                }
+                    webHostBuilder.UseStartup<StartupWithCms>(); 
+                }*/
 
 
 
@@ -95,7 +98,9 @@ public virtual async Task InitializeAsync()
 
         await _host.StartAsync();
     }
-    
+
+    protected abstract void ConfiureWebHostBuilder(IWebHostBuilder webHostBuilder);
+
     public async Task DisposeAsync()
     {
         await _host.StopAsync();

…Tests/CommerceCatalogIntegrationTests.cs …Tests/CommerceCatalogIntegrationTests.csOptimizely.TestContainers.Commerce.Tests/CommerceCatalogIntegrationTests.cs renamed to test/OptimizelyTestContainers.Tests/CommerceCatalogIntegrationTests.cs Optimizely.TestContainers.Commerce.Tests/CommerceCatalogIntegrationTests.cs renamed to test/OptimizelyTestContainers.Tests/CommerceCatalogIntegrationTests.cs

@@ -6,6 +6,7 @@
 using EPiServer.Security;
 using Mediachase.Commerce;
 using Mediachase.Commerce.Catalog;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Optimizely.TestContainers.Commerce.Tests.Models.Commerce;
 using Optimizely.TestContainers.Shared;
@@ -14,6 +15,11 @@ namespace Optimizely.TestContainers.Commerce.Tests;
 
 public class CommerceCatalogIntegrationTests() : OptimizelyIntegrationTestBase(includeCommerce: true)
 {
+    protected override void ConfiureWebHostBuilder(IWebHostBuilder webHostBuilder)
+    {
+        webHostBuilder.UseStartup<Startup>();
+    }
+    
     [Fact]
     public void Can_Save_Catalog_And_Node_And_Product()
     {

test/OptimizelyTestContainers.Tests/NewsPageIntegrationTests.cs

@@ -4,6 +4,7 @@
 using EPiServer.DataAccess;
 using EPiServer.Security;
 using EPiServer.Web;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Optimizely.TestContainers.Models.Pages;
 using Optimizely.TestContainers.Shared;
@@ -12,6 +13,12 @@ namespace OptimizelyTestContainers.Tests;
 
 public class NewsPageIntegrationTest() : OptimizelyIntegrationTestBase(includeCommerce: false)
 {
+    protected override void ConfiureWebHostBuilder(IWebHostBuilder webHostBuilder)
+    {
+        webHostBuilder.UseStartup<Startup>();
+    }
+
+    
     [Fact]
     public void Can_Create_And_Read_NewsPage()
     {

test/OptimizelyTestContainers.Tests/Startup.cs

@@ -1,7 +1,5 @@
 using EPiServer.Cms.Shell;
 using EPiServer.Cms.UI.AspNetIdentity;
-using EPiServer.Commerce.Internal;
-using EPiServer.Data.SchemaUpdates;
 using EPiServer.Scheduler;
 using EPiServer.Web.Routing;
 using Microsoft.AspNetCore.Builder;
@@ -27,23 +25,6 @@ public void ConfigureServices(IServiceCollection services)
             .AddCms()
             .AddAdminUserRegistration()
             .AddEmbeddedLocalization<Startup>();
-        
-        // Remove the schema updater from the container if we're not running Commerce
-        /*if (!includeCommerce)
-        {*/
-            //services.RemoveImplementation<ISchemaUpdater, CommerceDatabaseSchemaUpdater>();
-            //services.RemoveImplementation<SchemaUpdaterBase, CommerceDatabaseSchemaUpdater>();
-        /*}*/
-
-        // TODO: Runs all initializable modules even if commerce is not included!
-        // Solve with custom IAssemblyScanner?
-        /*
-        if (!includeCommerce)
-        {
-            services.Replace(new ServiceDescriptor(typeof(IAssemblyScanner)))
-            services.AddSingleton<IAssemblyScanner, ExcludeCommerceAssemblyScanner>();
-        }
-        */
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)