From 057b217f7635c148d83f1b14ba6b0a5e5b48dea4 Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Thu, 1 Nov 2018 11:43:07 -0400
Subject: [PATCH] Fix unit tests

---
 .../Core/TestApplication.cs                        |  8 ++++----
 .../Core/TestSetupWizard.cs                        | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/Tgstation.Server.Host.Tests/Core/TestApplication.cs b/tests/Tgstation.Server.Host.Tests/Core/TestApplication.cs
index b547853637..94eba126e5 100644
--- a/tests/Tgstation.Server.Host.Tests/Core/TestApplication.cs
+++ b/tests/Tgstation.Server.Host.Tests/Core/TestApplication.cs
@@ -43,10 +43,10 @@ namespace Tgstation.Server.Host.Core.Tests
 			var mockTokenFactory = new Mock<ITokenFactory>();
 			Assert.ThrowsException<ArgumentNullException>(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, null, null));
 
-			var mockGeneralOptions = new Mock<IOptions<GeneralConfiguration>>();
-			mockGeneralOptions.SetupGet(x => x.Value).Returns(new GeneralConfiguration()).Verifiable();
-			Assert.ThrowsException<ArgumentNullException>(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, mockGeneralOptions.Object, null));
-			mockGeneralOptions.VerifyAll();
+			var mockControlPanelOptions = new Mock<IOptions<ControlPanelConfiguration>>();
+			mockControlPanelOptions.SetupGet(x => x.Value).Returns(new ControlPanelConfiguration()).Verifiable();
+			Assert.ThrowsException<ArgumentNullException>(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, mockControlPanelOptions.Object, null));
+			mockControlPanelOptions.VerifyAll();
 		}
 
 		class MockSetupWizard : ISetupWizard
diff --git a/tests/Tgstation.Server.Host.Tests/Core/TestSetupWizard.cs b/tests/Tgstation.Server.Host.Tests/Core/TestSetupWizard.cs
index 04dbe9aefd..8dbe49f363 100644
--- a/tests/Tgstation.Server.Host.Tests/Core/TestSetupWizard.cs
+++ b/tests/Tgstation.Server.Host.Tests/Core/TestSetupWizard.cs
@@ -135,7 +135,6 @@ namespace Tgstation.Server.Host.Core.Tests
 				"user",
 				"pass",
 				//general config
-				"y",
 				"four",
 				"-12",
 				"16",
@@ -145,6 +144,9 @@ namespace Tgstation.Server.Host.Core.Tests
 				"fake token",
 				//logging config
 				"no",
+				//cp config
+				"y",
+				"y",
 				//saved, now for second run
 				//this time use defaults amap
 				String.Empty,
@@ -166,6 +168,10 @@ namespace Tgstation.Server.Host.Core.Tests
 				"not actually verified because lol mocks /../!@#$%^&*()/..///.",
 				"Warning",
 				String.Empty,
+				//cp config
+				"y",
+				"n",
+				String.Empty,
 				//third run, we already hit all the code coverage so just get through it
 				String.Empty,
 				nameof(DatabaseType.MariaDB),
@@ -185,7 +191,11 @@ namespace Tgstation.Server.Host.Core.Tests
 				String.Empty,
 				"fake",
 				"None",
-				"Critical"
+				"Critical",
+				//cp config
+				"y",
+				"n",
+				"http://fake.com, https://example.org",
 			};
 
 			var inputPos = 0;