From 3e031a342f0ab1b7c1e0e66a42ac16779ed79b8a Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sat, 14 May 2022 23:50:36 -0400
Subject: [PATCH] Fix website tests failing

---
 .../Startup/ApiStartup.cs                         |  4 ++--
 .../Startup/ApiTestStartup.cs                     | 15 +++++++++++++++
 .../Startup/WebsiteStartup.cs                     |  4 ++--
 .../Startup/WebsiteTestStartup.cs                 | 15 +++++++++++++++
 .../LighthouseWebTest.cs                          |  4 ++--
 5 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 ProjectLighthouse.Servers.API/Startup/ApiTestStartup.cs
 create mode 100644 ProjectLighthouse.Servers.Website/Startup/WebsiteTestStartup.cs

diff --git a/ProjectLighthouse.Servers.API/Startup/ApiStartup.cs b/ProjectLighthouse.Servers.API/Startup/ApiStartup.cs
index b25f8f85..68c5aecf 100644
--- a/ProjectLighthouse.Servers.API/Startup/ApiStartup.cs
+++ b/ProjectLighthouse.Servers.API/Startup/ApiStartup.cs
@@ -5,7 +5,7 @@ using Microsoft.OpenApi.Models;
 
 namespace LBPUnion.ProjectLighthouse.Servers.API.Startup;
 
-public sealed class ApiStartup
+public class ApiStartup
 {
     public ApiStartup(IConfiguration configuration)
     {
@@ -52,7 +52,7 @@ public sealed class ApiStartup
         );
     }
 
-    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     {
         #if DEBUG
         app.UseDeveloperExceptionPage();
diff --git a/ProjectLighthouse.Servers.API/Startup/ApiTestStartup.cs b/ProjectLighthouse.Servers.API/Startup/ApiTestStartup.cs
new file mode 100644
index 00000000..42446bc0
--- /dev/null
+++ b/ProjectLighthouse.Servers.API/Startup/ApiTestStartup.cs
@@ -0,0 +1,15 @@
+using LBPUnion.ProjectLighthouse.Helpers.Middlewares;
+
+namespace LBPUnion.ProjectLighthouse.Servers.API.Startup;
+
+public class ApiTestStartup : ApiStartup
+{
+    public ApiTestStartup(IConfiguration configuration) : base(configuration)
+    {}
+
+    public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        app.UseMiddleware<FakeRemoteIPAddressMiddleware>();
+        base.Configure(app, env);
+    }
+}
\ No newline at end of file
diff --git a/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs b/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
index d6602244..d2395ed9 100644
--- a/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
+++ b/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.HttpOverrides;
 
 namespace LBPUnion.ProjectLighthouse.Servers.Website.Startup;
 
-public sealed class WebsiteStartup
+public class WebsiteStartup
 {
     public WebsiteStartup(IConfiguration configuration)
     {
@@ -41,7 +41,7 @@ public sealed class WebsiteStartup
     }
 
     // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     {
         #if DEBUG
         app.UseDeveloperExceptionPage();
diff --git a/ProjectLighthouse.Servers.Website/Startup/WebsiteTestStartup.cs b/ProjectLighthouse.Servers.Website/Startup/WebsiteTestStartup.cs
new file mode 100644
index 00000000..0783cb27
--- /dev/null
+++ b/ProjectLighthouse.Servers.Website/Startup/WebsiteTestStartup.cs
@@ -0,0 +1,15 @@
+using LBPUnion.ProjectLighthouse.Helpers.Middlewares;
+
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Startup;
+
+public class WebsiteTestStartup : WebsiteStartup
+{
+    public WebsiteTestStartup(IConfiguration configuration) : base(configuration)
+    {}
+
+    public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        app.UseMiddleware<FakeRemoteIPAddressMiddleware>();
+        base.Configure(app, env);
+    }
+}
\ No newline at end of file
diff --git a/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs b/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs
index 956ab04f..babb22ad 100644
--- a/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs
+++ b/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
+using LBPUnion.ProjectLighthouse.Servers.Website.Startup;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using OpenQA.Selenium;
@@ -15,7 +15,7 @@ public class LighthouseWebTest : IDisposable
     public readonly string BaseAddress;
 
     public readonly IWebDriver Driver;
-    public readonly IWebHost WebHost = new WebHostBuilder().UseKestrel().UseStartup<GameServerTestStartup>().UseWebRoot("StaticFiles").Build();
+    public readonly IWebHost WebHost = new WebHostBuilder().UseKestrel().UseStartup<WebsiteTestStartup>().UseWebRoot("StaticFiles").Build();
 
     public LighthouseWebTest()
     {