tests review

Author: bnasslahsen

springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyTest.java

@@ -22,13 +22,15 @@
 import test.org.springdoc.ui.AbstractSpringDocTest;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @TestPropertySource(properties = {
 		"server.forward-headers-strategy=framework"
 })
+@Import(SpringDocConfig.class)
 public class SpringDocBehindProxyTest extends AbstractSpringDocTest {
 
 	private static final String X_FORWARD_PREFIX = "/path/prefix";
@@ -65,7 +67,7 @@ public void shouldCalculateOauthRedirectBehindProxy() throws Exception {
 				.header("X-Forwarded-Prefix", X_FORWARD_PREFIX)
 				.exchange()
 				.expectStatus().isOk().expectBody()
-				.jsonPath("$.oauth2RedirectUrl").isEqualTo("https://proxy-host/path/prefix/swagger-ui/oauth2-redirect.html");
+				.jsonPath("$.oauth2RedirectUrl").isEqualTo("https://proxy-host/path/prefix/webjars/swagger-ui/oauth2-redirect.html");
 	}
 
 	@Test

springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyWithCustomUIPathTest.java

@@ -22,6 +22,7 @@
 import test.org.springdoc.ui.AbstractSpringDocTest;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -30,6 +31,7 @@
 		"server.forward-headers-strategy=framework",
 		"springdoc.swagger-ui.path=/foo/documentation/swagger.html"
 })
+@Import(SpringDocConfig.class)
 public class SpringDocBehindProxyWithCustomUIPathTest extends AbstractSpringDocTest {
 
 	private static final String X_FORWARD_PREFIX = "/path/prefix";
@@ -44,20 +46,20 @@ public void shouldRedirectSwaggerUIFromCustomPath() {
 				.header("X-Forwarded-Prefix", X_FORWARD_PREFIX)
 				.exchange()
 				.expectStatus().isFound()
-				.expectHeader().location("/path/prefix/foo/documentation/swagger-ui/index.html");
+				.expectHeader().location("/path/prefix/foo/documentation/webjars/swagger-ui/index.html");
 	}
 
 	@Test
 	public void shouldReturnCorrectInitializerJS() {
 		webTestClient
-				.get().uri("/foo/documentation/swagger-ui/swagger-initializer.js")
+				.get().uri("/foo/documentation/webjars/swagger-ui/swagger-initializer.js")
 				.header("X-Forwarded-Prefix", X_FORWARD_PREFIX)
 				.exchange()
 				.expectStatus().isOk()
 				.expectBody(String.class)
 				.consumeWith(response ->
 						assertThat(response.getResponseBody())
-								.contains("\"configUrl\" : \\\"/path/prefix/v3/api-docs/swagger-config\\\",")
+								.contains("\"configUrl\" : \"/path/prefix/v3/api-docs/swagger-config\",")
 				);
 	}
 

springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyWithCustomUIPathWithApiDocsTest.java

@@ -22,6 +22,7 @@
 import test.org.springdoc.ui.AbstractSpringDocTest;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -31,6 +32,7 @@
 		"springdoc.swagger-ui.path=/foo/documentation/swagger.html",
 		"springdoc.api-docs.path=/bar/openapi/v3"
 })
+@Import(SpringDocConfig.class)
 public class SpringDocBehindProxyWithCustomUIPathWithApiDocsTest extends AbstractSpringDocTest {
 
 	private static final String X_FORWARD_PREFIX = "/path/prefix";
@@ -45,20 +47,20 @@ public void shouldRedirectSwaggerUIFromCustomPath() {
 				.header("X-Forwarded-Prefix", X_FORWARD_PREFIX)
 				.exchange()
 				.expectStatus().isFound()
-				.expectHeader().location("/path/prefix/foo/documentation/swagger-ui/index.html");
+				.expectHeader().location("/path/prefix/foo/documentation/webjars/swagger-ui/index.html");
 	}
 
 	@Test
 	public void shouldReturnCorrectInitializerJS() {
 		webTestClient
-				.get().uri("/foo/documentation/swagger-ui/swagger-initializer.js")
+				.get().uri("/foo/documentation/webjars/swagger-ui/swagger-initializer.js")
 				.header("X-Forwarded-Prefix", X_FORWARD_PREFIX)
 				.exchange()
 				.expectStatus().isOk()
 				.expectBody(String.class)
 				.consumeWith(response ->
 						assertThat(response.getResponseBody())
-								.contains("\"configUrl\" : \\\"/path/prefix/v3/api-docs/swagger-config\\\",")
+								.contains("\"configUrl\" : \"/path/prefix/bar/openapi/v3/swagger-config\",")
 				);
 	}
 

springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocConfig.java

@@ -0,0 +1,14 @@
+package test.org.springdoc.ui.app32;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.server.adapter.ForwardedHeaderTransformer;
+
+@Configuration
+public class SpringDocConfig {
+
+	@Bean
+	ForwardedHeaderTransformer forwardedHeaderTransformer() {
+		return new ForwardedHeaderTransformer();
+	}
+}