test: address remaining PR review comments

Author: BenjaminMichaelis

EssentialCSharp.Web.Tests/ContentRateLimitingTests.cs

@@ -12,7 +12,7 @@ public class ContentRateLimitingTests : IntegrationTestBase
     [Test]
     public async Task ContentEndpoint_ExceedingPerMinuteLimit_Returns429()
     {
-        HttpClient client = Factory.CreateClient();
+        using HttpClient client = CreateClientWithoutRedirectFollowing();
 
         // Anonymous limit is 10/min. First 10 requests should not be rate-limited.
         for (int i = 0; i < 10; i++)

EssentialCSharp.Web.Tests/FunctionalTests.cs

@@ -13,7 +13,8 @@ public class FunctionalTests : IntegrationTestBase
     [Arguments("/alive")]
     public async Task WhenTheApplicationStarts_ItCanLoadLoadPages(string relativeUrl)
     {
-        using HttpResponseMessage response = await GetFollowingRedirectsAsync(relativeUrl);
+        using HttpClient client = Factory.CreateClient();
+        using HttpResponseMessage response = await GetFollowingGetRedirectsAsync(client, relativeUrl);
 
         await Assert.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK);
     }
@@ -28,7 +29,8 @@ public async Task WhenTheApplicationStarts_ItCanLoadLoadPages(string relativeUrl
     [Arguments("/about?someOtherParam=value")]
     public async Task WhenPagesAreAccessed_TheyReturnHtml(string relativeUrl)
     {
-        using HttpResponseMessage response = await GetFollowingRedirectsAsync(relativeUrl);
+        using HttpClient client = Factory.CreateClient();
+        using HttpResponseMessage response = await GetFollowingGetRedirectsAsync(client, relativeUrl);
 
         await Assert.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK);
 
@@ -43,7 +45,8 @@ public async Task WhenPagesAreAccessed_TheyReturnHtml(string relativeUrl)
     [Test]
     public async Task WhenTheApplicationStarts_NonExistingPage_GivesCorrectStatusCode()
     {
-        using HttpResponseMessage response = await GetFollowingRedirectsAsync("/non-existing-page1234");
+        using HttpClient client = Factory.CreateClient();
+        using HttpResponseMessage response = await GetFollowingGetRedirectsAsync(client, "/non-existing-page1234");
 
         await Assert.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound);
     }

EssentialCSharp.Web.Tests/IntegrationTestBase.cs

@@ -1,4 +1,5 @@
 using System.Net;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using TUnit.AspNetCore;
 
@@ -11,9 +12,14 @@ public abstract class IntegrationTestBase : WebApplicationTest<WebApplicationFac
     /// TUnit trace correlation by using <see cref="TracedWebApplicationFactory{T}.CreateClient()"/>.
     /// This helper intentionally follows redirects using GET requests only.
     /// </summary>
-    protected async Task<HttpResponseMessage> GetFollowingRedirectsAsync(string relativeUrl, int maxRedirects = 10)
+    protected HttpClient CreateClientWithoutRedirectFollowing() =>
+        Factory.Inner.CreateClient(new WebApplicationFactoryClientOptions { AllowAutoRedirect = false });
+
+    protected static async Task<HttpResponseMessage> GetFollowingGetRedirectsAsync(
+        HttpClient client,
+        string relativeUrl,
+        int maxRedirects = 10)
     {
-        HttpClient client = Factory.CreateClient();
         HttpResponseMessage response = await client.GetAsync(relativeUrl);
 
         for (int redirectCount = 0;

EssentialCSharp.Web.Tests/McpTestHelper.cs

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using TUnit.AspNetCore;
@@ -15,7 +16,7 @@ namespace EssentialCSharp.Web.Tests;
 internal static class McpTestHelper
 {
     public static HttpClient CreateClient(TracedWebApplicationFactory<Program> factory) =>
-        factory.CreateClient();
+        factory.Inner.CreateClient(new WebApplicationFactoryClientOptions { AllowAutoRedirect = false });
 
     public static HttpRequestMessage CreateInitializeRequest(string path = "/mcp")
     {

EssentialCSharp.Web.Tests/WebApplicationFactory.cs

@@ -56,8 +56,26 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
                 options.UseSqlite(dbConnection);
             });
 
-            // Ensure schema exists before any other hosted service that reads from the database.
-            services.Insert(0, ServiceDescriptor.Singleton<IHostedService, EnsureCreatedHostedService>());
+            // Ensure schema exists before any hosted service that reads from the database.
+            ServiceDescriptor ensureCreatedDescriptor =
+                ServiceDescriptor.Singleton<IHostedService, EnsureCreatedHostedService>();
+            int firstHostedServiceIndex = -1;
+            for (int i = 0; i < services.Count; i++)
+            {
+                if (services[i].ServiceType == typeof(IHostedService))
+                {
+                    firstHostedServiceIndex = i;
+                    break;
+                }
+            }
+            if (firstHostedServiceIndex >= 0)
+            {
+                services.Insert(firstHostedServiceIndex, ensureCreatedDescriptor);
+            }
+            else
+            {
+                services.Add(ensureCreatedDescriptor);
+            }
 
             // Replace IListingSourceCodeService with one backed by TestData
             services.RemoveAll<IListingSourceCodeService>();