Merge branch '1.2.x'

2018-06-26 12:14:56 +01:00
parent 99ee889708 7bde04ea46
commit c086da81f8
2 changed files with 13 additions and 0 deletions
--- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/JsonContentHandlerTests.java
+++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/JsonContentHandlerTests.java
@@ -157,4 +157,14 @@ public class JsonContentHandlerTests {
 		assertThat(missingFields.size(), is(equalTo(0)));
 	}

+	@Test
+	public void describedFieldThatIsSometimesPresentChildOfOptionalArrayIsNotConsideredMissing() {
+		List<FieldDescriptor> missingFields = new JsonContentHandler(
+				"{\"a\":[ {\"b\": \"bravo\"}, {\"b\": \"bravo\", \"c\": { \"d\": \"delta\"}}]}"
+						.getBytes()).findMissingFields(
+								Arrays.asList(new FieldDescriptor("a.[].c").optional(),
+										new FieldDescriptor("a.[].c.d]")));
+		assertThat(missingFields.size(), is(equalTo(0)));
+	}
+
 }