From c1bcca86ab37b9942f188b4f6173d838db8dc0fc Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Mon, 18 Jan 2016 17:36:54 +0000
Subject: [PATCH] Ensure there is a NoopDiscoveryClient if @EnableZuulProxy

See https://github.com/spring-cloud/spring-cloud-commons/issues/80
---
 zuul-proxy/pom.xml                                           | 4 ----
 zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/zuul-proxy/pom.xml b/zuul-proxy/pom.xml
index 21eb501..0f0064a 100644
--- a/zuul-proxy/pom.xml
+++ b/zuul-proxy/pom.xml
@@ -29,10 +29,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-zuul</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
index e59d47c..327a6f2 100644
--- a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
+++ b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
@@ -11,7 +11,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
 import org.springframework.boot.test.WebIntegrationTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
+import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -53,6 +53,6 @@ public class ZuulProxyApplicationTests {
 
 	@Test
 	public void discoveryClientIsNoop() {
-		assertTrue("discoveryClient is wrong type", this.discoveryClient instanceof EurekaDiscoveryClient);
+		assertTrue("discoveryClient is wrong type", this.discoveryClient instanceof NoopDiscoveryClient);
 	}
 }