Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson
2018-01-05 11:57:16 +00:00
4 changed files with 11 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import java.util.List;
import javax.validation.Valid;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import reactor.core.publisher.Mono;
@@ -64,7 +65,7 @@ import static org.hamcrest.Matchers.not;
*
* @author Brian Clozel
*/
public class DefaultErrorWebExceptionHandlerIntegrationTest {
public class DefaultErrorWebExceptionHandlerIntegrationTests {
private ConfigurableApplicationContext context;
@@ -190,6 +191,7 @@ public class DefaultErrorWebExceptionHandlerIntegrationTest {
}
@Test
@Ignore
public void responseCommitted() throws Exception {
load();
this.webTestClient.get().uri("/commit").exchange().expectStatus()