See gh-24604
pull/24694/head
izeye 4 years ago committed by Stephane Nicoll
parent e3d7ab0e3b
commit 5e3f618f9d

@ -360,7 +360,7 @@ class ProfilesTests {
} }
@Test @Test
void simpleRecursiveReferenceInProfileGroupThrowsException() { void simpleRecursiveReferenceInProfileGroupIgnoresDuplicates() {
MockEnvironment environment = new MockEnvironment(); MockEnvironment environment = new MockEnvironment();
environment.setProperty("spring.profiles.active", "a,b,c"); environment.setProperty("spring.profiles.active", "a,b,c");
environment.setProperty("spring.profiles.group.a", "a,e,f"); environment.setProperty("spring.profiles.group.a", "a,e,f");

@ -66,9 +66,9 @@ class CorsSampleActuatorApplicationTests {
@Test @Test
void preflightRequestToEndpointShouldReturnOk() throws Exception { void preflightRequestToEndpointShouldReturnOk() throws Exception {
RequestEntity<?> healthRequest = RequestEntity.options(new URI("/actuator/env")) RequestEntity<?> envRequest = RequestEntity.options(new URI("/actuator/env"))
.header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build(); .header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build();
ResponseEntity<?> exchange = this.testRestTemplate.exchange(healthRequest, Map.class); ResponseEntity<?> exchange = this.testRestTemplate.exchange(envRequest, Map.class);
assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK);
} }

@ -66,9 +66,9 @@ class CorsSampleActuatorApplicationTests {
@Test @Test
void preflightRequestToEndpointShouldReturnOk() throws Exception { void preflightRequestToEndpointShouldReturnOk() throws Exception {
RequestEntity<?> healthRequest = RequestEntity.options(new URI("/actuator/env")) RequestEntity<?> envRequest = RequestEntity.options(new URI("/actuator/env"))
.header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build(); .header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build();
ResponseEntity<?> exchange = this.testRestTemplate.exchange(healthRequest, Map.class); ResponseEntity<?> exchange = this.testRestTemplate.exchange(envRequest, Map.class);
assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK);
} }

Loading…
Cancel
Save