tidy up and no longer hard code admin area...still one int test failing before we start looking at rebuilding auth stuff

This commit is contained in:
Tom Gardham-Pallister
2017-10-29 16:35:12 +00:00
parent 24c018721f
commit b28fc6694e
6 changed files with 13 additions and 20 deletions

View File

@ -134,11 +134,8 @@ namespace Ocelot.AcceptanceTests
.AddJsonFile("configuration.json")
.AddEnvironmentVariables();
IServiceCollection serviceCollection = new ServiceCollection();
var configuration = builder.Build();
_webHostBuilder = new WebHostBuilder();
_webHostBuilder.ConfigureServices(s =>
{
s.AddSingleton(_webHostBuilder);
@ -158,7 +155,6 @@ namespace Ocelot.AcceptanceTests
};
s.AddOcelot(configuration, settings);
serviceCollection = s;
})
.ConfigureLogging(l =>
{
@ -167,7 +163,7 @@ namespace Ocelot.AcceptanceTests
})
.Configure(a =>
{
a.UseOcelot(ocelotMiddlewareConfig, serviceCollection).Wait();
a.UseOcelot(ocelotMiddlewareConfig).Wait();
}));
_ocelotClient = _ocelotServer.CreateClient();