Merge branch 'main' into KyleMcMaster-patch-1

ardalis · Nov 27, 2023 · 9603856 · 9603856
2 parents f4df9f0 + b918945
commit 9603856
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 32 deletions.
diff --git a/tests/Clean.Architecture.FunctionalTests/ApiEndpoints/ContributorGetById.cs b/tests/Clean.Architecture.FunctionalTests/ApiEndpoints/ContributorGetById.cs
@@ -7,14 +7,9 @@
 namespace Clean.Architecture.FunctionalTests.ApiEndpoints;
 
 [Collection("Sequential")]
-public class ContributorGetById : IClassFixture<CustomWebApplicationFactory<Program>>
+public class ContributorGetById(CustomWebApplicationFactory<Program> factory) : IClassFixture<CustomWebApplicationFactory<Program>>
 {
-  private readonly HttpClient _client;
-
-  public ContributorGetById(CustomWebApplicationFactory<Program> factory)
-  {
-    _client = factory.CreateClient();
-  }
+  private readonly HttpClient _client = factory.CreateClient();
 
   [Fact]
   public async Task ReturnsSeedContributorGivenId1()

diff --git a/tests/Clean.Architecture.FunctionalTests/ApiEndpoints/ContributorList.cs b/tests/Clean.Architecture.FunctionalTests/ApiEndpoints/ContributorList.cs
@@ -6,14 +6,9 @@
 namespace Clean.Architecture.FunctionalTests.ApiEndpoints;
 
 [Collection("Sequential")]
-public class ContributorList : IClassFixture<CustomWebApplicationFactory<Program>>
+public class ContributorList(CustomWebApplicationFactory<Program> factory) : IClassFixture<CustomWebApplicationFactory<Program>>
 {
-  private readonly HttpClient _client;
-
-  public ContributorList(CustomWebApplicationFactory<Program> factory)
-  {
-    _client = factory.CreateClient();
-  }
+  private readonly HttpClient _client = factory.CreateClient();
 
   [Fact]
   public async Task ReturnsTwoContributors()

diff --git a/tests/Clean.Architecture.FunctionalTests/CustomWebApplicationFactory.cs b/tests/Clean.Architecture.FunctionalTests/CustomWebApplicationFactory.cs
@@ -1,9 +1,6 @@
 using Clean.Architecture.Infrastructure.Data;
-using Clean.Architecture.Infrastructure.Data.Queries;
-using Clean.Architecture.UseCases.Contributors.List;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -37,6 +34,10 @@ protected override IHost CreateHost(IHostBuilder builder)
       var logger = scopedServices
           .GetRequiredService<ILogger<CustomWebApplicationFactory<TProgram>>>();
 
+      // Reset Sqlite database for each test run
+      // If using a real database, you'll likely want to remove this step.
+      db.Database.EnsureDeleted();
+
       // Ensure the database is created.
       db.Database.EnsureCreated();
 
@@ -64,24 +65,26 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
     builder
         .ConfigureServices(services =>
         {
-          // Remove the app's ApplicationDbContext registration.
-          var descriptor = services.SingleOrDefault(
-          d => d.ServiceType ==
-              typeof(DbContextOptions<AppDbContext>));
+          // Configure test dependencies here
+
+          //// Remove the app's ApplicationDbContext registration.
+          //var descriptor = services.SingleOrDefault(
+          //d => d.ServiceType ==
+          //    typeof(DbContextOptions<AppDbContext>));
 
-          if (descriptor != null)
-          {
-            services.Remove(descriptor);
-          }
+          //if (descriptor != null)
+          //{
+          //  services.Remove(descriptor);
+          //}
 
-          // This should be set for each individual test run
-          string inMemoryCollectionName = Guid.NewGuid().ToString();
+          //// This should be set for each individual test run
+          //string inMemoryCollectionName = Guid.NewGuid().ToString();
 
-          // Add ApplicationDbContext using an in-memory database for testing.
-          services.AddDbContext<AppDbContext>(options =>
-          {
-            options.UseInMemoryDatabase(inMemoryCollectionName);
-          });
+          //// Add ApplicationDbContext using an in-memory database for testing.
+          //services.AddDbContext<AppDbContext>(options =>
+          //{
+          //  options.UseInMemoryDatabase(inMemoryCollectionName);
+          //});
         });
   }
 }