Updates for boot 2.0 compatibility

This commit is contained in:
Spencer Gibb
2017-11-22 12:57:19 -05:00
parent ef39235bb3
commit c5b6000b50
4 changed files with 4 additions and 4 deletions

View File

@@ -36,7 +36,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ZookeeperDiscoveryHealthIndicatorWithNestedStructureTests.Config.class,
properties = "endpoints.default.web.enabled=true",
properties = "management.endpoints.web.expose=*",
webEnvironment = RANDOM_PORT)
@ActiveProfiles("nestedstructure")
public class ZookeeperDiscoveryHealthIndicatorWithNestedStructureTests {

View File

@@ -43,7 +43,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
properties = {
"feign.hystrix.enabled=false",
"spring.cloud.zookeeper.discovery.uri-spec={scheme}://{address}:{port}/contextPath",
"endpoints.default.web.enabled=true"
"management.endpoints.web.expose=*"
},
webEnvironment = RANDOM_PORT)
@ActiveProfiles("ribbon")

View File

@@ -26,7 +26,7 @@ import static org.assertj.core.api.BDDAssertions.then;
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ZookeeperDiscoveryWithDependenciesIntegrationTests.Config.class,
properties = {"feign.hystrix.enabled=false", "debug=true", "endpoints.default.web.enabled=true"},
properties = {"feign.hystrix.enabled=false", "debug=true", "management.endpoints.web.expose=*"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@ActiveProfiles("dependencies")
public class ZookeeperDiscoveryWithDependenciesIntegrationTests {

View File

@@ -37,7 +37,7 @@ public class SampleApplicationTests {
ConfigurableApplicationContext context = new SpringApplicationBuilder(SampleZookeeperApplication.class).run(
"--server.port="+port,
"--endpoints.default.web.enabled=true",
"--management.endpoints.web.expose=*",
"--spring.cloud.zookeeper.connect-string=localhost:" + zkPort);
ResponseEntity<String> response = new TestRestTemplate().getForEntity("http://localhost:"+port+"/application/health", String.class);