Merge branch '2.1.x'

Closes gh-17079
This commit is contained in:
Andy Wilkinson
2019-06-07 11:00:44 +01:00
2799 changed files with 28402 additions and 47836 deletions

View File

@@ -48,12 +48,11 @@ class SampleWebStaticApplicationTests {
@Test
void testCss() {
ResponseEntity<String> entity = this.restTemplate.getForEntity(
"/webjars/bootstrap/3.0.3/css/bootstrap.min.css", String.class);
ResponseEntity<String> entity = this.restTemplate.getForEntity("/webjars/bootstrap/3.0.3/css/bootstrap.min.css",
String.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(entity.getBody()).contains("body");
assertThat(entity.getHeaders().getContentType())
.isEqualTo(MediaType.valueOf("text/css"));
assertThat(entity.getHeaders().getContentType()).isEqualTo(MediaType.valueOf("text/css"));
}
}