wip tests failing

Author: TomPallister

src/Ocelot.Provider.Eureka/Eureka.cs

@@ -1,35 +1,35 @@
-namespace Ocelot.Provider.Eureka
-{
-    using ServiceDiscovery.Providers;
-    using Steeltoe.Common.Discovery;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Values;
-
-    public class Eureka : IServiceDiscoveryProvider
-    {
-        private readonly IDiscoveryClient _client;
-        private readonly string _serviceName;
-
-        public Eureka(string serviceName, IDiscoveryClient client)
-        {
-            _client = client;
-            _serviceName = serviceName;
-        }
-
-        public Task<List<Service>> Get()
-        {
-            var services = new List<Service>();
-
-            var instances = _client.GetInstances(_serviceName);
-
-            if (instances != null && instances.Any())
-            {
-                services.AddRange(instances.Select(i => new Service(i.ServiceId, new ServiceHostAndPort(i.Host, i.Port, i.Uri.Scheme), "", "", new List<string>())));
-            }
-
-            return Task.FromResult(services);
-        }
-    }
-}
+namespace Ocelot.Provider.Eureka
+{
+    using Ocelot.ServiceDiscovery.Providers;
+    using Steeltoe.Discovery;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Ocelot.Values;
+
+    public class Eureka : IServiceDiscoveryProvider
+    {
+        private readonly IDiscoveryClient _client;
+        private readonly string _serviceName;
+
+        public Eureka(string serviceName, IDiscoveryClient client)
+        {
+            _client = client;
+            _serviceName = serviceName;
+        }
+
+        public Task<List<Service>> Get()
+        {
+            var services = new List<Service>();
+
+            var instances = _client.GetInstances(_serviceName);
+
+            if (instances != null && instances.Any())
+            {
+                services.AddRange(instances.Select(i => new Service(i.ServiceId, new ServiceHostAndPort(i.Host, i.Port, i.Uri.Scheme), "", "", new List<string>())));
+            }
+
+            return Task.FromResult(services);
+        }
+    }
+}

src/Ocelot.Provider.Eureka/EurekaProviderFactory.cs

@@ -1,9 +1,9 @@
 namespace Ocelot.Provider.Eureka
 {
     using Microsoft.Extensions.DependencyInjection;
-    using ServiceDiscovery;
-    using Steeltoe.Common.Discovery;
-
+    using Ocelot.ServiceDiscovery;
+    using Steeltoe.Discovery;
+
     public static class EurekaProviderFactory
     {
         public static ServiceDiscoveryFinderDelegate Get = (provider, config, route) =>

src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj

@@ -27,7 +27,7 @@
     <ProjectReference Include="..\Ocelot\Ocelot.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Steeltoe.Discovery.ClientCore" Version="2.4.2" />
+    <PackageReference Include="Steeltoe.Discovery.ClientCore" Version="3.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

test/Ocelot.AcceptanceTests/ClaimsToDownstreamPathTests.cs

@@ -96,8 +96,13 @@ public void should_return_200_and_change_downstream_path()
                 .When(x => _steps.WhenIGetUrlOnTheApiGateway("/users"))
                 .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
                 .And(x => _steps.ThenTheResponseBodyShouldBe("UserId: 1231231"))
-                .And(x => _downstreamFinalPath.ShouldBe("/users/1231231"))
+                .And(x => ThenTheDownstreamPathIs("/users/1231231"))
                 .BDDfy();
+        }
+
+        private void ThenTheDownstreamPathIs(string path)
+        {
+            _downstreamFinalPath.ShouldBe(path);
         }
 
         private void GivenThereIsAServiceRunningOn(string url, int statusCode)