Try to fix weird integration tests issues, update submodule.

This commit is contained in:
Pieter-Jan Briers
2019-08-22 10:21:54 +02:00
parent ecbf9a7706
commit 09b1066122
2 changed files with 13 additions and 2 deletions

View File

@@ -11,7 +11,10 @@ namespace Content.IntegrationTests
{
protected override ClientIntegrationInstance StartClient(ClientIntegrationOptions options = null)
{
options = options ?? new ClientIntegrationOptions();
options ??= new ClientIntegrationOptions();
// ReSharper disable once RedundantNameQualifier
options.ClientContentAssembly = typeof(Client.EntryPoint).Assembly;
options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly;
options.BeforeStart += () =>
{
// Connecting to Discord is a massive waste of time.
@@ -27,5 +30,13 @@ namespace Content.IntegrationTests
};
return base.StartClient(options);
}
protected override ServerIntegrationInstance StartServer(ServerIntegrationOptions options = null)
{
options ??= new ServerIntegrationOptions();
options.ServerContentAssembly = typeof(Server.EntryPoint).Assembly;
options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly;
return base.StartServer(options);
}
}
}