From 3bdfa6459cb9c3df803a8f0410cfad2ac775ee6e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 20 May 2025 13:58:48 -0700 Subject: [PATCH] Fix merge error --- .../info/InfoEndpointDocumentationTests.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointDocumentationTests.java index 28f3c55694..75694cb4d2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointDocumentationTests.java @@ -51,16 +51,9 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.response class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentationTests { @Test -<<<<<<< HEAD void info() { assertThat(this.mvc.get().uri("/actuator/info")).hasStatusOk() - .apply(MockMvcRestDocumentation.document("info", gitInfo(), buildInfo(), osInfo())); -======= - void info() throws Exception { - this.mockMvc.perform(get("/actuator/info")) - .andExpect(status().isOk()) - .andDo(MockMvcRestDocumentation.document("info", gitInfo(), buildInfo(), osInfo(), processInfo())); ->>>>>>> 3.3.x + .apply(MockMvcRestDocumentation.document("info", gitInfo(), buildInfo(), osInfo(), processInfo())); } private ResponseFieldsSnippet gitInfo() {