Polish

bclozel · bclozel · commit 839787885781 · 2018-10-16T10:35:25.000+02:00
See gh-12838
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java
@@ -225,7 +225,7 @@ public void render(Map<String, ?> model, HttpServletRequest request,
 				response.setContentType(getContentType());
 			}
 			builder.append("<html><body><h1>Whitelabel Error Page</h1>").append(
-					"<p>This application has no configured error view, so you are seeing this as a fallback.</p>")
+					"<p>This application has no explicit mapping for /error, so you are seeing this as a fallback.</p>")
 					.append("<div id='created'>").append(timestamp).append("</div>")
 					.append("<div>There was an unexpected error (type=")
 					.append(htmlEscape(model.get("error"))).append(", status=")
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfigurationTests.java
@@ -58,7 +58,9 @@ public void renderContainsViewWithExceptionDetails() throws Exception {
 					webRequest.getRequest(), webRequest.getResponse());
 			String responseString = ((MockHttpServletResponse) webRequest.getResponse())
 					.getContentAsString();
-			assertThat(responseString).contains("<div>Exception message</div>")
+			assertThat(responseString).contains(
+					"<p>This application has no explicit mapping for /error, so you are seeing this as a fallback.</p>")
+					.contains("<div>Exception message</div>")
 					.contains("<div>java.lang.IllegalStateException");
 		});
 	}
diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java
@@ -161,8 +161,7 @@ public void testHtmlErrorPage() {
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
 		String body = entity.getBody();
 		assertThat(body).as("Body was null").isNotNull();
-		assertThat(body).contains(
-				"This application has no configured error view, so you are seeing this as a fallback.");
+		assertThat(body).contains("This application has no explicit mapping for /error");
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ public void render(Map<String, ?> model, HttpServletRequest request,`
`225`	`225`	`response.setContentType(getContentType());`
`226`	`226`	`}`
`227`	`227`	`builder.append("<html><body><h1>Whitelabel Error Page</h1>").append(`
`228`		`- "<p>This application has no configured error view, so you are seeing this as a fallback.</p>")`
	`228`	`+ "<p>This application has no explicit mapping for /error, so you are seeing this as a fallback.</p>")`
`229`	`229`	`.append("<div id='created'>").append(timestamp).append("</div>")`
`230`	`230`	`.append("<div>There was an unexpected error (type=")`
`231`	`231`	`.append(htmlEscape(model.get("error"))).append(", status=")`
Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,7 @@ public void testHtmlErrorPage() {`
`161`	`161`	`assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);`
`162`	`162`	`String body = entity.getBody();`
`163`	`163`	`assertThat(body).as("Body was null").isNotNull();`
`164`		`- assertThat(body).contains(`
`165`		`- "This application has no configured error view, so you are seeing this as a fallback.");`
	`164`	`+ assertThat(body).contains("This application has no explicit mapping for /error");`
`166`	`165`	`}`
`167`	`166`
`168`	`167`	`@Test`