diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java index ec074d9f60..5d34e35c36 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java @@ -19,12 +19,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; @@ -35,8 +35,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import javax.servlet.Filter; - +import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -49,19 +48,17 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests { @Autowired private WebApplicationContext context; - @Autowired - private Filter springSecurityFilterChain; - private MockMvc mvc; @Before public void setup() { mvc = MockMvcBuilders .webAppContextSetup(context) - .addFilters(springSecurityFilterChain) + .apply(springSecurity()) .build(); } + // SEC-2593 @Test public void userRequestPostProcessorWorksWithStateless() throws Exception { mvc @@ -69,6 +66,15 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests { .andExpect(status().is2xxSuccessful()); } + // SEC-2593 + @WithMockUser + @Test + public void withMockUserWorksWithStateless() throws Exception { + mvc + .perform(get("/")) + .andExpect(status().is2xxSuccessful()); + } + @EnableWebSecurity @EnableWebMvc static class Config extends WebSecurityConfigurerAdapter {