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

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Dave Syer
2017-11-14 12:48:54 +00:00
parent d43e0ba8c1 4352d9a81a
commit 7eb310066a
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java
View File

@@ -360,6 +360,15 @@ public class BootstrapConfigurationTests {
assertTrue(this.context.getEnvironment().acceptsProfiles("bar"));
}
@Test
public void includeProfileFromBootstrapProperties() {
this.context = new SpringApplicationBuilder().web(false)
.sources(BareConfiguration.class)
.properties("spring.cloud.bootstrap.name=local").run();
assertTrue(this.context.getEnvironment().acceptsProfiles("local"));
assertEquals("Hello added!", this.context.getEnvironment().getProperty("added"));
}
@Configuration
@EnableConfigurationProperties
protected static class BareConfiguration {