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

Merge branch '2.7.x'

This commit is contained in:
Andy Wilkinson 2022-02-28 11:15:38 +00:00
parent 7a4960d4ca 73d0d5bccf
commit cce48a75fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java
View File

@ -384,7 +384,7 @@ class ServletWebServerFactoryAutoConfigurationTests {
AnnotationConfigServletWebServerApplicationContext::new) AnnotationConfigServletWebServerApplicationContext::new)
.withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class)) .withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class))
.withPropertyValues("server.forward-headers-strategy=framework", .withPropertyValues("server.forward-headers-strategy=framework",
"server.tomcat.use-relative-redirects=true"); "server.tomcat.use-relative-redirects=true", "server.port=0");
runner.run((context) -> { runner.run((context) -> {
Filter filter = context.getBean(FilterRegistrationBean.class).getFilter(); Filter filter = context.getBean(FilterRegistrationBean.class).getFilter();
assertThat(filter).isInstanceOf(ForwardedHeaderFilter.class); assertThat(filter).isInstanceOf(ForwardedHeaderFilter.class);
@ -398,7 +398,7 @@ class ServletWebServerFactoryAutoConfigurationTests {
AnnotationConfigServletWebServerApplicationContext::new) AnnotationConfigServletWebServerApplicationContext::new)
.withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class)) .withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class))
.withPropertyValues("server.forward-headers-strategy=framework", .withPropertyValues("server.forward-headers-strategy=framework",
"server.tomcat.use-relative-redirects=false"); "server.tomcat.use-relative-redirects=false", "server.port=0");
runner.run((context) -> { runner.run((context) -> {
Filter filter = context.getBean(FilterRegistrationBean.class).getFilter(); Filter filter = context.getBean(FilterRegistrationBean.class).getFilter();
assertThat(filter).isInstanceOf(ForwardedHeaderFilter.class); assertThat(filter).isInstanceOf(ForwardedHeaderFilter.class);
@ -412,7 +412,7 @@ class ServletWebServerFactoryAutoConfigurationTests {
AnnotationConfigServletWebServerApplicationContext::new) AnnotationConfigServletWebServerApplicationContext::new)
.withClassLoader(new FilteredClassLoader(Tomcat.class)) .withClassLoader(new FilteredClassLoader(Tomcat.class))
.withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class)) .withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class))
.withPropertyValues("server.forward-headers-strategy=framework"); .withPropertyValues("server.forward-headers-strategy=framework", "server.port=0");
runner.run((context) -> { runner.run((context) -> {
Filter filter = context.getBean(FilterRegistrationBean.class).getFilter(); Filter filter = context.getBean(FilterRegistrationBean.class).getFilter();
assertThat(filter).isInstanceOf(ForwardedHeaderFilter.class); assertThat(filter).isInstanceOf(ForwardedHeaderFilter.class);