root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

This commit is contained in:
Andy Wilkinson 2022-05-18 13:18:20 +01:00
parent 0ee05ba582 646d582393
commit 842cea2fc1
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
View File

@ -28,6 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.thymeleaf.TemplateEngine;
import org.thymeleaf.context.Context;
import org.thymeleaf.context.WebContext;
import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
import org.thymeleaf.extras.springsecurity6.util.SpringSecurityContextUtils;
import org.thymeleaf.spring6.ISpringWebFluxTemplateEngine;
import org.thymeleaf.spring6.SpringWebFluxTemplateEngine;
@ -37,6 +38,7 @@ import org.thymeleaf.spring6.web.webflux.SpringWebFluxWebApplication;
import org.thymeleaf.templateresolver.ITemplateResolver;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
@ -218,6 +220,12 @@ class ThymeleafReactiveAutoConfigurationTests {
});
}
@Test
void securityDialectAutoConfigurationBacksOffWithoutSpringSecurity() {
this.contextRunner.withClassLoader(new FilteredClassLoader("org.springframework.security"))
.run((context) -> assertThat(context).doesNotHaveBean(SpringSecurityDialect.class));
}
@Test
void renderTemplate() {
this.contextRunner.run((context) -> {

7
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
View File

@ -31,6 +31,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.thymeleaf.TemplateEngine;
import org.thymeleaf.context.Context;
import org.thymeleaf.context.WebContext;
import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
import org.thymeleaf.spring6.SpringTemplateEngine;
import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
import org.thymeleaf.spring6.view.ThymeleafView;
@ -234,6 +235,12 @@ class ThymeleafServletAutoConfigurationTests {
});
}
@Test
void securityDialectAutoConfigurationBacksOffWithoutSpringSecurity() {
this.contextRunner.withClassLoader(new FilteredClassLoader("org.springframework.security"))
.run((context) -> assertThat(context).doesNotHaveBean(SpringSecurityDialect.class));
}
@Test
void renderTemplate() {
this.contextRunner.run((context) -> {