Commit 3fd59748 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.5.x'

parents f87e8d1d 682d0f52
...@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
"endpoints.env.sensitive=false" }) "endpoints.env.sensitive=false", "foo=bar" })
public class SampleHypermediaUiSecureApplicationTests { public class SampleHypermediaUiSecureApplicationTests {
@Autowired @Autowired
...@@ -47,10 +47,10 @@ public class SampleHypermediaUiSecureApplicationTests { ...@@ -47,10 +47,10 @@ public class SampleHypermediaUiSecureApplicationTests {
ResponseEntity<String> entity = this.restTemplate.getForEntity("/env", ResponseEntity<String> entity = this.restTemplate.getForEntity("/env",
String.class); String.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
ResponseEntity<String> user = this.restTemplate.getForEntity("/env/user", ResponseEntity<String> user = this.restTemplate.getForEntity("/env/foo",
String.class); String.class);
assertThat(user.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(user.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(user.getBody()).contains("{\"user\":"); assertThat(user.getBody()).contains("{\"foo\":");
} }
@Test @Test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment