diff --git a/src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj b/src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj index e10edad..50f2a28 100644 --- a/src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj +++ b/src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj @@ -26,7 +26,7 @@ True - + all diff --git a/test/Ocelot.Provider.Eureka.AcceptanceTests/Ocelot.Provider.Eureka.AcceptanceTests.csproj b/test/Ocelot.Provider.Eureka.AcceptanceTests/Ocelot.Provider.Eureka.AcceptanceTests.csproj index 246841d..443ca1f 100644 --- a/test/Ocelot.Provider.Eureka.AcceptanceTests/Ocelot.Provider.Eureka.AcceptanceTests.csproj +++ b/test/Ocelot.Provider.Eureka.AcceptanceTests/Ocelot.Provider.Eureka.AcceptanceTests.csproj @@ -33,7 +33,7 @@ - + all diff --git a/test/Ocelot.Provider.Eureka.AcceptanceTests/ServiceDiscoveryTests.cs b/test/Ocelot.Provider.Eureka.AcceptanceTests/ServiceDiscoveryTests.cs index 5c69564..7399b75 100644 --- a/test/Ocelot.Provider.Eureka.AcceptanceTests/ServiceDiscoveryTests.cs +++ b/test/Ocelot.Provider.Eureka.AcceptanceTests/ServiceDiscoveryTests.cs @@ -47,7 +47,6 @@ public void should_use_eureka_service_discovery_and_make_request() UpstreamHttpMethod = new List { "Get" }, ServiceName = serviceName, LoadBalancerOptions = new FileLoadBalancerOptions { Type = "LeastConnection" }, - UseServiceDiscovery = true, } }, GlobalConfiguration = new FileGlobalConfiguration() @@ -143,7 +142,9 @@ private void GivenThereIsAFakeEurekaServiceDiscoveryProvider(string url, string } }; - await context.Response.WriteJsonAsync(applications); + var json = JsonConvert.SerializeObject(applications); + context.Response.Headers.Add("Content-Type", "application/json"); + await context.Response.WriteAsync(json); } }); } diff --git a/test/Ocelot.Provider.Eureka.AcceptanceTests/Steps.cs b/test/Ocelot.Provider.Eureka.AcceptanceTests/Steps.cs index bce62f3..141a615 100644 --- a/test/Ocelot.Provider.Eureka.AcceptanceTests/Steps.cs +++ b/test/Ocelot.Provider.Eureka.AcceptanceTests/Steps.cs @@ -1,34 +1,17 @@ namespace Ocelot.Provider.Eureka.AcceptanceTests { using System; - using System.Collections.Generic; using System.IO; - using System.IO.Compression; - using System.Linq; using System.Net; using System.Net.Http; - using System.Net.Http.Headers; - using System.Text; - using System.Threading; - using System.Threading.Tasks; - using Configuration.Creator; using Configuration.File; - using Configuration.Repository; using DependencyInjection; - using IdentityServer4.AccessTokenValidation; - using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.Configuration; - using Microsoft.Extensions.DependencyInjection; - using Microsoft.Extensions.Logging; using Middleware; - using Middleware.Multiplexer; using Newtonsoft.Json; using Shouldly; - using ConfigurationBuilder = Microsoft.Extensions.Configuration.ConfigurationBuilder; - using CookieHeaderValue = System.Net.Http.Headers.CookieHeaderValue; - using MediaTypeHeaderValue = System.Net.Http.Headers.MediaTypeHeaderValue; public class Steps : IDisposable { diff --git a/test/Ocelot.Provider.Eureka.Benchmarks/Ocelot.Provider.Eureka.Benchmarks.csproj b/test/Ocelot.Provider.Eureka.Benchmarks/Ocelot.Provider.Eureka.Benchmarks.csproj index 0affd2c..7d5c0fd 100644 --- a/test/Ocelot.Provider.Eureka.Benchmarks/Ocelot.Provider.Eureka.Benchmarks.csproj +++ b/test/Ocelot.Provider.Eureka.Benchmarks/Ocelot.Provider.Eureka.Benchmarks.csproj @@ -15,7 +15,7 @@ - + all diff --git a/test/Ocelot.Provider.Eureka.IntegrationTests/Ocelot.Provider.Eureka.IntegrationTests.csproj b/test/Ocelot.Provider.Eureka.IntegrationTests/Ocelot.Provider.Eureka.IntegrationTests.csproj index 5c42c35..b1f8e4a 100644 --- a/test/Ocelot.Provider.Eureka.IntegrationTests/Ocelot.Provider.Eureka.IntegrationTests.csproj +++ b/test/Ocelot.Provider.Eureka.IntegrationTests/Ocelot.Provider.Eureka.IntegrationTests.csproj @@ -21,7 +21,7 @@ - + all diff --git a/test/Ocelot.Provider.Eureka.ManualTest/Ocelot.Provider.Eureka.ManualTest.csproj b/test/Ocelot.Provider.Eureka.ManualTest/Ocelot.Provider.Eureka.ManualTest.csproj index 9e280c7..fd59027 100644 --- a/test/Ocelot.Provider.Eureka.ManualTest/Ocelot.Provider.Eureka.ManualTest.csproj +++ b/test/Ocelot.Provider.Eureka.ManualTest/Ocelot.Provider.Eureka.ManualTest.csproj @@ -34,7 +34,7 @@ - + diff --git a/test/Ocelot.Provider.Eureka.UnitTests/Ocelot.Provider.Eureka.UnitTests.csproj b/test/Ocelot.Provider.Eureka.UnitTests/Ocelot.Provider.Eureka.UnitTests.csproj index bc020bf..942a336 100644 --- a/test/Ocelot.Provider.Eureka.UnitTests/Ocelot.Provider.Eureka.UnitTests.csproj +++ b/test/Ocelot.Provider.Eureka.UnitTests/Ocelot.Provider.Eureka.UnitTests.csproj @@ -41,7 +41,7 @@ - + all