mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.7.x'
This commit is contained in:
commit
77e6279d03
@ -2021,6 +2021,25 @@
|
||||
"name": "spring.thymeleaf.prefix",
|
||||
"defaultValue": "classpath:/templates/"
|
||||
},
|
||||
{
|
||||
"name": "spring.thymeleaf.reactive.media-types",
|
||||
"defaultValue": [
|
||||
"text/html",
|
||||
"application/xhtml+xml",
|
||||
"application/xml",
|
||||
"text/xml",
|
||||
"application/rss+xml",
|
||||
"application/atom+xml",
|
||||
"application/javascript",
|
||||
"application/ecmascript",
|
||||
"text/javascript",
|
||||
"text/ecmascript",
|
||||
"application/json",
|
||||
"text/css",
|
||||
"text/plain",
|
||||
"text/event-stream"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "spring.thymeleaf.suffix",
|
||||
"defaultValue": ".html"
|
||||
|
@ -88,11 +88,24 @@ class ThymeleafReactiveAutoConfigurationTests {
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
void defaultMediaTypes() {
|
||||
this.contextRunner.run(
|
||||
(context) -> assertThat(context.getBean(ThymeleafReactiveViewResolver.class).getSupportedMediaTypes())
|
||||
.containsExactly(MediaType.TEXT_HTML, MediaType.APPLICATION_XHTML_XML,
|
||||
MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.APPLICATION_RSS_XML,
|
||||
MediaType.APPLICATION_ATOM_XML, new MediaType("application", "javascript"),
|
||||
new MediaType("application", "ecmascript"), new MediaType("text", "javascript"),
|
||||
new MediaType("text", "ecmascript"), MediaType.APPLICATION_JSON,
|
||||
new MediaType("text", "css"), MediaType.TEXT_PLAIN, MediaType.TEXT_EVENT_STREAM)
|
||||
.satisfies(System.out::println));
|
||||
}
|
||||
|
||||
@Test
|
||||
void overrideMediaTypes() {
|
||||
this.contextRunner.withPropertyValues("spring.thymeleaf.reactive.media-types:text/html,text/plain").run(
|
||||
(context) -> assertThat(context.getBean(ThymeleafReactiveViewResolver.class).getSupportedMediaTypes())
|
||||
.contains(MediaType.TEXT_HTML, MediaType.TEXT_PLAIN));
|
||||
.containsExactly(MediaType.TEXT_HTML, MediaType.TEXT_PLAIN));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Loading…
Reference in New Issue
Block a user