Work in progress on refactoring and adding Commerce

Author: andreas-valtech

src/Web/Program.cs

@@ -4,8 +4,9 @@ public class Program
 {
     public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
 
+    // Split Startup into two classes StartupWithCmsAndCommerce and StartupWithCms to be able to test both in isolation
     public static IHostBuilder CreateHostBuilder(string[] args) =>
         Host.CreateDefaultBuilder(args)
             .ConfigureCmsDefaults()
-            .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
+            .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<StartupWithCmsAndCommerce>());
 }

src/Web/Startup.cs src/Web/StartupWithCms.cssrc/Web/Startup.cs renamed to src/Web/StartupWithCms.cs

@@ -1,35 +1,26 @@
 using EPiServer.Cms.Shell;
 using EPiServer.Cms.UI.AspNetIdentity;
 using EPiServer.Scheduler;
-using EPiServer.ServiceLocation;
 using EPiServer.Web.Routing;
 
 namespace Optimizely.TestContainers;
 
-public class Startup
+public class StartupWithCms(IWebHostEnvironment webHostingEnvironment)
 {
-    private readonly IWebHostEnvironment _webHostingEnvironment;
-
-    public Startup(IWebHostEnvironment webHostingEnvironment)
-    {
-        _webHostingEnvironment = webHostingEnvironment;
-    }
-
     public void ConfigureServices(IServiceCollection services)
     {
-        if (_webHostingEnvironment.IsDevelopment())
+        if (webHostingEnvironment.IsDevelopment())
         {
-            AppDomain.CurrentDomain.SetData("DataDirectory", Path.Combine(_webHostingEnvironment.ContentRootPath, "App_Data"));
+            AppDomain.CurrentDomain.SetData("DataDirectory", Path.Combine(webHostingEnvironment.ContentRootPath, "App_Data"));
 
             services.Configure<SchedulerOptions>(options => options.Enabled = false);
         }
 
         services
             .AddCmsAspNetIdentity<ApplicationUser>()
             .AddCms()
-            .AddCommerce()
             .AddAdminUserRegistration()
-            .AddEmbeddedLocalization<Startup>();
+            .AddEmbeddedLocalization<StartupWithCms>();
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

src/Web/StartupWithCmsAndCommerce.cs

@@ -0,0 +1,44 @@
+using EPiServer.Cms.Shell;
+using EPiServer.Cms.UI.AspNetIdentity;
+using EPiServer.Scheduler;
+using EPiServer.Web.Routing;
+
+namespace Optimizely.TestContainers;
+
+public class StartupWithCmsAndCommerce(IWebHostEnvironment webHostingEnvironment)
+{
+    public void ConfigureServices(IServiceCollection services)
+    {
+        if (webHostingEnvironment.IsDevelopment())
+        {
+            AppDomain.CurrentDomain.SetData("DataDirectory", Path.Combine(webHostingEnvironment.ContentRootPath, "App_Data"));
+
+            services.Configure<SchedulerOptions>(options => options.Enabled = false);
+        }
+
+        services
+            .AddCmsAspNetIdentity<ApplicationUser>()
+            .AddCms()
+            .AddCommerce()
+            .AddAdminUserRegistration()
+            .AddEmbeddedLocalization<StartupWithCms>();
+    }
+
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        if (env.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
+        }
+
+        app.UseStaticFiles();
+        app.UseRouting();
+        app.UseAuthentication();
+        app.UseAuthorization();
+
+        app.UseEndpoints(endpoints =>
+        {
+            endpoints.MapContent();
+        });
+    }
+}

test/OptimizelyTestContainers.Tests/CommerceCatalogIntegrationTests.cs

@@ -9,32 +9,41 @@
 
 namespace OptimizelyTestContainers.Tests;
 
-public class CommerceCatalogIntegrationTests : OptimizelyCommerceIntegrationTestBase
+public class CommerceCatalogIntegrationTests() : OptimizelyIntegrationTestBase(includeCommerce: true)
 {
     [Fact]
-    public void Can_Save_Category()
+    public void Can_Save_Node_And_Product()
     {
+        // Arrange #1
         var referenceConverter = Services.GetRequiredService<ReferenceConverter>();
         var contentRepository = Services.GetRequiredService<IContentRepository>();
 
         var rootLink = referenceConverter.GetRootLink();
 
         var aliensNode = contentRepository.GetDefault<NodeContent>(rootLink, CultureInfo.GetCultureInfo("en"));
         aliensNode.Name = "Aliens";
-        var aliensNodeReference = contentRepository.Save(aliensNode, SaveAction.Publish);
 
+        // Act #1
+        var aliensNodeReference = contentRepository.Save(aliensNode, SaveAction.Publish);
+        
+        // Arrange #2
         var testAlienProduct = contentRepository.GetDefault<TestProduct>(aliensNodeReference, CultureInfo.GetCultureInfo("en"));
         testAlienProduct.Name = "Snarbo";
         testAlienProduct.Description = new XhtmlString("<p>Some scary facts about Aliens!</p>");
-        var testAlienProductReference = contentRepository.Save(testAlienProduct, SaveAction.Publish);
 
+        // Act #2
+         var testAlienProductReference = contentRepository.Save(testAlienProduct, SaveAction.Publish);
+        
+        // Assert # 1 & 2
         Assert.NotNull(aliensNodeReference);
         Assert.NotNull(testAlienProductReference);
-
-        aliensNode = contentRepository.Get<NodeContent>(aliensNodeReference);
-        Assert.Equal("Aliens", aliensNode.Name);
 
+        // Act #3
+        aliensNode = contentRepository.Get<NodeContent>(aliensNodeReference);
         testAlienProduct = contentRepository.Get<TestProduct>(testAlienProductReference);
+        
+        // Assert #3
+        Assert.Equal("Aliens", aliensNode.Name);
         Assert.Equal("Snarbo", testAlienProduct.Name);
     }
 }

test/OptimizelyTestContainers.Tests/NewsPageIntegrationTests.cs

@@ -9,7 +9,7 @@
 
 namespace OptimizelyTestContainers.Tests;
 
-public class NewsPageIntegrationTest : OptimizelyCmsIntegrationTestBase
+public class NewsPageIntegrationTest() : OptimizelyIntegrationTestBase(includeCommerce: false)
 {
     [Fact]
     public void Can_Create_And_Read_NewsPage()