Merge branch '2.0.x'

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientTests.java

@@ -119,6 +119,16 @@ public class FeignRibbonClientTests {
 				any(Options.class));
 	}
 
+	@Test
+	public void verifyCleanUrl() throws Exception {
+		Request request = new RequestTemplate().method("GET").append("http://tp/abc/bcd.json")
+				.request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("http://foo.com:8000/abc/bcd.json");
+		verify(this.delegate).execute(argThat(matcher),
+				any(Options.class));
+	}
+
 	@Test
 	public void remoteRequestIsSecure() throws Exception {
 		Request request = new RequestTemplate()