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 pull request #1763 from sdeleuze/whitelabel-typo 

* whitelabel-typo:
  Fix a typo in error.whitelabel.enabled
This commit is contained in:
Stephane Nicoll 2014-10-29 08:56:56 +01:00
parent 741d1f7273 7546f10aad
commit 1709e79cb6
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java
View File

@ -97,7 +97,7 @@ public class ErrorMvcAutoConfiguration implements EmbeddedServletContainerCustom
}
@Configuration
@ConditionalOnProperty(prefix = "error.whitelable", name = "enabled", matchIfMissing = true)
@ConditionalOnProperty(prefix = "error.whitelabel", name = "enabled", matchIfMissing = true)
@Conditional(ErrorTemplateMissingCondition.class)
protected static class WhitelabelErrorViewConfiguration {

18
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java
View File

@ -22,8 +22,13 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.servlet.ServletException;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
@ -47,9 +52,13 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
* {@link SpringJUnit4ClassRunner}.
*
* @author Dave Syer
* @author Sebastien Deleuze
*/
public class BasicErrorControllerDirectMockMvcTests {
@Rule
public final ExpectedException thrown = ExpectedException.none();
private ConfigurableWebApplicationContext wac;
private MockMvc mockMvc;
@ -87,6 +96,15 @@ public class BasicErrorControllerDirectMockMvcTests {
assertTrue("Wrong content: " + content, content.contains("status=999"));
}
@Test
public void errorPageNotAvailableWithWhitelabelDisabled() throws Exception {
setup((ConfigurableWebApplicationContext) new SpringApplication(
WebMvcIncludedConfiguration.class).run("--server.port=0", "--error.whitelabel.enabled=false"));
thrown.expect(ServletException.class);
this.mockMvc.perform(get("/error").accept(MediaType.TEXT_HTML));
}
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented