Merge pull request #16170 from ayudovin

* pr/16170:
  Polish contribution
  Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest
pull/16247/head
Stephane Nicoll 6 years ago
commit 015de55f58

@ -94,8 +94,11 @@ org.springframework.boot.test.autoconfigure.web.reactive.WebTestClientAutoConfig
# AutoConfigureWebFlux auto-configuration imports # AutoConfigureWebFlux auto-configuration imports
org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebFlux=\ 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.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.validation.ValidationAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration

@ -21,6 +21,9 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration; 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.autoconfigure.validation.ValidationAutoConfiguration;
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest; import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
import org.springframework.context.ApplicationContext; 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}. * Tests for the auto-configuration imported by {@link WebFluxTest}.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Artsiom Yudovin
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@WebFluxTest @WebFluxTest
@ -53,4 +57,22 @@ public class WebFluxTestAutoConfigurationIntegrationTests {
.has(importedAutoConfiguration(ValidationAutoConfiguration.class)); .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));
}
} }

Loading…
Cancel
Save