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 pull request #16170 from ayudovin 

* pr/16170:
  Polish contribution
  Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest
This commit is contained in:
Stephane Nicoll 2019-03-12 11:07:02 +01:00
parent 078bd890a6 161c0b9fad
commit 015de55f58
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
View File

@ -94,8 +94,11 @@ org.springframework.boot.test.autoconfigure.web.reactive.WebTestClientAutoConfig
# AutoConfigureWebFlux auto-configuration imports
org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebFlux=\
org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration,\
org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration,\
org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration,\
org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration,\
org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration,\
org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\
org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration

22
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebFluxTestAutoConfigurationIntegrationTests.java
View File

@ -21,6 +21,9 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration;
import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
import org.springframework.context.ApplicationContext;
@ -33,6 +36,7 @@ import static org.springframework.boot.test.autoconfigure.AutoConfigurationImpor
* Tests for the auto-configuration imported by {@link WebFluxTest}.
*
* @author Stephane Nicoll
* @author Artsiom Yudovin
*/
@RunWith(SpringRunner.class)
@WebFluxTest
@ -53,4 +57,22 @@ public class WebFluxTestAutoConfigurationIntegrationTests {
.has(importedAutoConfiguration(ValidationAutoConfiguration.class));
}
@Test
public void mustacheAutoConfigurationIsImported() {
assertThat(this.applicationContext)
.has(importedAutoConfiguration(MustacheAutoConfiguration.class));
}
@Test
public void freemarkerAutoConfigurationIsImported() {
assertThat(this.applicationContext)
.has(importedAutoConfiguration(FreeMarkerAutoConfiguration.class));
}
@Test
public void thymeleafAutoConfigurationIsImported() {
assertThat(this.applicationContext)
.has(importedAutoConfiguration(ThymeleafAutoConfiguration.class));
}
}