Merge branch '1.2.x'

370e957a · Andy Wilkinson · d7818b44 · 527850ae · 370e957a
Commit 370e957a authored Mar 26, 2015 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

UndertowEmbeddedServletContainerFactoryTests.java ...ndertow/UndertowEmbeddedServletContainerFactoryTests.java +1 -1

No files found.
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
@@ -146,7 +146,7 @@ public class UndertowEmbeddedServletContainerFactoryTests extends
 			}
 		});
 		this.container = factory.getEmbeddedServletContainer();
-		assertEquals("", contextPath.get());
+		assertEquals("/", contextPath.get());
 	}

 }