From e92e35d56fec825a036a91a808b1975ade2a548a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 10 Jan 2022 16:25:43 +0100 Subject: [PATCH] Polish "Stop configuring a default user with SAML 2.0 Login" See gh-29263 --- .../UserDetailsServiceAutoConfigurationTests.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java index 097a237ddc0..2ae8c294b32 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java @@ -159,7 +159,9 @@ class UserDetailsServiceAutoConfigurationTests { @Test void userDetailsServiceWhenRelyingPartyRegistrationRepositoryBeanPresent() { - this.contextRunner.withUserConfiguration(TestConfigWithRelyingPartyRegistrationRepository.class) + this.contextRunner + .withBean(RelyingPartyRegistrationRepository.class, + () -> mock(RelyingPartyRegistrationRepository.class)) .run(((context) -> assertThat(context).doesNotHaveBean(InMemoryUserDetailsManager.class))); } @@ -241,17 +243,6 @@ class UserDetailsServiceAutoConfigurationTests { } - @Configuration(proxyBeanMethods = false) - @Import(TestSecurityConfiguration.class) - static class TestConfigWithRelyingPartyRegistrationRepository { - - @Bean - RelyingPartyRegistrationRepository relyingPartyRegistrationRepository() { - return mock(RelyingPartyRegistrationRepository.class); - } - - } - @Configuration(proxyBeanMethods = false) @Import(TestSecurityConfiguration.class) static class TestConfigWithJwtDecoder {