Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Phillip Webb
2016-11-16 16:06:53 -08:00
parent 4edab86ba2 dcbfb51a1a
commit cb7c0b5031
22 changed files with 155 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java
View File

@@ -81,7 +81,9 @@ public class LocalHostWebConnectionHtmlUnitDriverTests {
throws Exception {
this.thrown.expect(IllegalArgumentException.class);
this.thrown.expectMessage("Environment must not be null");
new LocalHostWebConnectionHtmlUnitDriver(null, mock(Capabilities.class));
Capabilities capabilities = mock(Capabilities.class);
given(capabilities.getBrowserName()).willReturn("chrome");
new LocalHostWebConnectionHtmlUnitDriver(null, capabilities);
}
@Test