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

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2016-11-22 11:03:11 +00:00
parent e3688455fa 29f0ae3fa8
commit 9e4fea5f54
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java
View File

@ -244,7 +244,8 @@ public class SpringBootWebSecurityConfigurationTests {
@Test @Test
public void contentSecurityPolicyConfiguration() throws Exception { public void contentSecurityPolicyConfiguration() throws Exception {
this.context = SpringApplication.run(VanillaWebConfiguration.class, this.context = SpringApplication.run(VanillaWebConfiguration.class,
"--security.headers.content-security-policy=default-src 'self';"); "--security.headers.content-security-policy=default-src 'self';",
"--server.port=0");
MockMvc mockMvc = MockMvcBuilders MockMvc mockMvc = MockMvcBuilders
.webAppContextSetup((WebApplicationContext) this.context) .webAppContextSetup((WebApplicationContext) this.context)
.addFilters((FilterChainProxy) this.context .addFilters((FilterChainProxy) this.context
@ -261,7 +262,8 @@ public class SpringBootWebSecurityConfigurationTests {
public void contentSecurityPolicyReportOnlyConfiguration() throws Exception { public void contentSecurityPolicyReportOnlyConfiguration() throws Exception {
this.context = SpringApplication.run(VanillaWebConfiguration.class, this.context = SpringApplication.run(VanillaWebConfiguration.class,
"--security.headers.content-security-policy=default-src 'self';", "--security.headers.content-security-policy=default-src 'self';",
"--security.headers.content-security-policy-mode=report-only"); "--security.headers.content-security-policy-mode=report-only",
"--server.port=0");
MockMvc mockMvc = MockMvcBuilders MockMvc mockMvc = MockMvcBuilders
.webAppContextSetup((WebApplicationContext) this.context) .webAppContextSetup((WebApplicationContext) this.context)
.addFilters((FilterChainProxy) this.context .addFilters((FilterChainProxy) this.context