root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge pull request #3064 from izeye/patch-13 

* patch-13:
  Fix redudant assertion in test
This commit is contained in:
Stephane Nicoll 2015-05-29 09:56:35 +02:00
parent c6ff911257 8f0fd21f11
commit 4c54647460
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointCorsIntegrationTests.java
View File

@ -80,10 +80,6 @@ public class MvcEndpointCorsIntegrationTests {
public void maxAgeDefaultsTo30Minutes() throws Exception { public void maxAgeDefaultsTo30Minutes() throws Exception {
EnvironmentTestUtils.addEnvironment(this.context, EnvironmentTestUtils.addEnvironment(this.context,
"endpoints.cors.allowed-origins:foo.example.com"); "endpoints.cors.allowed-origins:foo.example.com");
createMockMvc().perform(
options("/beans").header("Origin", "bar.example.com").header(
HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET")).andExpect(
status().isForbidden());
performAcceptedCorsRequest().andExpect( performAcceptedCorsRequest().andExpect(
header().string(HttpHeaders.ACCESS_CONTROL_MAX_AGE, "1800")); header().string(HttpHeaders.ACCESS_CONTROL_MAX_AGE, "1800"));
} }