Merge branch '2.2.x'

snicoll · snicoll · commit ec5e407ce33d · 2019-11-12T14:07:21.000+01:00
Closes spring-projectsgh-18963
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactoryTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactoryTests.java
@@ -61,7 +61,7 @@ void getRequestPredicateWhenMatchAllIsNotLastParameterThrowsException() {
 	}
 
 	@Test
-	void getRequestPredicateReturnsRedicateWithPath() {
+	void getRequestPredicateReturnsPredicateWithPath() {
 		DiscoveredOperationMethod operationMethod = getDiscoveredOperationMethod(ValidSelectors.class);
 		WebOperationRequestPredicate requestPredicate = this.factory.getRequestPredicate(this.rootPath,
 				operationMethod);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ void getRequestPredicateWhenMatchAllIsNotLastParameterThrowsException() {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Test`
`64`		`- void getRequestPredicateReturnsRedicateWithPath() {`
	`64`	`+ void getRequestPredicateReturnsPredicateWithPath() {`
`65`	`65`	`DiscoveredOperationMethod operationMethod = getDiscoveredOperationMethod(ValidSelectors.class);`
`66`	`66`	`WebOperationRequestPredicate requestPredicate = this.factory.getRequestPredicate(this.rootPath,`
`67`	`67`	`operationMethod);`