Merge pull request #5 from ThreeMammals/feature/update-ocelot

updated to latest Ocelot
ThreeMammals · Sep 3, 2018 · 1063e9a · 1063e9a
2 parents 1c7cc4c + 814d44a
commit 1063e9a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 25 deletions.
diff --git a/src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj b/src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj
@@ -26,7 +26,7 @@
     <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Ocelot" Version="10.0.0" />
+    <PackageReference Include="Ocelot" Version="11.0.2" />
     <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>

diff --git 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 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Ocelot" Version="10.0.0" />
+    <PackageReference Include="Ocelot" Version="11.0.2" />
     <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>

diff --git 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<string> { "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
@@ -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
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
-    <PackageReference Include="Ocelot" Version="10.0.0" />
+    <PackageReference Include="Ocelot" Version="11.0.2" />
     <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>

diff --git 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 @@
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Ocelot" Version="10.0.0" />
+    <PackageReference Include="Ocelot" Version="11.0.2" />
     <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>

diff --git 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 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
     <PackageReference Include="Consul" Version="0.7.2.5" />
-    <PackageReference Include="Ocelot" Version="10.0.0" />
+    <PackageReference Include="Ocelot" Version="11.0.2" />
     <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
     <PackageReference Include="Polly" Version="6.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">

diff --git 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 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Ocelot" Version="10.0.0" />
+    <PackageReference Include="Ocelot" Version="11.0.2" />
     <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>