diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java index ef6bde25d2..c0fd64bb8e 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java @@ -213,7 +213,6 @@ class DefaultWebTestClient implements WebTestClient { @Override public RequestBodySpec uri(URI uri) { - this.uriTemplate = null; this.uri = uri; return this; } diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java index 42cbf3b278..4613a49f64 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -99,7 +99,16 @@ public class DefaultControllerSpecTests { assertThat(codecsConsumer.getValue()).isNotNull(); assertThat(pathMatchingConsumer.getValue()).isNotNull(); assertThat(viewResolverConsumer.getValue()).isNotNull(); + } + @Test // gh-25854 + public void uriTemplate() { + new DefaultControllerSpec(new MyController()).build() + .get().uri("/") + .exchange() + .expectStatus().isOk() + .expectBody(String.class).isEqualTo("Success") + .consumeWith(result -> assertThat(result.getUriTemplate()).isEqualTo("/")); }