Merge pull request #1258 from tgstation/1255-IRCPasswordlessFix

Fixes being unable to create passwordless IRC bots
This commit is contained in:
Jordan Brown
2021-05-09 19:21:56 -04:00
committed by GitHub
2 changed files with 51 additions and 1 deletions
@@ -110,6 +110,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
{
if (assemblyInformationProvider == null)
throw new ArgumentNullException(nameof(assemblyInformationProvider));
this.asyncDelayer = asyncDelayer ?? throw new ArgumentNullException(nameof(asyncDelayer));
var builder = chatBot.CreateConnectionStringBuilder();
@@ -121,7 +122,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
nickname = ircBuilder.Nickname;
password = ircBuilder.Password;
passwordType = ircBuilder.PasswordType.Value;
passwordType = ircBuilder.PasswordType;
client = new IrcFeatures
{
@@ -0,0 +1,49 @@
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using System;
using System.Threading.Tasks;
using Tgstation.Server.Api.Models;
using Tgstation.Server.Host.Core;
using Tgstation.Server.Host.Jobs;
using Tgstation.Server.Host.Models;
using Tgstation.Server.Host.System;
namespace Tgstation.Server.Host.Components.Chat.Providers.Tests
{
[TestClass]
public sealed class TestIrcProvider
{
[TestMethod]
public async Task TestConstructionAndDisposal()
{
Assert.ThrowsException<ArgumentNullException>(() => new IrcProvider(null, null, null, null, null));
var mockJobManager = new Mock<IJobManager>();
Assert.ThrowsException<ArgumentNullException>(() => new IrcProvider(mockJobManager.Object, null, null, null, null));
var mockAss = new Mock<IAssemblyInformationProvider>();
Assert.ThrowsException<ArgumentNullException>(() => new IrcProvider(mockJobManager.Object, mockAss.Object, null, null, null));
var mockAsyncDelayer = new Mock<IAsyncDelayer>();
Assert.ThrowsException<ArgumentNullException>(() => new IrcProvider(mockJobManager.Object, mockAss.Object, mockAsyncDelayer.Object, null, null));
var mockLogger = new Mock<ILogger<IrcProvider>>();
Assert.ThrowsException<ArgumentNullException>(() => new IrcProvider(mockJobManager.Object, mockAss.Object, mockAsyncDelayer.Object, mockLogger.Object, null));
var mockBot = new ChatBot
{
Name = "test",
Provider = ChatProvider.Irc
};
Assert.ThrowsException<InvalidOperationException>(() => new IrcProvider(mockJobManager.Object, mockAss.Object, mockAsyncDelayer.Object, mockLogger.Object, mockBot));
mockBot.ConnectionString = new IrcConnectionStringBuilder
{
Address = "localhost",
Nickname = "test",
UseSsl = true,
Port = 6667
}.ToString();
await new IrcProvider(mockJobManager.Object, mockAss.Object, mockAsyncDelayer.Object, mockLogger.Object, mockBot).DisposeAsync();
}
}
}