SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2019-06-03 12:31:27 -04:00
parent a1195cbefb f89724c00b
commit 3f81c62a4c
36 changed files with 513 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java
View File

@@ -53,7 +53,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
// server on the classpath we need to set it explicitly
properties = { "spring.cloud.config.enabled:true", "",
"management.security.enabled=false",
"management.endpoints.web.exposure.include=*" }, webEnvironment = RANDOM_PORT)
"management.endpoints.web.exposure.include=*" },
webEnvironment = RANDOM_PORT)
public class ApplicationBootstrapTests {
private static final String BASE_PATH = new WebEndpointProperties().getBasePath();

3
spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java
View File

@@ -44,7 +44,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
// server on the classpath we need to set it explicitly
properties = { "spring.cloud.config.enabled:true",
"management.security.enabled=false",
"management.endpoints.web.exposure.include=*" }, webEnvironment = RANDOM_PORT)
"management.endpoints.web.exposure.include=*" },
webEnvironment = RANDOM_PORT)
public class ApplicationTests {
private static final String BASE_PATH = new WebEndpointProperties().getBasePath();

3
spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java
View File

@@ -36,7 +36,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class, properties = "spring.application.name:bad", webEnvironment = RANDOM_PORT)
@SpringBootTest(classes = Application.class, properties = "spring.application.name:bad",
webEnvironment = RANDOM_PORT)
public class ServerNativeApplicationTests {
private static int configPort = 0;