Merge branch '1.0.x'

2016-05-05 09:53:30 +01:00
parent 043e796502 a3e6883524
commit 130ea784f7
14 changed files with 80 additions and 81 deletions
--- a/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java
+++ b/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java
@@ -266,9 +266,8 @@ public class MockMvcRestDocumentationIntegrationTests {

 		mockMvc.perform(get("/").param("foo", "bar").accept(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk())
-				.andDo(document("links",
-						responseFields(fieldWithPath("a")
-								.description("The description"),
+				.andDo(document("links", responseFields(
+						fieldWithPath("a").description("The description"),
 						fieldWithPath("links").description("Links to other resources"))));

 		assertExpectedSnippetFilesExist(new File("build/generated-snippets/links"),