Merge branch '2.0.x'

2018-07-16 10:37:43 +02:00
parent 635986299c 1ca8808a97
commit 48962718d1
5 changed files with 14 additions and 7 deletions
--- a/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java
@@ -63,7 +63,8 @@ public class SampleWebJspApplicationTests {
 				URI.create("/foo"));
 		ResponseEntity<String> entity = this.restTemplate.exchange(request, String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
-		assertThat(entity.getBody()).contains("Something went wrong");
+		assertThat(entity.getBody())
+				.contains("Something went wrong: 500 Internal Server Error");
 	}

 }