Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for iexplore driver

This commit is contained in:
Martin Stockhammer 2017-06-11 10:45:50 +02:00
parent c4e7c07358
commit d53e5d9266
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverUtility.java
View File

@ -96,14 +96,20 @@ public class WebdriverUtility
}
if (StringUtils.contains(seleniumBrowser, "iexplore")) {
DesiredCapabilities capabilities = DesiredCapabilities.internetExplorer();
capabilities.setCapability( InternetExplorerDriver.INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS, true );
WebDriver driver;
if (seleniumRemote)
{
return new RemoteWebDriver( new URL( "http://" + seleniumHost + ":" + seleniumPort + "/wd/hub" ),
DesiredCapabilities.internetExplorer()
driver = new RemoteWebDriver( new URL( "http://" + seleniumHost + ":" + seleniumPort + "/wd/hub" ),
capabilities
);
} else {
new InternetExplorerDriver( );
driver = new InternetExplorerDriver( capabilities );
}
driver.manage().window().maximize();
return driver;
}
if (StringUtils.contains( seleniumBrowser, "firefox" ))
@ -120,18 +126,20 @@ public class WebdriverUtility
}
}
// Default driver
DesiredCapabilities capabilities = DesiredCapabilities.htmlUnit();
capabilities.setJavascriptEnabled( true );
capabilities.setVersion( "firefox-52" );
WebDriver driver;
if ( seleniumRemote )
{
return new RemoteWebDriver( new URL( "http://" + seleniumHost + ":" + seleniumPort + "/wd/hub" ),
DesiredCapabilities.htmlUnit()
driver = new RemoteWebDriver( new URL( "http://" + seleniumHost + ":" + seleniumPort + "/wd/hub" ),
capabilities
);
}
else
{
DesiredCapabilities capabilities = DesiredCapabilities.htmlUnit();
capabilities.setJavascriptEnabled( true );
capabilities.setVersion( "firefox-52" );
HtmlUnitDriver driver = new HtmlUnitDriver( capabilities ) {
driver = new HtmlUnitDriver( capabilities ) {
@Override
protected WebClient modifyWebClient( WebClient client )
{
@ -141,8 +149,8 @@ public class WebdriverUtility
return client;
}
};
return driver;
}
return driver;
} catch (MalformedURLException e) {
throw new RuntimeException("Initializion of remote driver failed");