From e902be7ab98db767d48e9cd7fbf1c135bd0d9892 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Jul 2020 15:47:11 +0200 Subject: [PATCH] Use String to specify custom HTTP method in test Closes gh-8592 --- .../security/web/server/csrf/CsrfWebFilterTests.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java index 800f4806f7..24882edbf6 100644 --- a/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java @@ -23,7 +23,6 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.mock.http.server.reactive.MockServerHttpRequest; import org.springframework.mock.web.server.MockServerWebExchange; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher; @@ -190,9 +189,7 @@ public class CsrfWebFilterTests { @Test // gh-8452 public void matchesRequireCsrfProtectionWhenNonStandardHTTPMethodIsUsed() { - ServerHttpRequest nonStandardHttpRequest = mock(ServerHttpRequest.class); - ServerWebExchange nonStandardHttpExchange = mock(ServerWebExchange.class); - when(nonStandardHttpExchange.getRequest()).thenReturn(nonStandardHttpRequest); + MockServerWebExchange nonStandardHttpExchange = from(MockServerHttpRequest.method("non-standard-http-method", "/")); ServerWebExchangeMatcher serverWebExchangeMatcher = CsrfWebFilter.DEFAULT_CSRF_MATCHER; assertThat(serverWebExchangeMatcher.matches(nonStandardHttpExchange).map(MatchResult::isMatch).block()).isTrue();